| Description: | ")
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
index bc214d8e3198..552e8d31a1bb 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
@@ -1616,19 +1616,6 @@ public class GitLogUI implements Disposable {
@Override
public void actionPerformed(AnActionEvent e) {
rootsChanged(myRootsUnderVcs);
- updateRefs();
- }
-
- private void updateRefs() {
- for (VirtualFile root : myRootsUnderVcs) {
- try {
- CachedRefs cachedRefs = new LowLevelAccessImpl(myProject, root).getRefs();
- myUIRefresh.reportSymbolicRefs(root, cachedRefs);
- }
- catch (VcsException e) {
- LOG.warn("Couldn't update references in repository " + root, e);
- }
- }
}
@Override
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java b/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
index 48b875654135..d0b654fd31c5 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
@@ -12,12 +12,15 @@
*/
package git4idea.history.wholeTree;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.CalledInAwt;
import com.intellij.util.containers.Convertor;
import com.intellij.util.continuation.*;
import org.jetbrains.annotations.Nullable;
+import java.util.Collections;
import java.util.List;
/**
@@ -29,20 +32,22 @@ public class LoadAlgorithm {
private final Project myProject;
private final List> myLoaders;
private final List myShortLoaders;
- private final Continuation myContinuation;
+ private Continuation myContinuation;
private final GitCommitsSequentially myGitCommitsSequentially;
public LoadAlgorithm(final Project project,
final List> loaders,
- final List shortLoaders,
- Continuation continuation, final GitCommitsSequentially gitCommitsSequentially) {
+ final List shortLoaders, final GitCommitsSequentially gitCommitsSequentially) {
myProject = project;
myLoaders = loaders;
myShortLoaders = shortLoaders;
- myContinuation = continuation;
myGitCommitsSequentially = gitCommitsSequentially;
}
+ public void setContinuation(Continuation continuation) {
+ myContinuation = continuation;
+ }
+
public void fillContinuation() {
final GatheringContinuationContext initContext = new GatheringContinuationContext();
@@ -72,19 +77,22 @@ public class LoadAlgorithm {
}
public void resume() {
- myContinuation.resume();
+ myContinuation.clearQueue();
+ for (LoaderAndRefresher loader : myLoaders) {
+ final LoaderFactory factory = new LoaderFactory(loader);
+ myContinuation.add(Collections.singletonList(factory.convert(new State(factory))));
+ }
+ myContinuation.resumeOnNewIndicator(myProject, true, ProgressManager.getInstance().getProgressIndicator().getText());
}
- private static class LoadTaskDescriptor extends TaskDescriptor {
+ private class LoadTaskDescriptor extends TaskDescriptor {
protected final State myState;
private final LoaderAndRefresher myLoader;
- private final RefreshTaskDescriptor myRefreshTaskDescriptor;
- protected LoadTaskDescriptor(final State state, final LoaderAndRefresher loader, final RefreshTaskDescriptor refreshTaskDescriptor) {
+ protected LoadTaskDescriptor(final State state, final LoaderAndRefresher loader) {
super("Load git tree skeleton", Where.POOLED);
myState = state;
myLoader = loader;
- myRefreshTaskDescriptor = refreshTaskDescriptor;
}
protected void processResult(final Result result) {
@@ -92,6 +100,7 @@ public class LoadAlgorithm {
@Override
public void run(final ContinuationContext context) {
+ ProgressManager.progress(getName());
final Result result = myLoader.load(myState.myValue, myState.getContinuationTs());
processResult(result);
myState.setContinuationTs(result.getLast() == null ? -1 : result.getLast().getTime());
@@ -101,18 +110,27 @@ public class LoadAlgorithm {
if (! myLoader.isInterrupted()) {
myState.scheduleSelf(context);
}
- context.next(myRefreshTaskDescriptor);
- } else {
- context.next(myRefreshTaskDescriptor);
+ }
+ flushIntoUiCalledFromBackground(context, myLoader);
+ }
+ }
+
+ private void flushIntoUiCalledFromBackground(final ContinuationContext context, LoaderAndRefresher uiRefresh) {
+ final StepType stepType = uiRefresh.flushIntoUI();
+ if (StepType.STOP.equals(stepType)) {
+ context.cancelEverything();
+ } else if (StepType.PAUSE.equals(stepType)) {
+ context.cancelCurrent();
+ final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
+ if (indicator != null) {
+ indicator.cancel();
}
}
}
- private static class TestLoadTaskDescriptor extends LoadTaskDescriptor {
- private TestLoadTaskDescriptor(final State state,
- final LoaderAndRefresher loader,
- final RefreshTaskDescriptor refreshTaskDescriptor) {
- super(state, loader, refreshTaskDescriptor);
+ private class TestLoadTaskDescriptor extends LoadTaskDescriptor {
+ private TestLoadTaskDescriptor(final State state, final LoaderAndRefresher loader) {
+ super(state, loader);
}
@Override
@@ -123,25 +141,6 @@ public class LoadAlgorithm {
}
}
- private static class RefreshTaskDescriptor extends TaskDescriptor {
- private final LoaderAndRefresher myUiRefresh;
-
- private RefreshTaskDescriptor(final LoaderAndRefresher uiRefresh) {
- super("", Where.AWT);
- myUiRefresh = uiRefresh;
- }
-
- @Override
- public void run(final ContinuationContext context) {
- final StepType stepType = myUiRefresh.flushIntoUI();
- if (StepType.STOP.equals(stepType)) {
- context.cancelEverything();
- } else if (StepType.PAUSE.equals(stepType)) {
- context.suspend();
- }
- }
- }
-
public static enum LoadType {
TEST(true, false),
FULL_START(false, true),
@@ -191,21 +190,19 @@ public class LoadAlgorithm {
}
}
- private static class LoaderFactory implements Convertor {
+ private class LoaderFactory implements Convertor {
private final LoaderAndRefresher myLoader;
- private final RefreshTaskDescriptor myRefreshTaskDescriptor;
private LoaderFactory(final LoaderAndRefresher loader) {
myLoader = loader;
- myRefreshTaskDescriptor = new RefreshTaskDescriptor(loader);
}
@Override
public LoadTaskDescriptor convert(final State state) {
if (LoadType.TEST.equals(state.myValue)) {
- return new TestLoadTaskDescriptor(state, myLoader, myRefreshTaskDescriptor);
+ return new TestLoadTaskDescriptor(state, myLoader);
}
- return new LoadTaskDescriptor(state, myLoader, myRefreshTaskDescriptor);
+ return new LoadTaskDescriptor(state, myLoader);
}
}
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/LoadController.java b/plugins/git4idea/src/git4idea/history/wholeTree/LoadController.java
index 2c799d170639..222a37b9c8af 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/LoadController.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/LoadController.java
@@ -13,6 +13,9 @@
package git4idea.history.wholeTree;
import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vcs.CalledInAwt;
@@ -29,6 +32,7 @@ import git4idea.history.GitHistoryUtils;
import git4idea.history.NewGitUsersComponent;
import git4idea.history.browser.ChangesFilter;
import git4idea.history.browser.SymbolicRefsI;
+import org.jetbrains.annotations.NotNull;
import java.util.*;
@@ -105,26 +109,49 @@ public class LoadController implements Loader {
oldContinuation.clearQueue();
}
- final Continuation continuation = Continuation.createFragmented(myProject, true);
- continuation.add(Arrays.asList(new RepositoriesSorter(list, shortLoaders, continuation)));
- continuation.resume();
+ final RepositoriesSorter sorter = new RepositoriesSorter(list, shortLoaders); // this will set previous algorithm for stop
+
+ final Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ final Continuation continuation = Continuation.createForCurrentProgress(myProject, true, "Load git log data");
+ sorter.setContinuation(continuation);
+ continuation.add(Arrays.asList(sorter));
+ continuation.resume();
+ }
+ };
+ loadUnderProgress(runnable);
+ }
+
+ private void loadUnderProgress(final Runnable runnable) {
+ ProgressManager.getInstance().run(new Task.Backgroundable(myProject, "Load git log data", true) {
+ @Override
+ public void run(@NotNull ProgressIndicator indicator) {
+ runnable.run();
+ }
+ });
}
private class RepositoriesSorter extends TaskDescriptor {
private final List> mySimpleLoaders;
private final List myShortLoaders;
- private final Continuation myContinuation;
+ private Continuation myContinuation;
- private RepositoriesSorter(final List> simpleLoaders, final List shortLoaders,
- final Continuation continuation) {
+ private RepositoriesSorter(final List> simpleLoaders, final List shortLoaders) {
super("Order repositories", Where.POOLED);
mySimpleLoaders = simpleLoaders;
myShortLoaders = shortLoaders;
+ myPreviousAlgorithm = new LoadAlgorithm(myProject, mySimpleLoaders, myShortLoaders, myGitCommitsSequentially);
+ }
+
+ private void setContinuation(Continuation continuation) {
myContinuation = continuation;
+ myPreviousAlgorithm.setContinuation(continuation);
}
@Override
public void run(ContinuationContext context) {
+ assert myContinuation != null;
final Map map = new HashMap();
for (ByRootLoader shortLoader : myShortLoaders) {
final VirtualFile root = shortLoader.getRootHolder().getRoot();
@@ -161,7 +188,6 @@ public class LoadController implements Loader {
}
});
- myPreviousAlgorithm = new LoadAlgorithm(myProject, mySimpleLoaders, myShortLoaders, myContinuation, myGitCommitsSequentially);
myPreviousAlgorithm.fillContinuation();
}
}
@@ -169,7 +195,12 @@ public class LoadController implements Loader {
@Override
public void resume() {
assert myPreviousAlgorithm != null;
- myPreviousAlgorithm.resume();
+ loadUnderProgress(new Runnable() {
+ @Override
+ public void run() {
+ myPreviousAlgorithm.resume();
+ }
+ });
}
private List filterNumbers(final String[] s) {
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/MediatorImpl.java b/plugins/git4idea/src/git4idea/history/wholeTree/MediatorImpl.java
index 3b4a88703a8a..b7421d508676 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/MediatorImpl.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/MediatorImpl.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Processor;
import com.intellij.util.Ticket;
import com.intellij.util.containers.Convertor;
+import com.intellij.util.ui.UIUtil;
import git4idea.history.browser.CachedRefs;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
@@ -131,8 +132,13 @@ public class MediatorImpl implements Mediator {
@Override
public void oneFinished() {
if (myController.isEmpty()) {
- myUIRefresh.finished();
- myTableWrapper.finished();
+ UIUtil.invokeLaterIfNeeded(new Runnable() {
+ @Override
+ public void run() {
+ myUIRefresh.finished();
+ myTableWrapper.finished();
+ }
+ });
}
}
@@ -193,7 +199,7 @@ public class MediatorImpl implements Mediator {
}
}));
filters.setUseOnlyHashes(true);
- myLoader.loadSkeleton(myTicket.copy(), rootsHolder, Collections.emptyList(), filters, myController, false);
+ myLoader.loadSkeleton(myTicket.copy(), rootsHolder, Collections.emptyList(), filters, myController, true);
} else {
myUIRefresh.finished();
myTableWrapper.finished();
@@ -242,7 +248,8 @@ public class MediatorImpl implements Mediator {
}
@NonNls public static final String GIT_LOG_PAGE_SIZE = "git.log.page.size";
- public final static int ourManyLoadedStep = (! pageSizeOk(Integer.getInteger(GIT_LOG_PAGE_SIZE))) ? 1000 : Integer.getInteger(
+ public static final int ourDefaultPageSize = 1000;
+ public final static int ourManyLoadedStep = (! pageSizeOk(Integer.getInteger(GIT_LOG_PAGE_SIZE))) ? ourDefaultPageSize : Integer.getInteger(
GIT_LOG_PAGE_SIZE);
private static class SequenceSupportBuffer {
diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
index d52371263a32..0e3b7175ccd6 100644
--- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package git4idea.ui;
import com.intellij.CommonBundle;
+import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.notification.NotificationType;
@@ -239,8 +240,7 @@ public class GitUnstashDialog extends DialogWrapper {
*/
private void addStashParameter(@NotNull GitHandler handler, @NotNull String stash) {
if (GitVersionSpecialty.NEEDS_QUOTES_IN_STASH_NAME.existsIn(myVcs.getVersion())) {
- handler.addParameters("\"" + stash + "\"");
- handler.dontEscapeQuotes();
+ handler.addParameters(GeneralCommandLine.inescapableQuote(stash));
}
else {
handler.addParameters(stash);
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 41a8d54d8990..1c6dffafb409 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -45,12 +45,15 @@
-
+
+
+
+
@@ -59,6 +62,8 @@
serviceImplementation="org.jetbrains.plugins.gradle.notification.GradleProgressNotificationManagerImpl"/>
+
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractConflictingPropertyChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractConflictingPropertyChange.java
index ed49c1d9f3a6..9b3b50d727c2 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractConflictingPropertyChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractConflictingPropertyChange.java
@@ -35,17 +35,17 @@ public abstract class GradleAbstractConflictingPropertyChange extends GradleA
@NotNull private final GradleEntityId myEntityId;
@NotNull private final String myPropertyDescription;
@NotNull private final T myGradleValue;
- @NotNull private final T myIntellijValue;
+ @NotNull private final T myIdeValue;
public GradleAbstractConflictingPropertyChange(@NotNull GradleEntityId id,
@NotNull String propertyDescription,
@NotNull T gradleValue,
- @NotNull T intellijValue)
+ @NotNull T ideValue)
{
myEntityId = id;
myPropertyDescription = propertyDescription;
myGradleValue = gradleValue;
- myIntellijValue = intellijValue;
+ myIdeValue = ideValue;
}
@NotNull
@@ -54,7 +54,7 @@ public abstract class GradleAbstractConflictingPropertyChange extends GradleA
}
/**
- * @return target property's value at Gradle side
+ * @return target property's value at Gradle side
*/
@NotNull
public T getGradleValue() {
@@ -62,18 +62,18 @@ public abstract class GradleAbstractConflictingPropertyChange extends GradleA
}
/**
- * @return target property's value at IntelliJ IDEA side
+ * @return target property's value at ide side
*/
@NotNull
- public T getIntellijValue() {
- return myIntellijValue;
+ public T getIdeValue() {
+ return myIdeValue;
}
@Override
public int hashCode() {
int result = 31 * super.hashCode() + myEntityId.hashCode();
result = 31 * result + myGradleValue.hashCode();
- return 31 * result + myIntellijValue.hashCode();
+ return 31 * result + myIdeValue.hashCode();
}
@Override
@@ -84,11 +84,11 @@ public abstract class GradleAbstractConflictingPropertyChange extends GradleA
GradleAbstractConflictingPropertyChange that = (GradleAbstractConflictingPropertyChange)o;
- return myEntityId.equals(that.myEntityId) && myGradleValue.equals(that.myGradleValue) && myIntellijValue.equals(that.myIntellijValue);
+ return myEntityId.equals(that.myEntityId) && myGradleValue.equals(that.myGradleValue) && myIdeValue.equals(that.myIdeValue);
}
@Override
public String toString() {
- return String.format("%s change: gradle='%s', intellij='%s'", myPropertyDescription, myGradleValue, myIntellijValue);
+ return String.format("%s change: gradle='%s', ide='%s'", myPropertyDescription, myGradleValue, myIdeValue);
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractEntityPresenceChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractEntityPresenceChange.java
index cbb2f9bb6423..a8015ac8c844 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractEntityPresenceChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractEntityPresenceChange.java
@@ -30,32 +30,32 @@ import org.jetbrains.annotations.Nullable;
public abstract class GradleAbstractEntityPresenceChange extends GradleAbstractProjectStructureChange {
private final T myGradleEntity;
- private final T myIntellijEntity;
+ private final T myIdeEntity;
private final String myEntityName;
/**
* Creates new GradleEntityPresenceChange project.
*
* @param gradleEntity target entity at Gradle side. null as indication that the entity was removed at Gradle side
- * or added at IntelliJ side
- * @param intellijEntity target entity at IntelliJ IDEA side. null as indication that the entity was removed
- * at IntelliJ IDEA side or added at IntelliJ side
+ * or added at ide side
+ * @param ideEntity target entity at ide side. null as indication that the entity was removed
+ * at ide side or added at ide side
* @throws IllegalArgumentException if both of the given entities are defined or undefined. Expecting this constructor to be
* called with one null argument and one non-null argument
*/
public GradleAbstractEntityPresenceChange(@NotNull String entityName,
@Nullable T gradleEntity,
- @Nullable T intellijEntity)
+ @Nullable T ideEntity)
throws IllegalArgumentException
{
- if (!(gradleEntity == null ^ intellijEntity == null)) {
+ if (!(gradleEntity == null ^ ideEntity == null)) {
throw new IllegalArgumentException(String.format(
- "Can't construct %s object. Reason: expected that only gradle or intellij entity is null, actual: gradle='%s'; intellij='%s'",
- getClass(), gradleEntity, intellijEntity
+ "Can't construct %s object. Reason: expected that only gradle or ide entity is null, actual: gradle='%s'; ide='%s'",
+ getClass(), gradleEntity, ideEntity
));
}
myGradleEntity = gradleEntity;
- myIntellijEntity = intellijEntity;
+ myIdeEntity = ideEntity;
myEntityName = entityName;
}
@@ -65,15 +65,15 @@ public abstract class GradleAbstractEntityPresenceChange extends GradleAbstra
}
@Nullable
- public T getIntellijEntity() {
- return myIntellijEntity;
+ public T getIdeEntity() {
+ return myIdeEntity;
}
@Override
public int hashCode() {
int result = super.hashCode();
result = 31 * result + (myGradleEntity != null ? myGradleEntity.hashCode() : 0);
- return 31 * result + (myIntellijEntity != null ? myIntellijEntity.hashCode() : 0);
+ return 31 * result + (myIdeEntity != null ? myIdeEntity.hashCode() : 0);
}
@SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
@@ -84,13 +84,13 @@ public abstract class GradleAbstractEntityPresenceChange extends GradleAbstra
GradleAbstractEntityPresenceChange that = (GradleAbstractEntityPresenceChange)o;
if (myGradleEntity != null ? !myGradleEntity.equals(that.myGradleEntity) : that.myGradleEntity != null) return false;
- if (myIntellijEntity != null ? !myIntellijEntity.equals(that.myIntellijEntity) : that.myIntellijEntity != null) return false;
+ if (myIdeEntity != null ? !myIdeEntity.equals(that.myIdeEntity) : that.myIdeEntity != null) return false;
return true;
}
@Override
public String toString() {
- return String.format("%s presence change: gradle='%s', intellij='%s'", myEntityName, myGradleEntity, myIntellijEntity);
+ return String.format("%s presence change: gradle='%s', ide='%s'", myEntityName, myGradleEntity, myIdeEntity);
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractProjectStructureChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractProjectStructureChange.java
index f17281be4a6a..895b25e483f9 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractProjectStructureChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleAbstractProjectStructureChange.java
@@ -15,26 +15,12 @@
*/
package org.jetbrains.plugins.gradle.diff;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* @author Denis Zhdanov
* @since 11/15/11 1:33 PM
*/
public abstract class GradleAbstractProjectStructureChange implements GradleProjectStructureChange {
- private final AtomicBoolean myConfirmed = new AtomicBoolean();
-
- @Override
- public boolean isConfirmed() {
- return myConfirmed.get();
- }
-
- @Override
- public void confirm() {
- myConfirmed.set(true);
- }
-
@Override
public int hashCode() {
return 31;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java
index 4df3a92954cc..2048e4e49b1a 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleChangesCalculationContext.java
@@ -2,6 +2,7 @@ package org.jetbrains.plugins.gradle.diff;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.config.PlatformFacade;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
import java.util.HashSet;
import java.util.Set;
@@ -16,15 +17,19 @@ public class GradleChangesCalculationContext {
@NotNull private final Set myKnownChanges = new HashSet();
@NotNull private final Set myCurrentChanges = new HashSet();
- @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
/**
- * @param knownChanges changes between the gradle and intellij project structure that has been known up until now
+ * @param knownChanges changes between the gradle and ide project structure that has been known up until now
* @param platformFacade platform facade to use during the calculations
+ * @param mapper library path type mapper to use during the calculation
*/
public GradleChangesCalculationContext(@NotNull Set knownChanges,
- @NotNull PlatformFacade platformFacade)
+ @NotNull PlatformFacade platformFacade,
+ @NotNull GradleLibraryPathTypeMapper mapper)
{
+ myLibraryPathTypeMapper = mapper;
myKnownChanges.addAll(knownChanges);
myPlatformFacade = platformFacade;
}
@@ -51,4 +56,9 @@ public class GradleChangesCalculationContext {
public PlatformFacade getPlatformFacade() {
return myPlatformFacade;
}
+
+ @NotNull
+ public GradleLibraryPathTypeMapper getLibraryPathTypeMapper() {
+ return myLibraryPathTypeMapper;
+ }
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
index 70dcd38a3819..f8c0ffcb2b0f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleDiffUtil.java
@@ -13,7 +13,7 @@ import org.jetbrains.plugins.gradle.diff.dependency.GradleModuleDependencyPresen
import org.jetbrains.plugins.gradle.diff.library.GradleJarPresenceChange;
import org.jetbrains.plugins.gradle.diff.module.GradleModulePresenceChange;
import org.jetbrains.plugins.gradle.model.gradle.*;
-import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
+import org.jetbrains.plugins.gradle.model.intellij.IdeEntityVisitor;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
import org.jetbrains.plugins.gradle.util.GradleUtil;
@@ -89,7 +89,7 @@ public class GradleDiffUtil {
/**
* Performs argument type-based dispatch and delegates to one of strongly typed 'buildLocalChanges()' methods.
*
- * @param entity target intellij-local entity that doesn't present at the gradle side
+ * @param entity target ide-local entity that doesn't present at the gradle side
* @param context changes calculation context to use
*/
public static void buildLocalChanges(@NotNull Object entity, @NotNull final GradleChangesCalculationContext context) {
@@ -97,7 +97,7 @@ public class GradleDiffUtil {
buildLocalChanges((GradleEntity)entity, context);
}
else {
- GradleUtil.dispatch(entity, new IntellijEntityVisitor() {
+ GradleUtil.dispatch(entity, new IdeEntityVisitor() {
@Override
public void visit(@NotNull Project project) {
}
@@ -140,39 +140,39 @@ public class GradleDiffUtil {
/**
* Utility method for comparing entity collections. For example, it may be provided with the collection of gradle modules and
- * collection of intellij modules. Matched entities are found and the comparison is delegated to the given 'calculator'.
+ * collection of ide modules. Matched entities are found and the comparison is delegated to the given 'calculator'.
* Corresponding changes are generated for the non-matched (local) changes (e.g. particular library dependency presents
- * at the intellij side but not at the gradle).
+ * at the ide side but not at the gradle).
*
* @param calculator comparison strategy that works with the single entities (not collection of entities)
* @param gradleEntities entities available at the gradle side
- * @param intellijEntities entities available at the intellij side
+ * @param ideEntities entities available at the ide side
* @param context changes calculation context
- * @param target intellij entity type
+ * @param target ide entity type
* @param target gradle entity type
*/
public static void calculate(
@NotNull GradleStructureChangesCalculator calculator,
@NotNull Iterable gradleEntities,
- @NotNull Iterable intellijEntities,
+ @NotNull Iterable ideEntities,
@NotNull GradleChangesCalculationContext context)
{
- Map intellijEntitiesByKeys = new HashMap();
- for (I entity : intellijEntities) {
- final I previous = intellijEntitiesByKeys.put(calculator.getIntellijKey(entity), entity);
+ Map ideEntitiesByKeys = new HashMap();
+ for (I entity : ideEntities) {
+ final I previous = ideEntitiesByKeys.put(calculator.getIdeKey(entity), entity);
assert previous == null;
}
for (G gradleEntity: gradleEntities) {
- I intellijEntity = intellijEntitiesByKeys.remove(calculator.getGradleKey(gradleEntity, context));
- if (intellijEntity == null) {
+ I ideEntity = ideEntitiesByKeys.remove(calculator.getGradleKey(gradleEntity, context));
+ if (ideEntity == null) {
buildLocalChanges(gradleEntity, context);
}
else {
- calculator.calculate(gradleEntity, intellijEntity, context);
+ calculator.calculate(gradleEntity, ideEntity, context);
}
}
- for (I entity : intellijEntitiesByKeys.values()) {
+ for (I entity : ideEntitiesByKeys.values()) {
buildLocalChanges(entity, context);
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChange.java
index aca8d344516d..c2f7c341c998 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleProjectStructureChange.java
@@ -14,16 +14,6 @@ import org.jetbrains.annotations.NotNull;
*/
public interface GradleProjectStructureChange {
- /**
- * @return true if the change is {@link #confirm() confirmed}; false otherwise
- */
- boolean isConfirmed();
-
- /**
- * Allows to confirm current change, i.e. indicate that end-user checked the change and consider it to remain.
- */
- void confirm();
-
/**
* Allows to perform double-dispatch of the current change object within the given visitor.
*
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
index 04feeaa63b4d..f313b6349acd 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/GradleStructureChangesCalculator.java
@@ -20,49 +20,49 @@ public interface GradleStructureChangesCalculator {
* Calculates changes between the given entities.
*
* @param gradleEntity target gradle entity
- * @param intellijEntity target intellij entity
+ * @param ideEntity target ide entity
* @param context target diff calculation context
*/
- void calculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context);
+ void calculate(@NotNull G gradleEntity, @NotNull I ideEntity, @NotNull GradleChangesCalculationContext context);
/**
- * There are three possible situations when we compare a set of gradle entities with a set of intellij entities:
+ * There are three possible situations when we compare a set of gradle entities with a set of ide entities:
*
*
* - particular entity presents only at the gradle side;
- * - particular entity presents only at the intellij side;
- * - particular gradle entity is matched to particular intellij entity (they may have difference in their settings though);
+ * - particular entity presents only at the ide side;
+ * - particular gradle entity is matched to particular ide entity (they may have difference in their settings though);
*
*
*
- * The general idea is to map every item at the given sets of gradle and intellij entities to particular key (both gradle and
- * intellij keys are expected to belong to the same class) and then compare them. Matched keys shows that corresponding
+ * The general idea is to map every item at the given sets of gradle and ide entities to particular key (both gradle and
+ * ide keys are expected to belong to the same class) and then compare them. Matched keys shows that corresponding
* entities should be {@link #calculate(GradleEntity, Object, GradleChangesCalculationContext) compared to each other};
- * non-matched indicate that corresponding entities are gradle- or intellij-local.
+ * non-matched indicate that corresponding entities are gradle- or ide-local.
*
- * This method allows to match intellij entity to the target key.
+ * This method allows to match ide entity to the target key.
*
- * @param entity intellij entity to match
+ * @param entity ide entity to match
* @return key for the given entity
* @see #getGradleKey(GradleEntity, GradleChangesCalculationContext)
*/
@NotNull
- Object getIntellijKey(@NotNull I entity);
+ Object getIdeKey(@NotNull I entity);
/**
- * Serves the same purpose as {@link #getIntellijKey(Object)} but targets gradle entities.
+ * Serves the same purpose as {@link #getIdeKey(Object)} but targets gradle entities.
*
- * There is a possible case that two corresponding gradle and intellij entities differ from each other by the setting that
- * affects the resulting key (e.g. we may use module name as a key for 'module' entities and intellij module name differs from
+ * There is a possible case that two corresponding gradle and ide entities differ from each other by the setting that
+ * affects the resulting key (e.g. we may use module name as a key for 'module' entities and ide module name differs from
* the name of the corresponding gradle module). We need to match only in one direction then (e.g. consider a situation when
- * particular module is named differently at gradle and intellij. We shouldn't consider that change during both
- * {@code intellij-entity -> key} and {@code gradle-entity -> key} mappings because that would produce two different keys).
+ * particular module is named differently at gradle and ide. We shouldn't consider that change during both
+ * {@code ide-entity -> key} and {@code gradle-entity -> key} mappings because that would produce two different keys).
* So, we take into consideration the known changes only during {@code gradle-entity -> key} processing.
*
* @param entity target gradle entity that should be mapped to a key
* @param context changes calculation context
* @return key for the given entity
- * @see #getIntellijKey(Object)
+ * @see #getIdeKey(Object)
*/
@NotNull
Object getGradleKey(@NotNull G entity, @NotNull GradleChangesCalculationContext context);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/contentroot/GradleContentRootStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/contentroot/GradleContentRootStructureChangesCalculator.java
index 081037d7baf2..91bb681b9b84 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/contentroot/GradleContentRootStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/contentroot/GradleContentRootStructureChangesCalculator.java
@@ -16,14 +16,14 @@ public class GradleContentRootStructureChangesCalculator
{
@Override
public void calculate(@NotNull GradleContentRoot gradleEntity,
- @NotNull ModuleAwareContentRoot intellijEntity,
+ @NotNull ModuleAwareContentRoot ideEntity,
@NotNull GradleChangesCalculationContext context)
{
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull ModuleAwareContentRoot entity) {
+ public Object getIdeKey(@NotNull ModuleAwareContentRoot entity) {
return GradleEntityIdMapper.mapEntityToId(entity);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleAbstractDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleAbstractDependencyStructureChangesCalculator.java
index 8053d0939dc2..9131822f65ee 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleAbstractDependencyStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleAbstractDependencyStructureChangesCalculator.java
@@ -20,16 +20,16 @@ public abstract class GradleAbstractDependencyStructureChangesCalculator
{
@Override
- public void calculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context) {
+ public void calculate(@NotNull G gradleEntity, @NotNull I ideEntity, @NotNull GradleChangesCalculationContext context) {
final GradleAbstractDependencyId id = GradleEntityIdMapper.mapEntityToId(gradleEntity);
- if (gradleEntity.getScope() != intellijEntity.getScope()) {
- context.register(new GradleDependencyScopeChange(id, gradleEntity.getScope(), intellijEntity.getScope()));
+ if (gradleEntity.getScope() != ideEntity.getScope()) {
+ context.register(new GradleDependencyScopeChange(id, gradleEntity.getScope(), ideEntity.getScope()));
}
- if (gradleEntity.isExported() != intellijEntity.isExported()) {
- context.register(new GradleDependencyExportedChange(id, gradleEntity.isExported(), intellijEntity.isExported()));
+ if (gradleEntity.isExported() != ideEntity.isExported()) {
+ context.register(new GradleDependencyExportedChange(id, gradleEntity.isExported(), ideEntity.isExported()));
}
- doCalculate(gradleEntity, intellijEntity, context);
+ doCalculate(gradleEntity, ideEntity, context);
}
protected abstract void doCalculate(@NotNull G gradleEntity, @NotNull I intellijEntity, @NotNull GradleChangesCalculationContext context);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleLibraryDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleLibraryDependencyStructureChangesCalculator.java
index 0f1a97570e7e..ad2616c1c0b7 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleLibraryDependencyStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleLibraryDependencyStructureChangesCalculator.java
@@ -35,12 +35,12 @@ public class GradleLibraryDependencyStructureChangesCalculator
@NotNull
@Override
- public Object getIntellijKey(@NotNull LibraryOrderEntry entity) {
+ public Object getIdeKey(@NotNull LibraryOrderEntry entity) {
final Library library = entity.getLibrary();
if (library == null) {
return "";
}
- return myLibraryCalculator.getIntellijKey(library);
+ return myLibraryCalculator.getIdeKey(library);
}
@NotNull
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleModuleDependencyStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleModuleDependencyStructureChangesCalculator.java
index 8d868ef57874..477fb766cc62 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleModuleDependencyStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/dependency/GradleModuleDependencyStructureChangesCalculator.java
@@ -3,7 +3,6 @@ package org.jetbrains.plugins.gradle.diff.dependency;
import com.intellij.openapi.roots.ModuleOrderEntry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.diff.GradleChangesCalculationContext;
-import org.jetbrains.plugins.gradle.diff.dependency.GradleAbstractDependencyStructureChangesCalculator;
import org.jetbrains.plugins.gradle.model.gradle.GradleModuleDependency;
/**
@@ -24,7 +23,7 @@ public class GradleModuleDependencyStructureChangesCalculator
@NotNull
@Override
- public Object getIntellijKey(@NotNull ModuleOrderEntry entity) {
+ public Object getIdeKey(@NotNull ModuleOrderEntry entity) {
final String intellijModuleName = entity.getModuleName();
if (intellijModuleName == null) {
return "";
@@ -35,7 +34,6 @@ public class GradleModuleDependencyStructureChangesCalculator
@NotNull
@Override
public Object getGradleKey(@NotNull GradleModuleDependency entity, @NotNull GradleChangesCalculationContext context) {
- // TODO den consider known changes here.
return entity.getTarget().getName();
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleJarPresenceChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleJarPresenceChange.java
index 9de59ea9ea93..b1907f579c2d 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleJarPresenceChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleJarPresenceChange.java
@@ -14,9 +14,9 @@ import org.jetbrains.plugins.gradle.util.GradleBundle;
public class GradleJarPresenceChange extends GradleAbstractEntityPresenceChange {
public GradleJarPresenceChange(@Nullable GradleJarId gradleEntity,
- @Nullable GradleJarId intellijEntity) throws IllegalArgumentException
+ @Nullable GradleJarId ideEntity) throws IllegalArgumentException
{
- super(GradleBundle.message("gradle.sync.change.entity.type.jar"), gradleEntity, intellijEntity);
+ super(GradleBundle.message("gradle.sync.change.entity.type.jar"), gradleEntity, ideEntity);
}
@Override
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleLibraryStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleLibraryStructureChangesCalculator.java
index cb00e9726044..f4c339858a87 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleLibraryStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/library/GradleLibraryStructureChangesCalculator.java
@@ -31,36 +31,47 @@ public class GradleLibraryStructureChangesCalculator implements GradleStructureC
@Override
public void calculate(@NotNull GradleLibrary gradleEntity,
- @NotNull Library intellijEntity,
+ @NotNull Library ideEntity,
@NotNull GradleChangesCalculationContext context)
{
- final Set gradleBinaryPaths = new HashSet(gradleEntity.getPaths(LibraryPathType.BINARY));
- final Set intellijBinaryPaths = new HashSet();
- for (VirtualFile file : intellijEntity.getFiles(OrderRootType.CLASSES)) {
+ for (LibraryPathType pathType : LibraryPathType.values()) {
+ doCalculate(gradleEntity, pathType, context.getLibraryPathTypeMapper().map(pathType), ideEntity, context);
+ }
+ }
+
+ private void doCalculate(@NotNull GradleLibrary gradleEntity,
+ @NotNull LibraryPathType gradleType,
+ @NotNull OrderRootType ideType,
+ @NotNull Library ideEntity,
+ @NotNull GradleChangesCalculationContext context)
+ {
+ final Set gradleBinaryPaths = new HashSet(gradleEntity.getPaths(gradleType));
+ final Set ideBinaryPaths = new HashSet();
+ for (VirtualFile file : ideEntity.getFiles(ideType)) {
final String path = myPlatformFacade.getLocalFileSystemPath(file);
if (!gradleBinaryPaths.remove(path)) {
- intellijBinaryPaths.add(path);
+ ideBinaryPaths.add(path);
}
}
if (!gradleBinaryPaths.isEmpty()) {
GradleLibraryId libraryId = new GradleLibraryId(GradleEntityOwner.GRADLE, gradleEntity.getName());
for (String path : gradleBinaryPaths) {
- context.register(new GradleJarPresenceChange(new GradleJarId(path, libraryId), null));
+ context.register(new GradleJarPresenceChange(new GradleJarId(path, gradleType, libraryId), null));
}
}
- if (!intellijBinaryPaths.isEmpty()) {
- GradleLibraryId libraryId = new GradleLibraryId(GradleEntityOwner.INTELLIJ, GradleUtil.getLibraryName(intellijEntity));
- for (String path : intellijBinaryPaths) {
- context.register(new GradleJarPresenceChange(null, new GradleJarId(path, libraryId)));
+ if (!ideBinaryPaths.isEmpty()) {
+ GradleLibraryId libraryId = new GradleLibraryId(GradleEntityOwner.IDE, GradleUtil.getLibraryName(ideEntity));
+ for (String path : ideBinaryPaths) {
+ context.register(new GradleJarPresenceChange(null, new GradleJarId(path, gradleType, libraryId)));
}
}
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull Library entity) {
+ public Object getIdeKey(@NotNull Library entity) {
return GradleUtil.getLibraryName(entity);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/module/GradleModuleStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/module/GradleModuleStructureChangesCalculator.java
index 4115c65244e3..7f2aeee9e9ca 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/module/GradleModuleStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/module/GradleModuleStructureChangesCalculator.java
@@ -59,21 +59,21 @@ public class GradleModuleStructureChangesCalculator implements GradleStructureCh
@Override
public void calculate(@NotNull GradleModule gradleEntity,
- @NotNull Module intellijEntity,
+ @NotNull Module ideEntity,
@NotNull GradleChangesCalculationContext context)
{
// Content roots.
final Collection gradleContentRoots = gradleEntity.getContentRoots();
- final Collection intellijContentRoots = context.getPlatformFacade().getContentRoots(intellijEntity);
+ final Collection intellijContentRoots = context.getPlatformFacade().getContentRoots(ideEntity);
GradleDiffUtil.calculate(myContentRootCalculator, gradleContentRoots, intellijContentRoots, context);
// Dependencies.
- checkDependencies(gradleEntity, intellijEntity, context);
+ checkDependencies(gradleEntity, ideEntity, context);
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull Module entity) {
+ public Object getIdeKey(@NotNull Module entity) {
return entity.getName();
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleLanguageLevelChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleLanguageLevelChange.java
index 5d69e1d49dec..93c9b27c798a 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleLanguageLevelChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleLanguageLevelChange.java
@@ -30,7 +30,7 @@ import org.jetbrains.plugins.gradle.util.GradleBundle;
public class GradleLanguageLevelChange extends GradleAbstractConflictingPropertyChange {
public GradleLanguageLevelChange(@NotNull LanguageLevel gradleValue, @NotNull LanguageLevel intellijValue) {
- super(new GradleProjectId(GradleEntityOwner.INTELLIJ), GradleBundle.message("gradle.sync.change.project.language.level.text"),
+ super(new GradleProjectId(GradleEntityOwner.IDE), GradleBundle.message("gradle.sync.change.project.language.level.text"),
gradleValue, intellijValue);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectRenameChange.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectRenameChange.java
index 385d708065c0..b8e7e3326e2f 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectRenameChange.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectRenameChange.java
@@ -16,7 +16,7 @@ import org.jetbrains.plugins.gradle.util.GradleBundle;
public class GradleProjectRenameChange extends GradleAbstractConflictingPropertyChange {
public GradleProjectRenameChange(@NotNull String gradleName, @NotNull String intellijName) {
- super(new GradleProjectId(GradleEntityOwner.INTELLIJ), GradleBundle.message("gradle.sync.change.project.name.text"),
+ super(new GradleProjectId(GradleEntityOwner.IDE), GradleBundle.message("gradle.sync.change.project.name.text"),
gradleName, intellijName);
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectStructureChangesCalculator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectStructureChangesCalculator.java
index f999dd659b0c..89f5d491f45b 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectStructureChangesCalculator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/diff/project/GradleProjectStructureChangesCalculator.java
@@ -44,22 +44,22 @@ public class GradleProjectStructureChangesCalculator implements GradleStructureC
@Override
public void calculate(@NotNull GradleProject gradleEntity,
- @NotNull Project intellijEntity,
+ @NotNull Project ideEntity,
@NotNull GradleChangesCalculationContext context)
{
- calculateProjectChanges(gradleEntity, intellijEntity, context.getCurrentChanges());
+ calculateProjectChanges(gradleEntity, ideEntity, context.getCurrentChanges());
final Set gradleSubEntities = gradleEntity.getModules();
- final Collection intellijSubEntities = myPlatformFacade.getModules(intellijEntity);
+ final Collection intellijSubEntities = myPlatformFacade.getModules(ideEntity);
GradleDiffUtil.calculate(myModuleChangesCalculator, gradleSubEntities, intellijSubEntities, context);
- LibraryTable libraryTable = myPlatformFacade.getProjectLibraryTable(intellijEntity);
+ LibraryTable libraryTable = myPlatformFacade.getProjectLibraryTable(ideEntity);
GradleDiffUtil.calculate(myLibraryChangesCalculator, gradleEntity.getLibraries(), Arrays.asList(libraryTable.getLibraries()), context);
}
@NotNull
@Override
- public Object getIntellijKey(@NotNull Project entity) {
+ public Object getIdeKey(@NotNull Project entity) {
return entity.getName();
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleDependencyManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleDependencyManager.java
index f8ec9ac9121b..77807200391e 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleDependencyManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleDependencyManager.java
@@ -68,7 +68,7 @@ public class GradleDependencyManager {
final GradleProjectStructureHelper projectStructureHelper = module.getProject().getComponent(GradleProjectStructureHelper.class);
for (GradleModuleDependency dependency : dependencies) {
final String moduleName = dependency.getName();
- final Module intellijModule = projectStructureHelper.findIntellijModule(moduleName);
+ final Module intellijModule = projectStructureHelper.findIdeModule(moduleName);
if (intellijModule == null) {
assert false;
continue;
@@ -78,7 +78,7 @@ public class GradleDependencyManager {
continue;
}
- ModuleOrderEntry orderEntry = projectStructureHelper.findIntellijModuleDependency(dependency, moduleRootModel);
+ ModuleOrderEntry orderEntry = projectStructureHelper.findIdeModuleDependency(dependency, moduleRootModel);
if (orderEntry == null) {
orderEntry = moduleRootModel.addModuleOrderEntry(intellijModule);
}
@@ -120,7 +120,7 @@ public class GradleDependencyManager {
assert false;
continue;
}
- LibraryOrderEntry orderEntry = helper.findIntellijLibraryDependency(dependency.getName(), moduleRootModel);
+ LibraryOrderEntry orderEntry = helper.findIdeLibraryDependency(dependency.getName(), moduleRootModel);
if (orderEntry == null) {
// We need to get the most up-to-date Library object due to our project model restrictions.
orderEntry = moduleRootModel.addLibraryEntry(library);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleJarManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleJarManager.java
index 0d2b4a6b46bf..614dd7a4d7fe 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleJarManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleJarManager.java
@@ -28,7 +28,9 @@ import com.intellij.util.containers.ContainerUtilRt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.config.PlatformFacade;
import org.jetbrains.plugins.gradle.model.gradle.GradleJar;
+import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType;
import org.jetbrains.plugins.gradle.model.id.GradleLibraryId;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
import org.jetbrains.plugins.gradle.util.GradleLog;
import org.jetbrains.plugins.gradle.util.GradleUtil;
@@ -44,10 +46,12 @@ import java.util.Set;
*/
public class GradleJarManager {
- @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
- public GradleJarManager(@NotNull PlatformFacade facade) {
+ public GradleJarManager(@NotNull PlatformFacade facade, @NotNull GradleLibraryPathTypeMapper mapper) {
myPlatformFacade = facade;
+ myLibraryPathTypeMapper = mapper;
}
public void importJar(@NotNull final GradleJar jar, @NotNull final Project project) {
@@ -61,7 +65,8 @@ public class GradleJarManager {
}
Library.ModifiableModel model = library.getModifiableModel();
try {
- for (VirtualFile file : model.getFiles(OrderRootType.CLASSES)) {
+ OrderRootType ideJarType = myLibraryPathTypeMapper.map(jar.getPathType());
+ for (VirtualFile file : model.getFiles(ideJarType)) {
if (jar.getPath().equals(GradleUtil.getLocalFileSystemPath(file))) {
return;
}
@@ -75,7 +80,7 @@ public class GradleJarManager {
return;
}
if (virtualFile.isDirectory()) {
- model.addRoot(virtualFile, OrderRootType.CLASSES);
+ model.addRoot(virtualFile, ideJarType);
}
else {
VirtualFile jarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(virtualFile);
@@ -85,7 +90,7 @@ public class GradleJarManager {
));
return;
}
- model.addRoot(jarRoot, OrderRootType.CLASSES);
+ model.addRoot(jarRoot, ideJarType);
}
}
finally {
@@ -117,7 +122,7 @@ public class GradleJarManager {
Set libraryJars = ContainerUtilRt.newHashSet(entry.getValue());
for (GradleJar jar : entry.getValue()) {
boolean valid = false;
- for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) {
+ for (VirtualFile file : library.getFiles(myLibraryPathTypeMapper.map(jar.getPathType()))) {
if (jar.getPath().equals(GradleUtil.getLocalFileSystemPath(file))) {
valid = true;
break;
@@ -158,9 +163,12 @@ public class GradleJarManager {
});
Library.ModifiableModel model = library.getModifiableModel();
try {
- for (VirtualFile file : model.getFiles(OrderRootType.CLASSES)) {
- if (pathsToRemove.contains(GradleUtil.getLocalFileSystemPath(file))) {
- model.removeRoot(file.getUrl(), OrderRootType.CLASSES);
+ for (LibraryPathType gradlePathType : LibraryPathType.values()) {
+ OrderRootType idePathType = myLibraryPathTypeMapper.map(gradlePathType);
+ for (VirtualFile file : model.getFiles(idePathType)) {
+ if (pathsToRemove.contains(GradleUtil.getLocalFileSystemPath(file))) {
+ model.removeRoot(file.getUrl(), idePathType);
+ }
}
}
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLibraryManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLibraryManager.java
index c0b38fae255e..2ea2fcc7927b 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLibraryManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLibraryManager.java
@@ -1,7 +1,6 @@
package org.jetbrains.plugins.gradle.manage;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.JavadocOrderRootType;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.roots.libraries.LibraryTable;
@@ -14,6 +13,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.config.PlatformFacade;
import org.jetbrains.plugins.gradle.model.gradle.GradleLibrary;
import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
import org.jetbrains.plugins.gradle.util.GradleLog;
import org.jetbrains.plugins.gradle.util.GradleUtil;
@@ -26,10 +26,12 @@ import java.util.*;
*/
public class GradleLibraryManager {
- @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
- public GradleLibraryManager(@NotNull PlatformFacade platformFacade) {
+ public GradleLibraryManager(@NotNull PlatformFacade platformFacade, @NotNull GradleLibraryPathTypeMapper mapper) {
myPlatformFacade = platformFacade;
+ myLibraryPathTypeMapper = mapper;
}
public void importLibraries(@NotNull Collection libraries, @NotNull Project project) {
@@ -37,7 +39,7 @@ public class GradleLibraryManager {
importLibrary(library, project);
}
}
-
+
public void importLibrary(@NotNull final GradleLibrary library, @NotNull final Project project) {
Map> libraryFiles = new HashMap>();
for (LibraryPathType pathType : LibraryPathType.values()) {
@@ -45,7 +47,7 @@ public class GradleLibraryManager {
if (paths.isEmpty()) {
continue;
}
- libraryFiles.put(Lazy.LIBRARY_ROOT_MAPPINGS.get(pathType), ContainerUtil.map(paths, new NotNullFunction() {
+ libraryFiles.put(myLibraryPathTypeMapper.map(pathType), ContainerUtil.map(paths, new NotNullFunction() {
@NotNull
@Override
public File fun(String path) {
@@ -119,16 +121,4 @@ public class GradleLibraryManager {
//LibraryTable table = library.getTable();
//table.removeLibrary(library);
}
-
-
- private static class Lazy {
- static final Map LIBRARY_ROOT_MAPPINGS
- = new EnumMap(LibraryPathType.class);
- static {
- LIBRARY_ROOT_MAPPINGS.put(LibraryPathType.BINARY, OrderRootType.CLASSES);
- LIBRARY_ROOT_MAPPINGS.put(LibraryPathType.SOURCE, OrderRootType.SOURCES);
- LIBRARY_ROOT_MAPPINGS.put(LibraryPathType.DOC, JavadocOrderRootType.getInstance());
- assert LibraryPathType.values().length == LIBRARY_ROOT_MAPPINGS.size();
- }
- }
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelper.java
index d034e210d356..4456d5b765a4 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelper.java
@@ -17,7 +17,7 @@ import org.jetbrains.plugins.gradle.model.gradle.*;
import org.jetbrains.plugins.gradle.model.id.GradleContentRootId;
import org.jetbrains.plugins.gradle.model.id.GradleEntityId;
import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper;
-import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
+import org.jetbrains.plugins.gradle.model.intellij.IdeEntityVisitor;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
import org.jetbrains.plugins.gradle.sync.GradleProjectStructureHelper;
import org.jetbrains.plugins.gradle.ui.GradleProjectStructureNode;
@@ -139,7 +139,7 @@ public class GradleLocalNodeManageHelper {
}
private void collectModuleEntities(@NotNull GradleModule module, @NotNull Context context) {
- final Module intellijModule = myProjectStructureHelper.findIntellijModule(module);
+ final Module intellijModule = myProjectStructureHelper.findIdeModule(module);
if (intellijModule != null) {
// Already imported
return;
@@ -158,7 +158,7 @@ public class GradleLocalNodeManageHelper {
private void collectContentRoots(@NotNull GradleContentRoot contentRoot, @NotNull Context context) {
final GradleContentRootId id = GradleEntityIdMapper.mapEntityToId(contentRoot);
- final ModuleAwareContentRoot intellijContentRoot = myProjectStructureHelper.findIntellijContentRoot(id);
+ final ModuleAwareContentRoot intellijContentRoot = myProjectStructureHelper.findIdeContentRoot(id);
if (intellijContentRoot != null) {
// Already imported.
return;
@@ -167,14 +167,14 @@ public class GradleLocalNodeManageHelper {
}
private void collectModuleDependencyEntities(@NotNull GradleModuleDependency dependency, @NotNull Context context) {
- final ModuleOrderEntry intellijModuleDependency = myProjectStructureHelper.findIntellijModuleDependency(dependency);
+ final ModuleOrderEntry intellijModuleDependency = myProjectStructureHelper.findIdeModuleDependency(dependency);
if (intellijModuleDependency != null) {
// Already imported.
return;
}
context.dependencies.add(dependency);
final GradleModule gradleModule = dependency.getTarget();
- final Module intellijModule = myProjectStructureHelper.findIntellijModule(gradleModule);
+ final Module intellijModule = myProjectStructureHelper.findIdeModule(gradleModule);
if (intellijModule != null) {
return;
}
@@ -190,7 +190,7 @@ public class GradleLocalNodeManageHelper {
private void collectLibraryDependencyEntities(@NotNull GradleLibraryDependency dependency, @NotNull Context context) {
final LibraryOrderEntry intellijDependency
- = myProjectStructureHelper.findIntellijLibraryDependency(dependency.getOwnerModule().getName(), dependency.getName());
+ = myProjectStructureHelper.findIdeLibraryDependency(dependency.getOwnerModule().getName(), dependency.getName());
Set intellijPaths = ContainerUtilRt.newHashSet();
GradleLibrary gradleLibrary = dependency.getTarget();
Library intellijLibrary = null;
@@ -202,7 +202,7 @@ public class GradleLocalNodeManageHelper {
}
if (intellijLibrary == null) {
- intellijLibrary = myProjectStructureHelper.findIntellijLibrary(gradleLibrary);
+ intellijLibrary = myProjectStructureHelper.findIdeLibrary(gradleLibrary);
}
if (intellijLibrary == null) {
@@ -216,7 +216,7 @@ public class GradleLocalNodeManageHelper {
for (String gradleJarPath : gradleLibrary.getPaths(LibraryPathType.BINARY)) {
if (!intellijPaths.contains(gradleJarPath)) {
- context.jars.add(new GradleJar(gradleJarPath, null, gradleLibrary));
+ context.jars.add(new GradleJar(gradleJarPath, LibraryPathType.BINARY, null, gradleLibrary));
}
}
}
@@ -240,7 +240,7 @@ public class GradleLocalNodeManageHelper {
@Override
public void visit(@NotNull GradleContentRoot contentRoot) {
- final Module intellijModule = myProjectStructureHelper.findIntellijModule(contentRoot.getOwnerModule());
+ final Module intellijModule = myProjectStructureHelper.findIdeModule(contentRoot.getOwnerModule());
if (intellijModule == null) {
GradleLog.LOG.warn(String.format(
"Can't import gradle module content root. Reason: corresponding module is not registered at the current intellij project. "
@@ -263,14 +263,14 @@ public class GradleLocalNodeManageHelper {
@Override
public void visit(@NotNull GradleModuleDependency dependency) {
- final Module module = myProjectStructureHelper.findIntellijModule(dependency.getOwnerModule());
+ final Module module = myProjectStructureHelper.findIdeModule(dependency.getOwnerModule());
assert module != null;
myModuleDependencyManager.importDependency(dependency, module);
}
@Override
public void visit(@NotNull GradleLibraryDependency dependency) {
- final Module module = myProjectStructureHelper.findIntellijModule(dependency.getOwnerModule());
+ final Module module = myProjectStructureHelper.findIdeModule(dependency.getOwnerModule());
assert module != null;
myModuleDependencyManager.importDependency(dependency, module);
}
@@ -284,7 +284,7 @@ public class GradleLocalNodeManageHelper {
final List contentRoots = ContainerUtilRt.newArrayList();
final List dependencies = ContainerUtilRt.newArrayList();
final List jars = ContainerUtilRt.newArrayList();
- IntellijEntityVisitor intellijVisitor = new IntellijEntityVisitor() {
+ IdeEntityVisitor intellijVisitor = new IdeEntityVisitor() {
@Override public void visit(@NotNull Project project) { }
@Override public void visit(@NotNull Module module) { modules.add(module); }
@Override public void visit(@NotNull ModuleAwareContentRoot contentRoot) { contentRoots.add(contentRoot); }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
index e57379e6cae3..aefb78dbd352 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/manage/GradleProjectImportBuilder.java
@@ -237,7 +237,7 @@ public class GradleProjectImportBuilder extends ProjectImportBuilder
+ * Target use-case: gradle uses gradle version-specific file system directory for holding downloaded library dependencies.
+ * I.e. when we build project info with gradle of version X, it puts all jars into directory Dx. But when gradle version is
+ * changed to Y, it will store all jars into directory Dy (different from Dx). So, following scenario is possible:
+ *
+ *
+ * - A user imports IJ project from gradle v.X;
+ * - All necessary jars are downloaded and stored at Dx;
+ * - A user switched gradle to version Y;
+ * -
+ * When the project is refreshed we have a number of changes like 'gradle-local jar with location at Dy' and
+ * 'intellij-local jar with location at Dx';
+ *
+ *
+ *
+ * We want to avoid that by auto-adjusting intellij library path config within the moved jars info.
+ *
+ * Thread-safe.
+ *
+ * @author Denis Zhdanov
+ * @since 1/16/13 6:19 PM
+ */
+public class GradleMovedJarsPostProcessor implements GradleProjectStructureChangesPostProcessor {
+
+ @NotNull private final GradleJarManager myJarManager;
+
+ public GradleMovedJarsPostProcessor(@NotNull GradleJarManager manager) {
+ myJarManager = manager;
+ }
+
+ @Override
+ public void processChanges(@NotNull final Collection changes, @NotNull final Project project) {
+ final Collection toMerge = buildMergeData(changes, project.getComponent(GradleProjectStructureContext.class));
+ if (toMerge == null) {
+ return;
+ }
+
+ Runnable mergeTask = new Runnable() {
+ @Override
+ public void run() {
+ for (MergeInfo info : toMerge) {
+ myJarManager.removeJars(Collections.singleton(info.ideJar), project);
+ myJarManager.importJar(info.gradleJar, project);
+ changes.removeAll(info.changes);
+ }
+ }
+ };
+ doMerge(mergeTask, project);
+ }
+
+ /**
+ * This method is introduced in order to allow to cut 'Execute EDT/Execute under write action' etc stuff during test execution.
+ *
+ * @param mergeTask merge changes function object
+ * @param project target project
+ */
+ public void doMerge(@NotNull final Runnable mergeTask, @NotNull final Project project) {
+ GradleUtil.executeProjectChangeAction(project, mergeTask, true, new Runnable() {
+ @Override
+ public void run() {
+ ProjectRootManagerEx.getInstanceEx(project).mergeRootsChangesDuring(mergeTask);
+ }
+ });
+ }
+
+ @Nullable
+ static Collection buildMergeData(@NotNull Collection changes,
+ @NotNull GradleProjectStructureContext context)
+ {
+ final Map> changesByLibrary = ContainerUtilRt.newHashMap();
+ GradleProjectStructureChangeVisitor visitor = new GradleProjectStructureChangeVisitorAdapter() {
+ @Override
+ public void visit(@NotNull GradleJarPresenceChange change) {
+ GradleJarId id = change.getIdeEntity();
+ if (id == null) {
+ id = change.getGradleEntity();
+ }
+ assert id != null;
+ String libraryName = id.getLibraryId().getLibraryName();
+ Set c = changesByLibrary.get(libraryName);
+ if (c == null) {
+ changesByLibrary.put(libraryName, c = ContainerUtilRt.newHashSet());
+ }
+ c.add(change);
+ }
+ };
+ for (GradleProjectStructureChange change : changes) {
+ change.invite(visitor);
+ }
+
+ final Collection toMerge = ContainerUtilRt.newArrayList();
+ for (Set c : changesByLibrary.values()) {
+ processLibraryJarChanges(c, context, toMerge);
+ }
+ if (toMerge.isEmpty()) {
+ return null;
+ }
+ return toMerge;
+ }
+
+ private static void processLibraryJarChanges(@NotNull Set changes,
+ @NotNull GradleProjectStructureContext context,
+ @NotNull Collection toMerge)
+ {
+ Map> gradleLocalJars = ContainerUtilRt.newHashMap();
+ Map> ideLocalJars = ContainerUtilRt.newHashMap();
+ for (GradleJarPresenceChange change : changes) {
+ Map> storageToUse = gradleLocalJars;
+ GradleJarId entity = change.getGradleEntity();
+ if (entity == null) {
+ entity = change.getIdeEntity();
+ assert entity != null;
+ storageToUse = ideLocalJars;
+ }
+ GradleArtifactInfo artifactInfo = GradleUtil.parseArtifactInfo(entity.getPath());
+ if (artifactInfo != null) {
+ Map m = storageToUse.get(entity.getLibraryPathType());
+ if (m == null) {
+ storageToUse.put(entity.getLibraryPathType(), m = ContainerUtilRt.newHashMap());
+ }
+ m.put(artifactInfo, change);
+ }
+ }
+
+ for (Map.Entry> entry : gradleLocalJars.entrySet()) {
+ for (GradleArtifactInfo info : entry.getValue().keySet()) {
+ Map m = ideLocalJars.get(entry.getKey());
+ if (m == null) {
+ continue;
+ }
+ GradleJarPresenceChange ideLocalJarChange = m.get(info);
+ if (ideLocalJarChange == null) {
+ continue;
+ }
+ GradleJarId ideJarId = ideLocalJarChange.getIdeEntity();
+ assert ideJarId != null;
+ GradleJar ideJar = ideJarId.mapToEntity(context);
+ if (ideJar == null) {
+ continue;
+ }
+
+ GradleJarPresenceChange gradleLocalJarChange = entry.getValue().get(info);
+ GradleJarId gradleJarId = gradleLocalJarChange.getGradleEntity();
+ assert gradleJarId != null;
+ GradleJar gradleJar = gradleJarId.mapToEntity(context);
+ if (gradleJar == null) {
+ continue;
+ }
+
+ toMerge.add(new MergeInfo(gradleJar, ideJar, gradleLocalJarChange, ideLocalJarChange));
+ }
+ }
+ }
+
+ static class MergeInfo {
+
+ @NotNull public final Collection changes = ContainerUtilRt.newArrayList();
+
+ @NotNull public final GradleJar gradleJar;
+ @NotNull public final GradleJar ideJar;
+
+ MergeInfo(@NotNull GradleJar gradleJar, @NotNull GradleJar ideJar, GradleJarPresenceChange... changes) {
+ this.gradleJar = gradleJar;
+ this.ideJar = ideJar;
+ this.changes.addAll(Arrays.asList(changes));
+ }
+
+ @Override
+ public String toString() {
+ return String.format("jar '%s' for library '%s'", gradleJar.getName(), gradleJar.getLibraryId().getLibraryName());
+ }
+ }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
index e95dab8dc8d5..b1e5eb160a92 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModel.java
@@ -2,14 +2,18 @@ package org.jetbrains.plugins.gradle.sync;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.project.Project;
+import com.intellij.util.containers.ContainerUtilRt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
import org.jetbrains.plugins.gradle.diff.GradleChangesCalculationContext;
import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
import org.jetbrains.plugins.gradle.diff.GradleStructureChangesCalculator;
import org.jetbrains.plugins.gradle.config.PlatformFacade;
import org.jetbrains.plugins.gradle.model.gradle.GradleProject;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
+import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -25,22 +29,29 @@ import java.util.concurrent.atomic.AtomicReference;
*/
public class GradleProjectStructureChangesModel extends AbstractProjectComponent {
- private final Set myListeners = new CopyOnWriteArraySet();
- private final AtomicReference> myChanges
- = new AtomicReference>(new HashSet());
-
- private final AtomicReference myGradleProject = new AtomicReference();
+ private final Set myListeners =
+ new CopyOnWriteArraySet();
+ private final AtomicReference> myChanges =
+ new AtomicReference>(new HashSet());
+
+ private final AtomicReference myGradleProject = new AtomicReference();
+ private final Collection myPostProcessors = ContainerUtilRt.createEmptyCOWList();
@NotNull private final GradleStructureChangesCalculator myChangesCalculator;
- @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final PlatformFacade myPlatformFacade;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
public GradleProjectStructureChangesModel(@NotNull Project project,
@NotNull GradleStructureChangesCalculator changesCalculator,
- @NotNull PlatformFacade platformFacade)
+ @NotNull PlatformFacade platformFacade,
+ @NotNull GradleLibraryPathTypeMapper mapper,
+ @NotNull GradleMovedJarsPostProcessor movedJarsPostProcessor)
{
super(project);
myChangesCalculator = changesCalculator;
myPlatformFacade = platformFacade;
+ myLibraryPathTypeMapper = mapper;
+ myPostProcessors.add(movedJarsPostProcessor);
}
/**
@@ -63,7 +74,10 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
*/
public void update(@NotNull GradleProject gradleProject) {
myGradleProject.set(gradleProject);
- GradleChangesCalculationContext context = getCurrentChangesContext(gradleProject);
+ final GradleChangesCalculationContext context = getCurrentChangesContext(gradleProject);
+ for (GradleProjectStructureChangesPostProcessor processor : myPostProcessors) {
+ processor.processChanges(context.getCurrentChanges(), myProject);
+ }
if (!context.hasNewChanges()) {
return;
}
@@ -81,6 +95,12 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
return myGradleProject.get();
}
+ @NotNull
+ @TestOnly
+ public Collection getPostProcessors() {
+ return myPostProcessors;
+ }
+
/**
* Registers given listener within the current model.
*
@@ -94,7 +114,8 @@ public class GradleProjectStructureChangesModel extends AbstractProjectComponent
@NotNull
public GradleChangesCalculationContext getCurrentChangesContext(@NotNull GradleProject gradleProject) {
- GradleChangesCalculationContext context = new GradleChangesCalculationContext(myChanges.get(), myPlatformFacade);
+ GradleChangesCalculationContext context
+ = new GradleChangesCalculationContext(myChanges.get(), myPlatformFacade, myLibraryPathTypeMapper);
myChangesCalculator.calculate(gradleProject, myProject, context);
return context;
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPostProcessor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPostProcessor.java
new file mode 100644
index 000000000000..914aac966adc
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesPostProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.sync;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
+
+import java.util.Collection;
+
+/**
+ * Defines contract for entity which is eligible to adjust project structure changes.
+ * E.g. resolve changes (auto-import), transform them (build one 'dependency library is outdated from 'gradle-local library' and
+ * 'intellij-local library' changes etc.
+ *
+ * Implementations of this interface are expected to be thread-safe.
+ *
+ * @author Denis Zhdanov
+ * @since 1/16/13 5:24 PM
+ */
+public interface GradleProjectStructureChangesPostProcessor {
+
+ /**
+ * Callback to provide current post processor with information about current changes and ability to adjust them in-place.
+ *
+ * Note: this callback is assumed to be called from EDT, in order to allow synchronous processing such as
+ * given changes collection's modification is immediately visible to the calling code.
+ *
+ * @param changes current changes which might be adjusted
+ * @param project current intellij project
+ */
+ void processChanges(@NotNull Collection changes, @NotNull Project project);
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
index b380cafb198b..972fa5ec0707 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureHelper.java
@@ -14,6 +14,7 @@ import org.jetbrains.plugins.gradle.config.PlatformFacade;
import org.jetbrains.plugins.gradle.model.gradle.*;
import org.jetbrains.plugins.gradle.model.id.*;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
import org.jetbrains.plugins.gradle.util.GradleUtil;
/**
@@ -24,23 +25,26 @@ import org.jetbrains.plugins.gradle.util.GradleUtil;
*/
public class GradleProjectStructureHelper extends AbstractProjectComponent {
- private final GradleProjectStructureChangesModel myModel;
- private final PlatformFacade myFacade;
+ @NotNull private final GradleProjectStructureChangesModel myModel;
+ @NotNull private final PlatformFacade myFacade;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
public GradleProjectStructureHelper(@NotNull Project project,
@NotNull GradleProjectStructureChangesModel model,
- @NotNull PlatformFacade facade)
+ @NotNull PlatformFacade facade,
+ @NotNull GradleLibraryPathTypeMapper mapper)
{
super(project);
myModel = model;
myFacade = facade;
+ myLibraryPathTypeMapper = mapper;
}
-
+
@NotNull
public Project getProject() {
return myProject;
}
-
+
/**
* Allows to answer if target library dependency is still available at the target project.
*
@@ -48,8 +52,8 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
* @return true if target library dependency is still available at the target project;
* false otherwise
*/
- public boolean isIntellijLibraryDependencyExist(@NotNull final GradleLibraryDependencyId id) {
- return findIntellijLibraryDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
+ public boolean isIdeLibraryDependencyExist(@NotNull final GradleLibraryDependencyId id) {
+ return findIdeLibraryDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
}
/**
@@ -63,24 +67,23 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
return findGradleLibraryDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
}
- public boolean isIntellijModuleDependencyExist(@NotNull final GradleModuleDependencyId id) {
- return findIntellijModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
+ public boolean isIdeModuleDependencyExist(@NotNull final GradleModuleDependencyId id) {
+ return findIdeModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
}
public boolean isGradleModuleDependencyExist(@NotNull final GradleModuleDependencyId id) {
- return findIntellijModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
+ return findIdeModuleDependency(id.getOwnerModuleName(), id.getDependencyName()) != null;
}
@Nullable
- public Module findIntellijModule(@NotNull GradleModule module) {
- // TODO den consider 'merged modules' at the registered project structure changes here.
- return findIntellijModule(module.getName());
+ public Module findIdeModule(@NotNull GradleModule module) {
+ return findIdeModule(module.getName());
}
@Nullable
- public Module findIntellijModule(@NotNull String intellijModuleName) {
+ public Module findIdeModule(@NotNull String ideModuleName) {
for (Module module : myFacade.getModules(myProject)) {
- if (intellijModuleName.equals(module.getName())) {
+ if (ideModuleName.equals(module.getName())) {
return module;
}
}
@@ -116,8 +119,8 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public ModuleAwareContentRoot findIntellijContentRoot(@NotNull GradleContentRootId id) {
- final Module module = findIntellijModule(id.getModuleName());
+ public ModuleAwareContentRoot findIdeContentRoot(@NotNull GradleContentRootId id) {
+ final Module module = findIdeModule(id.getModuleName());
if (module == null) {
return null;
}
@@ -131,29 +134,28 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public Library findIntellijLibrary(@NotNull final GradleLibrary library) {
- return findIntellijLibrary(library.getName());
+ public Library findIdeLibrary(@NotNull final GradleLibrary library) {
+ return findIdeLibrary(library.getName());
}
@Nullable
- public Library findIntellijLibrary(@NotNull String libraryName) {
+ public Library findIdeLibrary(@NotNull String libraryName) {
final LibraryTable libraryTable = myFacade.getProjectLibraryTable(myProject);
- for (Library intellijLibrary : libraryTable.getLibraries()) {
- // TODO den consider 'merged libraries' at the registered project structure changes here.
- if (libraryName.equals(GradleUtil.getLibraryName(intellijLibrary))) {
- return intellijLibrary;
+ for (Library ideLibrary : libraryTable.getLibraries()) {
+ if (libraryName.equals(GradleUtil.getLibraryName(ideLibrary))) {
+ return ideLibrary;
}
}
return null;
}
@Nullable
- public Library findIntellijLibrary(@NotNull String libraryName, @NotNull String jarPath) {
- Library library = findIntellijLibrary(libraryName);
+ public Library findIdeLibrary(@NotNull String libraryName, @NotNull OrderRootType jarType, @NotNull String jarPath) {
+ Library library = findIdeLibrary(libraryName);
if (library == null) {
return null;
}
- for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) {
+ for (VirtualFile file : library.getFiles(jarType)) {
if (jarPath.equals(GradleUtil.getLocalFileSystemPath(file))) {
return library;
}
@@ -162,22 +164,21 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public LibraryOrderEntry findIntellijLibraryDependency(@NotNull final String moduleName, @NotNull final String libraryName) {
- final Module intellijModule = findIntellijModule(moduleName);
- if (intellijModule == null) {
+ public LibraryOrderEntry findIdeLibraryDependency(@NotNull final String moduleName, @NotNull final String libraryName) {
+ final Module ideModule = findIdeModule(moduleName);
+ if (ideModule == null) {
return null;
}
RootPolicy visitor = new RootPolicy() {
@Override
- public LibraryOrderEntry visitLibraryOrderEntry(LibraryOrderEntry intellijDependency, LibraryOrderEntry value) {
- // TODO den consider 'merged libraries' at the registered project structure changes here.
- if (libraryName.equals(intellijDependency.getLibraryName())) {
- return intellijDependency;
+ public LibraryOrderEntry visitLibraryOrderEntry(LibraryOrderEntry ideDependency, LibraryOrderEntry value) {
+ if (libraryName.equals(ideDependency.getLibraryName())) {
+ return ideDependency;
}
return value;
}
};
- for (OrderEntry entry : myFacade.getOrderEntries(intellijModule)) {
+ for (OrderEntry entry : myFacade.getOrderEntries(ideModule)) {
final LibraryOrderEntry result = entry.accept(visitor, null);
if (result != null) {
return result;
@@ -187,8 +188,8 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public LibraryOrderEntry findIntellijLibraryDependency(@NotNull final String libraryName,
- @NotNull ModifiableRootModel model)
+ public LibraryOrderEntry findIdeLibraryDependency(@NotNull final String libraryName,
+ @NotNull ModifiableRootModel model)
{
for (OrderEntry entry : model.getOrderEntries()) {
if (entry instanceof LibraryOrderEntry) {
@@ -221,12 +222,12 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public GradleLibrary findGradleLibrary(@NotNull String libraryName, @NotNull String jarPath) {
+ public GradleLibrary findGradleLibrary(@NotNull String libraryName, @NotNull LibraryPathType jarType, @NotNull String jarPath) {
GradleLibrary library = findGradleLibrary(libraryName);
if (library == null) {
return null;
}
- return library.getPaths(LibraryPathType.BINARY).contains(jarPath) ? library : null;
+ return library.getPaths(jarType).contains(jarPath) ? library : null;
}
@Nullable
@@ -278,28 +279,27 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public ModuleOrderEntry findIntellijModuleDependency(@NotNull final GradleModuleDependency gradleDependency) {
- return findIntellijModuleDependency(gradleDependency.getOwnerModule().getName(), gradleDependency.getTarget().getName());
+ public ModuleOrderEntry findIdeModuleDependency(@NotNull final GradleModuleDependency gradleDependency) {
+ return findIdeModuleDependency(gradleDependency.getOwnerModule().getName(), gradleDependency.getTarget().getName());
}
@Nullable
- public ModuleOrderEntry findIntellijModuleDependency(@NotNull final String ownerModuleName, @NotNull final String dependencyModuleName) {
- final Module intellijOwnerModule = findIntellijModule(ownerModuleName);
- if (intellijOwnerModule == null) {
+ public ModuleOrderEntry findIdeModuleDependency(@NotNull final String ownerModuleName, @NotNull final String dependencyModuleName) {
+ final Module ideOwnerModule = findIdeModule(ownerModuleName);
+ if (ideOwnerModule == null) {
return null;
}
RootPolicy visitor = new RootPolicy() {
@Override
- public ModuleOrderEntry visitModuleOrderEntry(ModuleOrderEntry intellijDependency, ModuleOrderEntry value) {
- // TODO den consider 'merged modules' at the registered project structure changes here.
- if (dependencyModuleName.equals(intellijDependency.getModuleName())) {
- return intellijDependency;
+ public ModuleOrderEntry visitModuleOrderEntry(ModuleOrderEntry ideDependency, ModuleOrderEntry value) {
+ if (dependencyModuleName.equals(ideDependency.getModuleName())) {
+ return ideDependency;
}
return value;
}
};
- for (OrderEntry orderEntry : myFacade.getOrderEntries(intellijOwnerModule)) {
+ for (OrderEntry orderEntry : myFacade.getOrderEntries(ideOwnerModule)) {
final ModuleOrderEntry result = orderEntry.accept(visitor, null);
if (result != null) {
return result;
@@ -309,7 +309,7 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public ModuleOrderEntry findIntellijModuleDependency(@NotNull GradleModuleDependency dependency, @NotNull ModifiableRootModel model) {
+ public ModuleOrderEntry findIdeModuleDependency(@NotNull GradleModuleDependency dependency, @NotNull ModifiableRootModel model) {
for (OrderEntry entry : model.getOrderEntries()) {
if (entry instanceof ModuleOrderEntry) {
ModuleOrderEntry candidate = (ModuleOrderEntry)entry;
@@ -322,14 +322,14 @@ public class GradleProjectStructureHelper extends AbstractProjectComponent {
}
@Nullable
- public GradleJar findIntellijJar(@NotNull GradleJarId jarId) {
- Library library = findIntellijLibrary(jarId.getLibraryId().getLibraryName());
+ public GradleJar findIdeJar(@NotNull GradleJarId jarId) {
+ Library library = findIdeLibrary(jarId.getLibraryId().getLibraryName());
if (library == null) {
return null;
}
- for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) {
+ for (VirtualFile file : library.getFiles(myLibraryPathTypeMapper.map(jarId.getLibraryPathType()))) {
if (jarId.getPath().equals(GradleUtil.getLocalFileSystemPath(file))) {
- return new GradleJar(jarId.getPath(), library, null);
+ return new GradleJar(jarId.getPath(), jarId.getLibraryPathType(), library, null);
}
}
return null;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
index eda055096227..eee849bf55d1 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureTreeModel.java
@@ -238,7 +238,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleLibraryId libraryId = node.getDescriptor().getElement().getLibraryId();
for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) {
- GradleJarId jarId = new GradleJarId(GradleUtil.getLocalFileSystemPath(file), libraryId);
+ GradleJarId jarId = new GradleJarId(GradleUtil.getLocalFileSystemPath(file), LibraryPathType.BINARY, libraryId);
GradleProjectStructureNode jarNode = buildNode(jarId, GradleUtil.extractNameFromPath(jarId.getPath()));
jarNode.getDescriptor().setToolTip(jarId.getPath());
node.add(jarNode);
@@ -361,7 +361,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
singleRoot = module == null || module.getContentRoots().size() <= 1;
}
else {
- final Module module = myProjectStructureHelper.findIntellijModule(id.getModuleName());
+ final Module module = myProjectStructureHelper.findIdeModule(id.getModuleName());
singleRoot = module == null || myPlatformFacade.getContentRoots(module).size() <= 1;
}
return buildContentRootNode(id, singleRoot);
@@ -502,7 +502,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
Map> gradleJarIds = ContainerUtilRt.newHashMap();
GradleLibraryId libraryId = dependencyNode.getDescriptor().getElement().getLibraryId();
for (String path : gradleLibrary.getPaths(LibraryPathType.BINARY)) {
- GradleJarId jarId = new GradleJarId(path, libraryId);
+ GradleJarId jarId = new GradleJarId(path, LibraryPathType.BINARY, libraryId);
GradleProjectStructureNode jarNode = existingJarNodes.get(jarId);
if (jarNode == null) {
jarNode = buildNode(jarId, GradleUtil.extractNameFromPath(jarId.getPath()));
@@ -513,7 +513,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
gradleJarIds.put(jarId, jarNode);
}
- Library intellijLibrary = myProjectStructureHelper.findIntellijLibrary(gradleLibrary);
+ Library intellijLibrary = myProjectStructureHelper.findIdeLibrary(gradleLibrary);
if (intellijLibrary == null) {
for (GradleProjectStructureNode jarNode : dependencyNode) {
jarNode.setAttributes(GradleTextAttributes.GRADLE_LOCAL_CHANGE);
@@ -522,7 +522,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
else {
Set intellijJarIds = ContainerUtilRt.newHashSet();
for (VirtualFile jarFile : intellijLibrary.getFiles(OrderRootType.CLASSES)) {
- GradleJarId jarId = new GradleJarId(GradleUtil.getLocalFileSystemPath(jarFile), libraryId);
+ GradleJarId jarId = new GradleJarId(GradleUtil.getLocalFileSystemPath(jarFile), LibraryPathType.BINARY, libraryId);
if (gradleJarIds.remove(jarId) == null) {
intellijJarIds.add(jarId);
}
@@ -543,10 +543,14 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleJarId jarId = change.getGradleEntity();
TextAttributesKey attributes = GradleTextAttributes.GRADLE_LOCAL_CHANGE;
if (jarId == null) {
- jarId = change.getIntellijEntity();
+ jarId = change.getIdeEntity();
attributes = GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
assert jarId != null;
}
+ if (jarId.getLibraryPathType() != LibraryPathType.BINARY) {
+ // Ignore non-binary paths (docs, sources) as they are not shown at the JetGradle tool window's project structure view.
+ return;
+ }
if (obsolete) {
attributes = GradleTextAttributes.NO_CHANGE;
}
@@ -563,7 +567,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
for (GradleProjectStructureNode jarNode : libraryDependencyNode.getChildren(GradleJarId.class)) {
if (jarNode.getDescriptor().getElement().equals(jarId)) {
- if (obsolete && myProjectStructureHelper.findIntellijJar(jarId) == null) {
+ if (obsolete && myProjectStructureHelper.findIdeJar(jarId) == null) {
// It was a gradle-local change which is now obsolete. Remove the jar node then.
jarNode.removeFromParent();
}
@@ -580,7 +584,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
// There is a possible case that both gradle and intellij have a library with the same name but different jar sets.
// We don't want to show intellij-local jars for the gradle-local module which uses that library then.
- if (jarId.getOwner() == GradleEntityOwner.INTELLIJ
+ if (jarId.getOwner() == GradleEntityOwner.IDE
&& myModules.get(entry.getKey()).getDescriptor().getAttributes() == GradleTextAttributes.GRADLE_LOCAL_CHANGE)
{
continue;
@@ -609,7 +613,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
I id = change.getGradleEntity();
TextAttributesKey attributes = GradleTextAttributes.GRADLE_LOCAL_CHANGE;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
attributes = GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
}
assert id != null;
@@ -639,7 +643,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
final GradleModuleId id;
final TextAttributesKey key;
if (change.getGradleEntity() == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
key = GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
}
else {
@@ -659,7 +663,7 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleContentRootId id = change.getGradleEntity();
TextAttributesKey key = GradleTextAttributes.GRADLE_LOCAL_CHANGE;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
key = GradleTextAttributes.INTELLIJ_LOCAL_CHANGE;
}
assert id != null;
@@ -701,9 +705,9 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleLibraryDependencyId id = change.getGradleEntity();
boolean removeNode;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
assert id != null;
- removeNode = !myProjectStructureHelper.isIntellijLibraryDependencyExist(id);
+ removeNode = !myProjectStructureHelper.isIdeLibraryDependencyExist(id);
}
else {
removeNode = !myProjectStructureHelper.isGradleLibraryDependencyExist(id);
@@ -715,9 +719,9 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleModuleDependencyId id = change.getGradleEntity();
boolean removeNode;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
assert id != null;
- removeNode = !myProjectStructureHelper.isIntellijModuleDependencyExist(id);
+ removeNode = !myProjectStructureHelper.isIdeModuleDependencyExist(id);
}
else {
removeNode = !myProjectStructureHelper.isGradleModuleDependencyExist(id);
@@ -762,9 +766,9 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleModuleId id = change.getGradleEntity();
boolean removeNode;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
assert id != null;
- removeNode = myProjectStructureHelper.findIntellijModule(id.getModuleName()) == null;
+ removeNode = myProjectStructureHelper.findIdeModule(id.getModuleName()) == null;
}
else {
removeNode = myProjectStructureHelper.findGradleModule(id.getModuleName()) == null;
@@ -796,9 +800,9 @@ public class GradleProjectStructureTreeModel extends DefaultTreeModel {
GradleContentRootId id = change.getGradleEntity();
final boolean removeNode;
if (id == null) {
- id = change.getIntellijEntity();
+ id = change.getIdeEntity();
assert id != null;
- removeNode = myProjectStructureHelper.findIntellijContentRoot(id) == null;
+ removeNode = myProjectStructureHelper.findIdeContentRoot(id) == null;
}
else {
removeNode = myProjectStructureHelper.findGradleContentRoot(id) == null;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleCommonDependencyConflictControlFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleCommonDependencyConflictControlFactory.java
index 621b311cd97d..05c7c7bd12f6 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleCommonDependencyConflictControlFactory.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleCommonDependencyConflictControlFactory.java
@@ -72,11 +72,11 @@ public class GradleCommonDependencyConflictControlFactory {
MatrixControlBuilder builder = GradleUtil.getConflictChangeBuilder();
if (scopeChange != null) {
builder.addRow(GradleBundle.message("gradle.sync.change.dependency.scope.text"),
- scopeChange.getGradleValue(), scopeChange.getIntellijValue());
+ scopeChange.getGradleValue(), scopeChange.getIdeValue());
}
if (exportedChange != null) {
builder.addRow(GradleBundle.message("gradle.sync.change.dependency.exported.text"),
- exportedChange.getGradleValue(), exportedChange.getIntellijValue());
+ exportedChange.getGradleValue(), exportedChange.getIdeValue());
}
return builder.build();
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
index c456da679920..56d18616c509 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java
@@ -9,7 +9,7 @@ import com.intellij.openapi.util.Ref;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
-import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
+import org.jetbrains.plugins.gradle.model.intellij.IdeEntityVisitor;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
import org.jetbrains.plugins.gradle.util.GradleUtil;
@@ -51,7 +51,7 @@ public class GradleConflictControlFactory {
@Nullable
public JComponent getDiffControl(@NotNull Object entity, final @NotNull Collection changes) {
final Ref result = new Ref();
- GradleUtil.dispatch(entity, new IntellijEntityVisitor() {
+ GradleUtil.dispatch(entity, new IdeEntityVisitor() {
@Override
public void visit(@NotNull Project project) {
result.set(myProjectFactory.getControl(changes));
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleProjectConflictControlFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleProjectConflictControlFactory.java
index 822b27fcec3f..d23430a30652 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleProjectConflictControlFactory.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleProjectConflictControlFactory.java
@@ -58,12 +58,12 @@ public class GradleProjectConflictControlFactory {
MatrixControlBuilder builder = GradleUtil.getConflictChangeBuilder();
if (renameChange != null) {
builder.addRow(GradleBundle.message("gradle.import.structure.settings.label.name"),
- renameChange.getGradleValue(), renameChange.getIntellijValue());
+ renameChange.getGradleValue(), renameChange.getIdeValue());
}
if (languageLevelChange != null) {
builder.addRow(GradleBundle.message("gradle.import.structure.settings.label.language.level"),
- getTextToShow(languageLevelChange.getGradleValue()), getTextToShow(languageLevelChange.getIntellijValue()));
+ getTextToShow(languageLevelChange.getGradleValue()), getTextToShow(languageLevelChange.getIdeValue()));
}
return builder.build();
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
index cd1855181e5d..93a4350107ec 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNode.java
@@ -1,7 +1,7 @@
package org.jetbrains.plugins.gradle.ui;
import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.containers.ContainerUtilRt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.config.GradleTextAttributes;
import org.jetbrains.plugins.gradle.diff.GradleProjectStructureChange;
@@ -21,11 +21,13 @@ import java.util.*;
public class GradleProjectStructureNode extends DefaultMutableTreeNode
implements Iterable> {
- private final Set myConflictChanges = new HashSet();
- private final List myListeners = ContainerUtil.createLockFreeCopyOnWriteList();
+ private final Set myConflictChanges = ContainerUtilRt.newHashSet();
+ // TODO den switch to ContainerUtil.createLockFreeCopyOnWriteList() when v.12.1 is going to be released (preserve JetGradle
+ // TODO compatibility with v.12.0 at the moment)
+ private final List myListeners = ContainerUtilRt.createEmptyCOWList();
@NotNull private final Comparator> myComparator;
- @NotNull private final GradleProjectStructureNodeDescriptor myDescriptor;
+ @NotNull private final GradleProjectStructureNodeDescriptor myDescriptor;
private boolean mySkipNotification;
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeComparator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeComparator.java
index 1506cad2184e..6ed844968cb2 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeComparator.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeComparator.java
@@ -13,8 +13,8 @@ import org.jetbrains.plugins.gradle.model.GradleEntityOwner;
import org.jetbrains.plugins.gradle.model.GradleEntityType;
import org.jetbrains.plugins.gradle.model.gradle.*;
import org.jetbrains.plugins.gradle.model.id.GradleEntityId;
+import org.jetbrains.plugins.gradle.model.intellij.IdeEntityVisitor;
import org.jetbrains.plugins.gradle.util.GradleProjectStructureContext;
-import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
import org.jetbrains.plugins.gradle.util.GradleUtil;
@@ -55,10 +55,10 @@ public class GradleProjectStructureNodeComparator implements Comparator exte
owner = GradleEntityOwner.GRADLE;
}
else if (attributes == GradleTextAttributes.NO_CHANGE || attributes == GradleTextAttributes.INTELLIJ_LOCAL_CHANGE) {
- owner = GradleEntityOwner.INTELLIJ;
+ owner = GradleEntityOwner.IDE;
}
myId.setOwner(owner);
update();
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleArtifactInfo.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleArtifactInfo.java
new file mode 100644
index 000000000000..4a286cd013bd
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleArtifactInfo.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/16/13 6:26 PM
+ */
+public class GradleArtifactInfo {
+
+ @Nullable private final String myName;
+ @Nullable private final String myGroup;
+ @Nullable private final String myVersion;
+
+ public GradleArtifactInfo(@Nullable String name, @Nullable String group, @Nullable String version) {
+ assert name != null || group != null || version != null;
+ myName = name;
+ myGroup = group;
+ myVersion = version;
+ }
+
+ @Nullable
+ public String getName() {
+ return myName;
+ }
+
+ // Commented to apply to green code policy. Un-comment if required.
+
+ //@Nullable
+ //public String getGroup() {
+ // return myGroup;
+ //}
+ //
+ //@Nullable
+ //public String getVersion() {
+ // return myVersion;
+ //}
+
+ @Override
+ public int hashCode() {
+ int result = myName != null ? myName.hashCode() : 0;
+ result = 31 * result + (myGroup != null ? myGroup.hashCode() : 0);
+ result = 31 * result + (myVersion != null ? myVersion.hashCode() : 0);
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ GradleArtifactInfo info = (GradleArtifactInfo)o;
+
+ if (myGroup != null ? !myGroup.equals(info.myGroup) : info.myGroup != null) return false;
+ if (myName != null ? !myName.equals(info.myName) : info.myName != null) return false;
+ if (myVersion != null ? !myVersion.equals(info.myVersion) : info.myVersion != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s:%s:%s",
+ myName == null ? "" : myName,
+ myGroup == null ? "" : myGroup,
+ myVersion == null ? "" : myVersion);
+ }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapper.java
new file mode 100644
index 000000000000..64c0cb528fc7
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapper.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util;
+
+import com.intellij.openapi.roots.JavadocOrderRootType;
+import com.intellij.openapi.roots.OrderRootType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType;
+
+/**
+ * Strategy for mapping {@link LibraryPathType gradle library path types} to {@link OrderRootType ide library path types}.
+ *
+ * Is introduced because {@link JavadocOrderRootType#getInstance() 'real ide doc type'} assumes that project IoC is setup thus
+ * make it ineligible for unit testing.
+ *
+ * Implementations of this interface are expected to be thread-safe.
+ *
+ * @author Denis Zhdanov
+ * @since 1/17/13 3:51 PM
+ */
+public interface GradleLibraryPathTypeMapper {
+
+ @NotNull
+ OrderRootType map(@NotNull LibraryPathType type);
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapperImpl.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapperImpl.java
new file mode 100644
index 000000000000..d84b54acfdde
--- /dev/null
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryPathTypeMapperImpl.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util;
+
+import com.intellij.openapi.roots.JavadocOrderRootType;
+import com.intellij.openapi.roots.OrderRootType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/17/13 3:55 PM
+ */
+public class GradleLibraryPathTypeMapperImpl implements GradleLibraryPathTypeMapper {
+
+ private static final Map MAPPINGS = new EnumMap(LibraryPathType.class);
+
+ static {
+ MAPPINGS.put(LibraryPathType.BINARY, OrderRootType.CLASSES);
+ MAPPINGS.put(LibraryPathType.SOURCE, OrderRootType.SOURCES);
+ MAPPINGS.put(LibraryPathType.DOC, JavadocOrderRootType.getInstance());
+ assert LibraryPathType.values().length == MAPPINGS.size();
+ }
+
+ @NotNull
+ @Override
+ public OrderRootType map(@NotNull LibraryPathType type) {
+ return MAPPINGS.get(type);
+ }
+}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleProjectStructureContext.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleProjectStructureContext.java
index b63aa65034dd..9629f29a0a0b 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleProjectStructureContext.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleProjectStructureContext.java
@@ -18,14 +18,17 @@ public class GradleProjectStructureContext {
@NotNull private final GradleProjectStructureHelper myProjectStructureHelper;
@NotNull private final PlatformFacade myPlatformFacade;
@NotNull private final GradleProjectStructureChangesModel myChangesModel;
+ @NotNull private final GradleLibraryPathTypeMapper myLibraryPathTypeMapper;
public GradleProjectStructureContext(@NotNull GradleProjectStructureHelper projectStructureHelper,
@NotNull PlatformFacade platformFacade,
- @NotNull GradleProjectStructureChangesModel changesModel)
+ @NotNull GradleProjectStructureChangesModel changesModel,
+ @NotNull GradleLibraryPathTypeMapper mapper)
{
myProjectStructureHelper = projectStructureHelper;
myPlatformFacade = platformFacade;
myChangesModel = changesModel;
+ myLibraryPathTypeMapper = mapper;
}
@NotNull
@@ -42,4 +45,9 @@ public class GradleProjectStructureContext {
public GradleProjectStructureChangesModel getChangesModel() {
return myChangesModel;
}
+
+ @NotNull
+ public GradleLibraryPathTypeMapper getLibraryPathTypeMapper() {
+ return myLibraryPathTypeMapper;
+ }
}
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
index e2d5dec5e8e3..4dab960795e9 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
@@ -44,7 +44,7 @@ import org.jetbrains.plugins.gradle.manage.GradleProjectEntityChangeListener;
import org.jetbrains.plugins.gradle.model.gradle.GradleProject;
import org.jetbrains.plugins.gradle.model.id.GradleEntityId;
import org.jetbrains.plugins.gradle.model.id.GradleSyntheticId;
-import org.jetbrains.plugins.gradle.model.intellij.IntellijEntityVisitor;
+import org.jetbrains.plugins.gradle.model.intellij.IdeEntityVisitor;
import org.jetbrains.plugins.gradle.model.intellij.ModuleAwareContentRoot;
import org.jetbrains.plugins.gradle.remote.GradleApiException;
import org.jetbrains.plugins.gradle.sync.GradleProjectStructureTreeModel;
@@ -64,6 +64,8 @@ import java.io.StringWriter;
import java.util.Arrays;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* Holds miscellaneous utility methods.
@@ -73,8 +75,9 @@ import java.util.concurrent.TimeUnit;
*/
public class GradleUtil {
- public static final String PATH_SEPARATOR = "/";
- public static final String SYSTEM_DIRECTORY_PATH_KEY = "GRADLE_USER_HOME";
+ public static final String PATH_SEPARATOR = "/";
+ public static final String SYSTEM_DIRECTORY_PATH_KEY = "GRADLE_USER_HOME";
+ private static final Pattern ARTIFACT_PATTERN = Pattern.compile(".*/(.+?)(?:-([\\d+](?:\\.[\\d]+)*))?(?:\\.[^\\.]+?)?");
private static final NotNullLazyValue INSTALLATION_MANAGER =
new NotNullLazyValue() {
@@ -220,12 +223,15 @@ public class GradleUtil {
return;
}
assert linkedProjectPath != null;
- Ref errorDetailsHolder = new Ref();
+ Ref errorDetailsHolder = new Ref() {
+ @Override
+ public void set(@Nullable String error) {
+ if (!StringUtil.isEmpty(error)) {
+ GradleLog.LOG.warn(error);
+ }
+ }
+ };
refreshProject(project, linkedProjectPath, errorMessageHolder, errorDetailsHolder, true, false);
- final String error = errorDetailsHolder.get();
- if (!StringUtil.isEmpty(error)) {
- GradleLog.LOG.warn(error);
- }
}
/**
@@ -332,7 +338,7 @@ public class GradleUtil {
* @param entity intellij project entity candidate to dispatch
* @param visitor dispatch callback to use for the given entity
*/
- public static void dispatch(@Nullable Object entity, @NotNull IntellijEntityVisitor visitor) {
+ public static void dispatch(@Nullable Object entity, @NotNull IdeEntityVisitor visitor) {
if (entity instanceof Project) {
visitor.visit(((Project)entity));
}
@@ -518,12 +524,30 @@ public class GradleUtil {
public static void executeProjectChangeAction(@NotNull Project project, @NotNull Object entityToChange, @NotNull Runnable task) {
- executeProjectChangeAction(project, Collections.singleton(entityToChange), task);
+ executeProjectChangeAction(project, entityToChange, false, task);
+ }
+
+ public static void executeProjectChangeAction(@NotNull Project project,
+ @NotNull Object entityToChange,
+ boolean synchronous,
+ @NotNull Runnable task)
+ {
+ executeProjectChangeAction(project, Collections.singleton(entityToChange), synchronous, task);
+ }
+
+ public static void executeProjectChangeAction(@NotNull final Project project,
+ @NotNull final Iterable entitiesToChange,
+ @NotNull final Runnable task)
+ {
+ executeProjectChangeAction(project, entitiesToChange, false, task);
}
- public static void executeProjectChangeAction(@NotNull final Project project, @NotNull final Iterable entitiesToChange, @NotNull final Runnable task) {
- UIUtil.invokeLaterIfNeeded(new Runnable() {
- @Override
+ public static void executeProjectChangeAction(@NotNull final Project project,
+ @NotNull final Iterable entitiesToChange,
+ boolean synchronous,
+ @NotNull final Runnable task)
+ {
+ Runnable wrappedTask = new Runnable() {
public void run() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
@@ -539,11 +563,27 @@ public class GradleUtil {
for (Object e : entitiesToChange) {
publisher.onChangeEnd(e);
}
- }
+ }
}
});
}
- });
+ };
+
+ if (synchronous) {
+ UIUtil.invokeAndWaitIfNeeded(wrappedTask);
+ }
+ else {
+ UIUtil.invokeLaterIfNeeded(wrappedTask);
+ }
+ }
+
+ @Nullable
+ public static GradleArtifactInfo parseArtifactInfo(@NotNull String fileName) {
+ Matcher matcher = ARTIFACT_PATTERN.matcher(fileName);
+ if (!matcher.matches()) {
+ return null;
+ }
+ return new GradleArtifactInfo(matcher.group(1), null, matcher.group(2));
}
private interface TaskUnderProgress {
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelperTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelperTest.groovy
index cc436dad1d4c..7077b657f2d9 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelperTest.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/manage/GradleLocalNodeManageHelperTest.groovy
@@ -3,6 +3,7 @@ package org.jetbrains.plugins.gradle.manage;
import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper
import org.jetbrains.plugins.gradle.testutil.AbstractGradleTest
+import org.junit.Before
import org.junit.Test
import org.picocontainer.MutablePicoContainer
@@ -17,13 +18,18 @@ import static org.junit.Assert.fail
public class GradleLocalNodeManageHelperTest extends AbstractGradleTest {
private GradleLocalNodeManageHelper myHelper
+
+ @Before
+ public void setUp() {
+ super.setUp();
+ clearChangePostProcessors()
+ }
@Override
protected void configureContainer(MutablePicoContainer container) {
container.registerComponentImplementation(GradleLocalNodeManageHelper)
container.registerComponentImplementation(GradleModuleManager)
container.registerComponentImplementation(GradleLibraryManager)
- container.registerComponentImplementation(GradleJarManager)
container.registerComponentImplementation(GradleDependencyManager)
container.registerComponentImplementation(GradleContentRootManager)
}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleMovedJarsPostProcessorTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleMovedJarsPostProcessorTest.groovy
new file mode 100644
index 000000000000..593ef13adc18
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleMovedJarsPostProcessorTest.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.sync
+
+import com.intellij.openapi.roots.libraries.Library
+import org.jetbrains.plugins.gradle.manage.GradleJarManager
+import org.jetbrains.plugins.gradle.model.gradle.GradleJar
+import org.jetbrains.plugins.gradle.model.gradle.GradleLibrary
+import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType
+import org.jetbrains.plugins.gradle.testutil.AbstractGradleTest
+import org.jetbrains.plugins.gradle.util.GradleUtil
+import org.jetbrains.plugins.gradle.util.TestGradleJarManager
+import org.junit.Assert
+import org.junit.Test
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/17/13 4:40 PM
+ */
+class GradleMovedJarsPostProcessorTest extends AbstractGradleTest {
+
+ @Test
+ void "moved jar matched"() {
+ init(
+ gradle: {
+ project {
+ module {
+ dependencies {
+ library('lib1', bin: ['repo1/jar1', 'repo1/jar2'], src: [ 'repo1/zip1', 'repo1/zip2']) }}}},
+ intellij: {
+ project {
+ module {
+ dependencies {
+ library('lib1', bin: ['repo2/jar1', 'repo2/jar2'], src: [ 'repo2/zip1', 'repo2/zip2']) }}}}
+ )
+
+ checkChanges { }
+
+ def gradleLibrary = gradle.libraries['lib1'] as GradleLibrary
+ def ideLibrary = intellij.libraries['lib1'] as Library
+ def expectedImported = [
+ new GradleJar(GradleUtil.toCanonicalPath('repo1/jar1'), LibraryPathType.BINARY, null, gradleLibrary),
+ new GradleJar(GradleUtil.toCanonicalPath('repo1/jar2'), LibraryPathType.BINARY, null, gradleLibrary),
+ new GradleJar(GradleUtil.toCanonicalPath('repo1/zip1'), LibraryPathType.SOURCE, null, gradleLibrary),
+ new GradleJar(GradleUtil.toCanonicalPath('repo1/zip2'), LibraryPathType.SOURCE, null, gradleLibrary),
+ ]
+
+ def expectedRemoved = [
+ new GradleJar(GradleUtil.toCanonicalPath('repo2/jar1'), LibraryPathType.BINARY, ideLibrary, null),
+ new GradleJar(GradleUtil.toCanonicalPath('repo2/jar2'), LibraryPathType.BINARY, ideLibrary, null),
+ new GradleJar(GradleUtil.toCanonicalPath('repo2/zip1'), LibraryPathType.SOURCE, ideLibrary, null),
+ new GradleJar(GradleUtil.toCanonicalPath('repo2/zip2'), LibraryPathType.SOURCE, ideLibrary, null),
+ ]
+ TestGradleJarManager jarManager = container.getComponentInstance(GradleJarManager)
+ Assert.assertEquals(expectedImported.toSet(), jarManager.importedJars.toSet())
+ Assert.assertEquals(expectedRemoved.toSet(), jarManager.removedJars.toSet())
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
index b1836fe4d600..41bae71d576e 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesModelTest.groovy
@@ -5,6 +5,7 @@ import com.intellij.testFramework.SkipInHeadlessEnvironment
import org.jetbrains.plugins.gradle.diff.library.GradleJarPresenceChange
import org.jetbrains.plugins.gradle.diff.module.GradleModulePresenceChange
import org.jetbrains.plugins.gradle.testutil.AbstractGradleTest
+import org.junit.Before
import org.junit.Test
import static org.junit.Assert.assertEquals
@@ -18,6 +19,12 @@ import org.jetbrains.plugins.gradle.config.GradleTextAttributes
@SkipInHeadlessEnvironment
public class GradleProjectStructureChangesModelTest extends AbstractGradleTest {
+ @Before
+ public void setUp() {
+ super.setUp()
+ clearChangePostProcessors()
+ }
+
@Test
public void "obsolete gradle-local modules"() {
// Configure initial projects state.
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
index 878d3c146bb0..e374dbcb2dcf 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/AbstractGradleTest.groovy
@@ -15,18 +15,23 @@ import org.jetbrains.plugins.gradle.diff.dependency.GradleModuleDependencyStruct
import org.jetbrains.plugins.gradle.diff.library.GradleLibraryStructureChangesCalculator
import org.jetbrains.plugins.gradle.diff.module.GradleModuleStructureChangesCalculator
import org.jetbrains.plugins.gradle.diff.project.GradleProjectStructureChangesCalculator
+import org.jetbrains.plugins.gradle.manage.GradleJarManager
import org.jetbrains.plugins.gradle.model.GradleEntityOwner
import org.jetbrains.plugins.gradle.model.gradle.GradleLibrary
import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType
import org.jetbrains.plugins.gradle.model.id.GradleEntityIdMapper
import org.jetbrains.plugins.gradle.model.id.GradleJarId
import org.jetbrains.plugins.gradle.model.id.GradleLibraryId
+import org.jetbrains.plugins.gradle.sync.GradleMovedJarsPostProcessor
import org.jetbrains.plugins.gradle.sync.GradleProjectStructureChangesModel
import org.jetbrains.plugins.gradle.sync.GradleProjectStructureHelper
import org.jetbrains.plugins.gradle.sync.GradleProjectStructureTreeModel
import org.jetbrains.plugins.gradle.ui.GradleProjectStructureNodeFilter
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper
import org.jetbrains.plugins.gradle.util.GradleProjectStructureContext
import org.jetbrains.plugins.gradle.util.GradleUtil
+import org.jetbrains.plugins.gradle.util.TestGradleJarManager
+import org.jetbrains.plugins.gradle.util.TestGradleMovedJarsPostProcessor
import org.junit.Before
import org.picocontainer.MutablePicoContainer
import org.picocontainer.defaults.DefaultPicoContainer
@@ -68,7 +73,12 @@ public abstract class AbstractGradleTest {
container.registerComponentImplementation(GradleLibraryStructureChangesCalculator)
container.registerComponentImplementation(GradleEntityIdMapper)
container.registerComponentImplementation(GradleProjectStructureContext)
+ container.registerComponentImplementation(GradleLibraryPathTypeMapper, TestGradleLibraryPathTypeMapper)
+ container.registerComponentImplementation(GradleJarManager, TestGradleJarManager)
+ container.registerComponentImplementation(GradleMovedJarsPostProcessor, TestGradleMovedJarsPostProcessor)
configureContainer(container)
+
+ intellij.projectStub.getComponent = { clazz -> container.getComponentInstance(clazz) }
changesModel = container.getComponentInstance(GradleProjectStructureChangesModel) as GradleProjectStructureChangesModel
@@ -77,6 +87,10 @@ public abstract class AbstractGradleTest {
}
}
+ protected void clearChangePostProcessors() {
+ changesModel.postProcessors.clear()
+ }
+
protected void configureContainer(MutablePicoContainer container) {
}
@@ -155,7 +169,7 @@ public abstract class AbstractGradleTest {
for (GradleLibrary library in (gradle.libraries.values() as Collection)) {
for (libPath in library.getPaths(LibraryPathType.BINARY)) {
if (libPath == pathToUse) {
- return new GradleJarId(pathToUse, new GradleLibraryId(GradleEntityOwner.GRADLE, library.name))
+ return new GradleJarId(pathToUse, LibraryPathType.BINARY, new GradleLibraryId(GradleEntityOwner.GRADLE, library.name))
}
}
}
@@ -163,7 +177,7 @@ public abstract class AbstractGradleTest {
for (Library library in (intellij.libraries.values() as Collection)) {
for (jarFile in library.getFiles(OrderRootType.CLASSES)) {
if (pathToUse == jarFile.path) {
- return new GradleJarId(pathToUse, new GradleLibraryId(GradleEntityOwner.INTELLIJ, library.name))
+ return new GradleJarId(pathToUse, LibraryPathType.BINARY, new GradleLibraryId(GradleEntityOwner.IDE, library.name))
}
}
}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
index 7c405f01baf5..18fe8441836d 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/IntellijProjectBuilder.groovy
@@ -21,7 +21,7 @@ import org.jetbrains.plugins.gradle.util.GradleUtil
*/
class IntellijProjectBuilder extends AbstractProjectBuilder {
- static def LIBRARY_ENTRY_TYPES = [(OrderRootType.CLASSES) : "bin"]
+ static def LIBRARY_ENTRY_TYPES = [(OrderRootType.CLASSES) : "bin", (OrderRootType.SOURCES) : "src"]
static VirtualFile[] DUMMY_VIRTUAL_FILE_ARRAY = new VirtualFile[0]
def projectStub = [getName: { same }]
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy
index 88df5c10ef4d..6357f1bc4bdd 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/ProjectStructureChecker.groovy
@@ -81,7 +81,7 @@ class ProjectStructureChecker {
assertEquals("node '$descriptor'", expectedMarkup, descriptor.attributes)
if (descriptor.element.type != GradleEntityType.SYNTHETIC) {
- def expectedOwner = expectedMarkup == GradleTextAttributes.GRADLE_LOCAL_CHANGE ? GradleEntityOwner.GRADLE : GradleEntityOwner.INTELLIJ
+ def expectedOwner = expectedMarkup == GradleTextAttributes.GRADLE_LOCAL_CHANGE ? GradleEntityOwner.GRADLE : GradleEntityOwner.IDE
assertEquals("node '$descriptor'", expectedOwner, descriptor.element.owner)
}
}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/TestGradleLibraryPathTypeMapper.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/TestGradleLibraryPathTypeMapper.java
new file mode 100644
index 000000000000..4b3b8b2cbee7
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/testutil/TestGradleLibraryPathTypeMapper.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.testutil;
+
+import com.intellij.openapi.roots.OrderRootType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.model.gradle.LibraryPathType;
+import org.jetbrains.plugins.gradle.util.GradleLibraryPathTypeMapper;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/17/13 4:07 PM
+ */
+public class TestGradleLibraryPathTypeMapper implements GradleLibraryPathTypeMapper {
+
+ private static final Map MAPPINGS = new EnumMap(LibraryPathType.class);
+
+ static {
+ MAPPINGS.put(LibraryPathType.BINARY, OrderRootType.CLASSES);
+ MAPPINGS.put(LibraryPathType.SOURCE, OrderRootType.SOURCES);
+ MAPPINGS.put(LibraryPathType.DOC, OrderRootType.DOCUMENTATION);
+ assert LibraryPathType.values().length == MAPPINGS.size();
+ }
+
+ @NotNull
+ @Override
+ public OrderRootType map(@NotNull LibraryPathType type) {
+ return MAPPINGS.get(type);
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/GradleUtilTest.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/GradleUtilTest.groovy
new file mode 100644
index 000000000000..8d8535e42af9
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/GradleUtilTest.groovy
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util
+
+import junit.framework.Assert
+import org.junit.Test;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/18/13 1:21 PM
+ */
+class GradleUtilTest {
+
+ @Test
+ void "parsing artifact info"() {
+ Assert.assertEquals(new GradleArtifactInfo('commons-io', null, '1.2'), GradleUtil.parseArtifactInfo("/my/commons-io-1.2.jar"))
+ Assert.assertEquals(new GradleArtifactInfo('c3p0', null, '2'), GradleUtil.parseArtifactInfo("/my/c3p0-2.jar"))
+ Assert.assertEquals(new GradleArtifactInfo('c3p0-sources', null, '2'), GradleUtil.parseArtifactInfo("/my/c3p0-sources-2.zip"))
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleJarManager.groovy b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleJarManager.groovy
new file mode 100644
index 000000000000..bd09b312bcef
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleJarManager.groovy
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util
+
+import com.intellij.openapi.project.Project
+import org.jetbrains.annotations.NotNull
+import org.jetbrains.plugins.gradle.config.PlatformFacade
+import org.jetbrains.plugins.gradle.manage.GradleJarManager
+import org.jetbrains.plugins.gradle.model.gradle.GradleJar
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/18/13 2:16 PM
+ */
+class TestGradleJarManager extends GradleJarManager {
+
+ def importedJars = []
+ def removedJars = []
+
+ TestGradleJarManager(@NotNull PlatformFacade facade,
+ @NotNull GradleLibraryPathTypeMapper mapper) {
+ super(facade, mapper);
+ }
+
+ @Override
+ void importJar(@NotNull GradleJar jar, @NotNull Project project) {
+ importedJars << jar
+ }
+
+ @Override
+ void removeJars(@NotNull Collection jars, @NotNull Project project) {
+ removedJars.addAll(jars)
+ }
+}
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleMovedJarsPostProcessor.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleMovedJarsPostProcessor.java
new file mode 100644
index 000000000000..ee3192e048c8
--- /dev/null
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/util/TestGradleMovedJarsPostProcessor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.gradle.util;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.gradle.manage.GradleJarManager;
+import org.jetbrains.plugins.gradle.sync.GradleMovedJarsPostProcessor;
+
+/**
+ * @author Denis Zhdanov
+ * @since 1/18/13 2:11 PM
+ */
+public class TestGradleMovedJarsPostProcessor extends GradleMovedJarsPostProcessor {
+
+ public TestGradleMovedJarsPostProcessor(@NotNull GradleJarManager manager) {
+ super(manager);
+ }
+
+ @Override
+ public void doMerge(@NotNull Runnable mergeTask, @NotNull Project project) {
+ mergeTask.run();
+ }
+}
diff --git a/plugins/groovy/jps-plugin/groovy-jps-plugin.iml b/plugins/groovy/jps-plugin/groovy-jps-plugin.iml
index c55d620328f1..9f6a87dfede5 100644
--- a/plugins/groovy/jps-plugin/groovy-jps-plugin.iml
+++ b/plugins/groovy/jps-plugin/groovy-jps-plugin.iml
@@ -10,6 +10,8 @@
+
+
diff --git a/plugins/groovy/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/plugins/groovy/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
new file mode 100644
index 000000000000..9ab572fa24cf
--- /dev/null
+++ b/plugins/groovy/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
@@ -0,0 +1 @@
+org.jetbrains.jps.incremental.groovy.GroovyModelSerializerExtension
\ No newline at end of file
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
index 13402d48eeba..09ff15d306b4 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Consumer;
import com.intellij.util.SystemProperties;
+import com.intellij.util.containers.ContainerUtilRt;
import gnu.trove.THashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -84,7 +85,9 @@ public class GroovyBuilder extends ModuleLevelBuilder {
DirtyFilesHolder dirtyFilesHolder,
OutputConsumer outputConsumer) throws ProjectBuildException {
try {
- final List toCompile = collectChangedFiles(context, dirtyFilesHolder);
+ JpsGroovySettings settings = JpsGroovySettings.getSettings(context.getProjectDescriptor().getProject());
+
+ final List toCompile = collectChangedFiles(context, dirtyFilesHolder, settings);
if (toCompile.isEmpty()) {
return ExitCode.NOTHING_DONE;
}
@@ -115,7 +118,7 @@ public class GroovyBuilder extends ModuleLevelBuilder {
final File tempFile = GroovycOSProcessHandler.fillFileWithGroovycParameters(
compilerOutput, toCompilePaths, finalOutput, class2Src, encoding, patchers
);
- final GroovycOSProcessHandler handler = runGroovyc(context, chunk, tempFile);
+ final GroovycOSProcessHandler handler = runGroovyc(context, chunk, tempFile, settings);
Map>
compiled = processCompiledFiles(context, chunk, generationOutputs, compilerOutput, handler);
@@ -154,20 +157,28 @@ public class GroovyBuilder extends ModuleLevelBuilder {
return toCompilePaths;
}
- private GroovycOSProcessHandler runGroovyc(final CompileContext context, ModuleChunk chunk, File tempFile) throws IOException {
- //todo xmx
+ private GroovycOSProcessHandler runGroovyc(final CompileContext context,
+ ModuleChunk chunk,
+ File tempFile,
+ final JpsGroovySettings settings) throws IOException {
ArrayList classpath = new ArrayList(generateClasspath(context, chunk));
if (LOG.isDebugEnabled()) {
LOG.debug("Groovyc classpath: " + classpath);
}
+
+ List programParams = ContainerUtilRt.newArrayList(myForStubs ? "stubs" : "groovyc", tempFile.getPath());
+ if (settings.invokeDynamic) {
+ programParams.add("--indy");
+ }
+
final List cmd = ExternalProcessUtil.buildJavaCommandLine(
getJavaExecutable(chunk),
"org.jetbrains.groovy.compiler.rt.GroovycRunner",
Collections.emptyList(), classpath,
- Arrays.asList("-Xmx384m",
+ Arrays.asList("-Xmx" + settings.heapSize + "m",
"-Dfile.encoding=" + System.getProperty("file.encoding")/*,
"-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5239"*/),
- Arrays.asList(myForStubs ? "stubs" : "groovyc", tempFile.getPath())
+ programParams
);
final Process process = Runtime.getRuntime().exec(ArrayUtil.toStringArray(cmd));
@@ -320,8 +331,8 @@ public class GroovyBuilder extends ModuleLevelBuilder {
return SystemProperties.getJavaHome() + "/bin/java";
}
- private static List collectChangedFiles(CompileContext context,
- DirtyFilesHolder dirtyFilesHolder) throws IOException {
+ private List collectChangedFiles(CompileContext context,
+ DirtyFilesHolder dirtyFilesHolder, final JpsGroovySettings settings) throws IOException {
final ResourcePatterns patterns = ResourcePatterns.KEY.get(context);
assert patterns != null;
final List toCompile = new ArrayList();
@@ -329,6 +340,10 @@ public class GroovyBuilder extends ModuleLevelBuilder {
public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor sourceRoot) throws IOException {
final String path = file.getPath();
if (isGroovyFile(path) && !patterns.isResourceFile(file, sourceRoot.root)) { //todo file type check
+ if (myForStubs && settings.isExcludedFromStubGeneration(file)) {
+ return true;
+ }
+
toCompile.add(file);
}
return true;
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyModelSerializerExtension.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyModelSerializerExtension.java
new file mode 100644
index 000000000000..4fd9b00723a4
--- /dev/null
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyModelSerializerExtension.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jps.incremental.groovy;
+
+import com.intellij.util.xmlb.XmlSerializer;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsProject;
+import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension;
+import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author peter
+ */
+public class GroovyModelSerializerExtension extends JpsModelSerializerExtension {
+
+ @NotNull
+ @Override
+ public List getProjectExtensionSerializers() {
+ return Arrays.asList(new JpsProjectExtensionSerializer("groovyc.xml", "GroovyCompilerProjectConfiguration") {
+ @Override
+ public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) {
+ JpsGroovySettings configuration = XmlSerializer.deserialize(componentTag, JpsGroovySettings.class);
+ if (configuration == null) {
+ configuration = new JpsGroovySettings();
+ }
+ configuration.initExcludes();
+ project.getContainer().setChild(JpsGroovySettings.ROLE, configuration);
+ }
+
+ @Override
+ public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) {
+ }
+ });
+ }
+}
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovySettings.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovySettings.java
new file mode 100644
index 000000000000..76e76cb7c440
--- /dev/null
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovySettings.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.jps.incremental.groovy;
+
+import com.intellij.util.xmlb.annotations.Tag;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsElementChildRole;
+import org.jetbrains.jps.model.JpsProject;
+import org.jetbrains.jps.model.ex.JpsElementBase;
+import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
+import org.jetbrains.jps.model.java.compiler.JpsCompilerExcludes;
+import org.jetbrains.jps.model.java.impl.compiler.JpsCompilerExcludesImpl;
+import org.jetbrains.jps.model.serialization.java.compiler.JpsJavaCompilerConfigurationSerializer;
+
+import java.io.File;
+
+/**
+ * @author peter
+ */
+public class JpsGroovySettings extends JpsElementBase {
+ static final JpsElementChildRole ROLE = JpsElementChildRoleBase.create("Groovy Compiler Configuration");
+ public static final String DEFAULT_HEAP_SIZE = "400";
+ public static final boolean DEFAULT_INVOKE_DYNAMIC = false;
+ public static final boolean DEFAULT_TRANSFORMS_OK = false;
+
+ public String heapSize = DEFAULT_HEAP_SIZE;
+ public boolean invokeDynamic = DEFAULT_INVOKE_DYNAMIC;
+
+ @Tag("excludes") public Element excludes = new Element("aaa");
+
+ public boolean transformsOk = DEFAULT_TRANSFORMS_OK;
+ private JpsCompilerExcludes myExcludeFromStubGeneration;
+
+ public JpsGroovySettings() {
+ }
+
+ public JpsGroovySettings(JpsGroovySettings original) {
+ heapSize = original.heapSize;
+ invokeDynamic = original.invokeDynamic;
+ }
+
+ void initExcludes() {
+ myExcludeFromStubGeneration = new JpsCompilerExcludesImpl();
+ JpsJavaCompilerConfigurationSerializer.readExcludes(excludes, myExcludeFromStubGeneration);
+ }
+
+ @NotNull
+ @Override
+ public JpsGroovySettings createCopy() {
+ return new JpsGroovySettings(this);
+ }
+
+ @Override
+ public void applyChanges(@NotNull JpsGroovySettings modified) {
+ }
+
+ @NotNull
+ public static JpsGroovySettings getSettings(@NotNull JpsProject project) {
+ JpsGroovySettings settings = project.getContainer().getChild(ROLE);
+ return settings == null ? new JpsGroovySettings() : settings;
+ }
+
+ public boolean isExcludedFromStubGeneration(File file) {
+ return myExcludeFromStubGeneration != null && myExcludeFromStubGeneration.isExcluded(file);
+ }
+}
diff --git a/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/after.groovy.template b/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/after.groovy.template
index 5a8a95a5f34a..8521c7c6005b 100644
--- a/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/after.groovy.template
+++ b/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/after.groovy.template
@@ -1,2 +1,2 @@
-x = y[z]
+x = y.getAt(z)
diff --git a/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/before.groovy.template b/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/before.groovy.template
index 8521c7c6005b..5a8a95a5f34a 100644
--- a/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/before.groovy.template
+++ b/plugins/groovy/resources/intentionDescriptions/IndexedExpressionConversionIntention/before.groovy.template
@@ -1,2 +1,2 @@
-x = y.getAt(z)
+x = y[z]
diff --git a/plugins/groovy/resources/standardDsls/defaultMethods.gdsl b/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
index 7727e3ecc3cf..60e521aac122 100644
--- a/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
+++ b/plugins/groovy/resources/standardDsls/defaultMethods.gdsl
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import static standardDsls.Constants.STRING
* @author Maxim.Medvedev
*/
-private interface Constants {
+interface Constants {
String STRING = "java.lang.String"
String WILDCARD_PREFIX = "? extends "
}
diff --git a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
index 758cc10a27aa..7a79ac591e82 100644
--- a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
+++ b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
@@ -76,8 +76,11 @@ public class GroovycRunner {
*/
if (args.length != 2) {
- System.err.println("There is no arguments for groovy compiler");
- return;
+ if (args.length != 3 || !"--indy".equals(args[2])) {
+ System.err.println("There is no arguments for groovy compiler");
+ System.exit(1);
+ }
+ System.setProperty("groovy.target.indy", "true");
}
final boolean forStubs = "stubs".equals(args[0]);
@@ -85,7 +88,7 @@ public class GroovycRunner {
if (!argsFile.exists()) {
System.err.println("Arguments file for groovy compiler not found");
- return;
+ System.exit(1);
}
try {
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 16070f00745c..c2a9beb0ae94 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -459,6 +459,8 @@
+
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
index 5ed73ac0d33b..8f79de6736cf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GroovyGenerationInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -78,7 +78,12 @@ public class GroovyGenerationInfo extends PsiGenerationInfo
@Override
public PsiElement findInsertionAnchor(@NotNull PsiClass aClass, @NotNull PsiElement leaf) {
+ if (leaf.getParent() == aClass) {
+ return null; // we are not in class body
+ }
+
PsiElement parent = aClass instanceof GroovyScriptClass ? aClass.getContainingFile() : ((GrTypeDefinition)aClass).getBody();
+ if (parent == null) return null;
PsiElement element = PsiTreeUtil.findPrevParent(parent, leaf);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java
index 4e958017c951..3d69d7d7011a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,74 @@ import java.util.List;
*/
public class GrReferenceHighlighter extends TextEditorHighlightingPass {
@NotNull private final GroovyFileBase myFile;
- @Nullable private List myInfos = null;
+ private List myInfos = null;
+
+ private final GroovyRecursiveElementVisitor myDeclarationHighlighter = new GroovyRecursiveElementVisitor() {
+ @Override
+ public void visitReferenceExpression(GrReferenceExpression referenceExpression) {
+ super.visitReferenceExpression(referenceExpression);
+ visit(referenceExpression);
+ }
+
+ @Override
+ public void visitCodeReferenceElement(GrCodeReferenceElement refElement) {
+ super.visitCodeReferenceElement(refElement);
+ visit(refElement);
+ }
+
+ @Override
+ public void visitVariable(GrVariable variable) {
+ super.visitVariable(variable);
+
+ if (GroovyRefactoringUtil.isLocalVariable(variable) || variable instanceof GrParameter) {
+ final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(variable, null);
+ if (attribute != null) {
+ final PsiElement nameElement = variable.getNameIdentifierGroovy();
+ assert myInfos != null;
+ myInfos.add(HighlightInfo.createHighlightInfo(HighlightInfoType.INFORMATION, nameElement, null, attribute));
+ }
+ }
+ }
+
+
+ private void visit(GrReferenceElement element) {
+ final PsiElement resolved = element.resolve();
+ final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(resolved, element);
+ if (attribute != null) {
+ final PsiElement refNameElement = GrHighlightUtil.getElementToHighlight(element);
+ assert myInfos != null;
+ myInfos.add(HighlightInfo.createHighlightInfo(HighlightInfoType.INFORMATION, refNameElement, null, attribute));
+ }
+ }
+ };
+
+ private final GroovyRecursiveElementVisitor myResolveHighlighter = new GroovyRecursiveElementVisitor() {
+ @Override
+ public void visitReferenceExpression(GrReferenceExpression referenceExpression) {
+ final int size = myInfos.size();
+ super.visitReferenceExpression(referenceExpression);
+ if (size == myInfos.size()) {
+ HighlightInfo info = GrUnresolvedAccessInspection.checkReferenceExpression(referenceExpression);
+ if (info != null) {
+ assert myInfos != null;
+ myInfos.add(info);
+ }
+ }
+ }
+
+ @Override
+ public void visitCodeReferenceElement(GrCodeReferenceElement refElement) {
+ final int size = myInfos.size();
+ super.visitCodeReferenceElement(refElement);
+ if (size == myInfos.size()) {
+ HighlightInfo info = GrUnresolvedAccessInspection.checkCodeReferenceElement(refElement);
+ if (info != null) {
+ assert myInfos != null;
+ myInfos.add(info);
+ }
+ }
+ }
+ };
public GrReferenceHighlighter(@Nullable Document document, @NotNull GroovyFileBase file) {
super(file.getProject(), document);
@@ -53,53 +120,8 @@ public class GrReferenceHighlighter extends TextEditorHighlightingPass {
@Override
public void doCollectInformation(@NotNull ProgressIndicator progress) {
myInfos = new ArrayList();
- myFile.accept(new GroovyRecursiveElementVisitor() {
- @Override
- public void visitReferenceExpression(GrReferenceExpression referenceExpression) {
- super.visitReferenceExpression(referenceExpression);
-
- visit(referenceExpression);
- HighlightInfo info = GrUnresolvedAccessInspection.checkReferenceExpression(referenceExpression);
- if (info != null) {
- myInfos.add(info);
- }
- }
-
- @Override
- public void visitCodeReferenceElement(GrCodeReferenceElement refElement) {
- super.visitCodeReferenceElement(refElement);
-
- visit(refElement);
-
- HighlightInfo info = GrUnresolvedAccessInspection.checkCodeReferenceElement(refElement);
- if (info != null) {
- myInfos.add(info);
- }
- }
-
- @Override
- public void visitVariable(GrVariable variable) {
- super.visitVariable(variable);
-
- if (GroovyRefactoringUtil.isLocalVariable(variable) || variable instanceof GrParameter) {
- final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(variable, null);
- if (attribute != null) {
- final PsiElement nameElement = variable.getNameIdentifierGroovy();
- myInfos.add(HighlightInfo.createHighlightInfo(HighlightInfoType.INFORMATION, nameElement, null, attribute));
- }
- }
- }
-
-
- private void visit(GrReferenceElement element) {
- final PsiElement resolved = element.resolve();
- final TextAttributesKey attribute = GrHighlightUtil.getDeclarationHighlightingAttribute(resolved, element);
- if (attribute != null) {
- final PsiElement refNameElement = GrHighlightUtil.getElementToHighlight(element);
- myInfos.add(HighlightInfo.createHighlightInfo(HighlightInfoType.INFORMATION, refNameElement, null, attribute));
- }
- }
- });
+ myFile.accept(myDeclarationHighlighter);
+ myFile.accept(myResolveHighlighter);
}
@Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
index e5b839f3812c..eb862f4a0e1b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
@@ -606,27 +606,41 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
}
- final GrVariable toSearchFor = ResolveUtil.isScriptField(variable) ? GrScriptField.createScriptFieldFrom(variable) : variable;
- PsiNamedElement duplicate = ResolveUtil
- .resolveExistingElement(variable, new DuplicateVariablesProcessor(toSearchFor), GrReferenceExpression.class, GrVariable.class);
- if (duplicate == null) {
- if (variable instanceof GrParameter) {
- @SuppressWarnings({"ConstantConditions"})
- final PsiElement context = variable.getContext().getContext();
- if (context instanceof GrClosableBlock) {
- duplicate = ResolveUtil.resolveExistingElement((GroovyPsiElement)context, new DuplicateVariablesProcessor(variable),
- GrVariable.class, GrReferenceExpression.class);
- }
- else if (context instanceof GrMethod && !(context.getParent() instanceof GroovyFile)) {
- duplicate = ResolveUtil.resolveExistingElement(((GroovyPsiElement)context.getParent()), new DuplicateVariablesProcessor(variable),
- GrVariable.class, GrReferenceExpression.class);
+ PsiNamedElement duplicate;
+ if (ResolveUtil.isScriptField(variable)) {
+ final String name = variable.getName();
+
+ int count = 0;
+ final GroovyScriptClass script = (GroovyScriptClass)((GroovyFile)variable.getContainingFile()).getScriptClass();
+ for (GrScriptField field : GrScriptField.getScriptFields(script)) {
+ if (name.equals(field.getName())) count++;
+ }
+
+ duplicate = count > 1 ? GrScriptField.getScriptField(variable) : null;
+ }
+ else {
+ duplicate = ResolveUtil
+ .resolveExistingElement(variable, new DuplicateVariablesProcessor(variable), GrReferenceExpression.class, GrVariable.class);
+ if (duplicate == null) {
+ if (variable instanceof GrParameter) {
+ @SuppressWarnings({"ConstantConditions"})
+ final PsiElement context = variable.getContext().getContext();
+ if (context instanceof GrClosableBlock) {
+ duplicate = ResolveUtil.resolveExistingElement((GroovyPsiElement)context, new DuplicateVariablesProcessor(variable),
+ GrVariable.class, GrReferenceExpression.class);
+ }
+ else if (context instanceof GrMethod && !(context.getParent() instanceof GroovyFile)) {
+ duplicate =
+ ResolveUtil.resolveExistingElement(((GroovyPsiElement)context.getParent()), new DuplicateVariablesProcessor(variable),
+ GrVariable.class, GrReferenceExpression.class);
+ }
}
}
+ if (duplicate instanceof GrLightParameter && "args".equals(duplicate.getName())) {
+ duplicate = null;
+ }
}
- if (duplicate instanceof GrLightParameter && "args".equals(duplicate.getName())) {
- duplicate = null;
- }
if (duplicate instanceof GrVariable) {
if ((variable instanceof GrField || ResolveUtil.isScriptField(variable)) /*&& duplicate instanceof PsiField*/ ||
@@ -638,12 +652,27 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
PsiType type = variable.getDeclaredType();
if (type instanceof PsiEllipsisType && !isLastParameter(variable)) {
- TextRange range = getTypeRange(variable);
- LOG.assertTrue(range != null, variable.getText());
- myHolder.createErrorAnnotation(range, GroovyBundle.message("ellipsis.type.is.not.allowed.here"));
+ TextRange range = getEllipsisRange(variable);
+ if (range == null) {
+ range = getTypeRange(variable);
+ }
+ if (range != null) {
+ myHolder.createErrorAnnotation(range, GroovyBundle.message("ellipsis.type.is.not.allowed.here"));
+ }
}
}
+ @Nullable
+ private static TextRange getEllipsisRange(GrVariable variable) {
+ if (variable instanceof GrParameter) {
+ final PsiElement dots = ((GrParameter)variable).getEllipsisDots();
+ if (dots != null) {
+ return dots.getTextRange();
+ }
+ }
+ return null;
+ }
+
@Nullable
private static TextRange getTypeRange(GrVariable variable) {
GrTypeElement typeElement = variable.getTypeElementGroovy();
@@ -1970,12 +1999,8 @@ public class GroovyAnnotator extends GroovyElementVisitor implements Annotator {
}
private static boolean hasExplicitVisibilityModifiers(GrVariable variable) {
- final PsiModifierList modifierList = variable.getModifierList();
- if (modifierList instanceof GrModifierList) return ((GrModifierList)modifierList).hasExplicitVisibilityModifiers();
- if (modifierList == null) return false;
- return modifierList.hasExplicitModifier(PUBLIC) ||
- modifierList.hasExplicitModifier(PROTECTED) ||
- modifierList.hasExplicitModifier(PRIVATE);
+ final GrModifierList modifierList = variable.getModifierList();
+ return modifierList != null && modifierList.hasExplicitVisibilityModifiers();
}
@Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java
index e8a23321e8a6..0a5b7d2afb20 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassFix.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -156,17 +156,8 @@ public abstract class CreateClassFix {
}
private void createInnerClass(Project project, final Editor editor, PsiElement qualifier) {
- PsiElement resolved = null;
- if (qualifier instanceof GrCodeReferenceElement) {
- resolved = ((GrCodeReferenceElement)qualifier).resolve();
- }
- else if (qualifier instanceof GrExpression) {
- PsiType type = ((GrExpression)qualifier).getType();
- if (type instanceof PsiClassType) {
- resolved = ((PsiClassType)type).resolve();
- }
- }
-
+ PsiElement resolved = resolveQualifier(qualifier);
+ assert resolved != null;
JVMElementFactory factory = JVMElementFactories.getFactory(resolved.getLanguage(), project);
if (factory == null) return;
@@ -204,6 +195,21 @@ public abstract class CreateClassFix {
}
}
+ @Nullable
+ private PsiElement resolveQualifier(@NotNull PsiElement qualifier) {
+ if (qualifier instanceof GrCodeReferenceElement) {
+ return ((GrCodeReferenceElement)qualifier).resolve();
+ }
+ else if (qualifier instanceof GrExpression) {
+ PsiType type = ((GrExpression)qualifier).getType();
+ if (type instanceof PsiClassType) {
+ return ((PsiClassType)type).resolve();
+ }
+ }
+
+ return null;
+ }
+
@Nullable
private PsiClass createTemplate(JVMElementFactory factory, String name) {
switch (getType()) {
@@ -236,6 +242,18 @@ public abstract class CreateClassFix {
putCursor(project, targetClass.getContainingFile(), targetClass);
}
}
+
+ @Override
+ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
+ if (!super.isAvailable(project, editor, file)) return false;
+
+ final PsiElement qualifier = myRefElement.getQualifier();
+ if (qualifier != null && resolveQualifier(qualifier) == null) {
+ return false;
+ }
+
+ return true;
+ }
};
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java
index 70051c8b2956..772cd0554766 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspection.java
@@ -25,9 +25,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
-import java.util.List;
-
-
public abstract class BaseInspection extends GroovySuppressableInspectionTool {
private final String m_shortName = StringUtil.trimEnd(getClass().getSimpleName(), "Inspection");
@@ -54,7 +51,8 @@ public abstract class BaseInspection extends GroovySuppressableInspectionTool {
return m_shortName;
}
- @Nullable BaseInspectionVisitor buildGroovyVisitor(@NotNull ProblemsHolder problemsHolder, boolean onTheFly) {
+ @NotNull
+ protected BaseInspectionVisitor buildGroovyVisitor(@NotNull ProblemsHolder problemsHolder, boolean onTheFly) {
final BaseInspectionVisitor visitor = buildVisitor();
visitor.setProblemsHolder(problemsHolder);
visitor.setOnTheFly(onTheFly);
@@ -73,12 +71,12 @@ public abstract class BaseInspection extends GroovySuppressableInspectionTool {
}
@Nullable
- protected GroovyFix buildFix(PsiElement location) {
+ protected GroovyFix buildFix(@NotNull PsiElement location) {
return null;
}
@Nullable
- protected GroovyFix[] buildFixes(PsiElement location) {
+ protected GroovyFix[] buildFixes(@NotNull PsiElement location) {
return null;
}
@@ -92,10 +90,10 @@ public abstract class BaseInspection extends GroovySuppressableInspectionTool {
final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, psiFile, isOnTheFly);
final BaseInspectionVisitor visitor = buildGroovyVisitor(problemsHolder, isOnTheFly);
groovyFile.accept(visitor);
- final List problems = problemsHolder.getResults();
- return problems.toArray(new ProblemDescriptor[problems.size()]);
+ return problemsHolder.getResultsArray();
}
+ @NotNull
protected abstract BaseInspectionVisitor buildVisitor();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspectionVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspectionVisitor.java
index 45930c21bbe4..6ec3be034fd5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspectionVisitor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/BaseInspectionVisitor.java
@@ -16,30 +16,25 @@
package org.jetbrains.plugins.groovy.codeInspection;
import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ProblemHighlightType;
import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiModifierList;
-import com.intellij.psi.PsiModifierListOwner;
-import com.intellij.psi.PsiWhiteSpace;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
-import java.util.List;
-
public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisitor {
private BaseInspection inspection = null;
private ProblemsHolder problemsHolder = null;
private boolean onTheFly = false;
- private final List errors = null;
public void setInspection(BaseInspection inspection) {
this.inspection = inspection;
@@ -63,33 +58,13 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
registerError(statementToken, args);
}
-
- protected void registerVariableError(GrVariable variable) {
- final PsiElement nameIdentifier = variable.getNameIdentifierGroovy();
- registerError(nameIdentifier);
- }
-
- protected void registerModifierError(String modifier,
- PsiModifierListOwner parameter) {
- final PsiModifierList modifiers = parameter.getModifierList();
- if (modifiers == null) {
- return;
- }
- final PsiElement[] children = modifiers.getChildren();
- for (final PsiElement child : children) {
- final String text = child.getText();
- if (modifier.equals(text)) {
- registerError(child);
- }
- }
- }
-
protected void registerError(PsiElement location) {
if (location == null) {
return;
}
final LocalQuickFix[] fix = createFixes(location);
- final String description = inspection.buildErrorString(location);
+ String description = StringUtil.notNullize(inspection.buildErrorString(location));
+
registerError(location, description, fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
@@ -97,9 +72,10 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
if (method == null) {
return;
}
- final LocalQuickFix[] fix = createFixes(method);
- final String description = inspection.buildErrorString(args);
- registerError(method.getNameIdentifierGroovy(), description, fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
+ final LocalQuickFix[] fixes = createFixes(method);
+ String description = StringUtil.notNullize(inspection.buildErrorString(args));
+
+ registerError(method.getNameIdentifierGroovy(), description, fixes, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
protected void registerVariableError(GrVariable variable, Object... args) {
@@ -107,7 +83,7 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
return;
}
final LocalQuickFix[] fix = createFixes(variable);
- final String description = inspection.buildErrorString(args);
+ final String description = StringUtil.notNullize(inspection.buildErrorString(args));
registerError(variable.getNameIdentifierGroovy(), description, fix, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
@@ -115,15 +91,19 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
if (method == null) {
return;
}
- final LocalQuickFix[] fix = createFixes(method);
- final String description = inspection.buildErrorString(args);
- registerError(((GrReferenceExpression) method.getInvokedExpression()).getReferenceNameElement(), description, fix,
- ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
+ final LocalQuickFix[] fixes = createFixes(method);
+ final String description = StringUtil.notNullize(inspection.buildErrorString(args));
+
+ final GrExpression invoked = method.getInvokedExpression();
+ assert invoked != null;
+ final PsiElement nameElement = ((GrReferenceExpression)invoked).getReferenceNameElement();
+ assert nameElement != null;
+ registerError(nameElement, description, fixes, ProblemHighlightType.GENERIC_ERROR_OR_WARNING);
}
protected void registerError(@NotNull PsiElement location,
- String description,
- LocalQuickFix[] fixes,
+ @NotNull String description,
+ @Nullable LocalQuickFix[] fixes,
ProblemHighlightType highlightType) {
problemsHolder.registerProblem(location, description, highlightType, fixes);
}
@@ -136,12 +116,12 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
ProblemHighlightType highlightType,
Object... args) {
final LocalQuickFix[] fix = createFixes(location);
- final String description = inspection.buildErrorString(args);
+ final String description = StringUtil.notNullize(inspection.buildErrorString(args));
registerError(location, description, fix, highlightType);
}
@Nullable
- private LocalQuickFix[] createFixes(PsiElement location) {
+ private LocalQuickFix[] createFixes(@NotNull PsiElement location) {
if (!onTheFly &&
inspection.buildQuickFixesOnlyForOnTheFlyErrors()) {
return null;
@@ -157,18 +137,7 @@ public abstract class BaseInspectionVisitor extends GroovyRecursiveElementVisito
return new GroovyFix[]{fix};
}
- @Nullable
- public ProblemDescriptor[] getErrors() {
- if (errors == null) {
- return null;
- } else {
- final int numErrors = errors.size();
- return errors.toArray(new ProblemDescriptor[numErrors]);
- }
- }
-
- public void visitWhiteSpace(PsiWhiteSpace space) {
- // none of our inspections need to do anything with white space,
- // so this is a performance optimization
+ public int getErrorCount() {
+ return problemsHolder.getResultCount();
}
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
index 6b3cc5aa03e2..167ccd04fec8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,7 @@
package org.jetbrains.plugins.groovy.codeInspection.assignment;
import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.codeInspection.InspectionManager;
-import com.intellij.codeInspection.LocalQuickFix;
-import com.intellij.codeInspection.ProblemDescriptor;
-import com.intellij.codeInspection.ProblemHighlightType;
+import com.intellij.codeInspection.*;
import com.intellij.lang.annotation.Annotation;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.openapi.diagnostic.Logger;
@@ -47,13 +44,13 @@ import org.jetbrains.plugins.groovy.extensions.NamedArgumentDescriptor;
import org.jetbrains.plugins.groovy.findUsages.LiteralConstructorReference;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.psi.GrControlFlowOwner;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap;
import org.jetbrains.plugins.groovy.lang.psi.api.signatures.GrClosureSignature;
import org.jetbrains.plugins.groovy.lang.psi.api.signatures.GrSignature;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrConstructorInvocation;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
@@ -66,7 +63,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.*;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.literals.GrString;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrIndexProperty;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.*;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
import org.jetbrains.plugins.groovy.lang.psi.impl.GrClosureType;
@@ -115,6 +111,7 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
return (String)args[0];
}
+ @NotNull
@Override
protected BaseInspectionVisitor buildVisitor() {
return new MyVisitor();
@@ -163,13 +160,6 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
return true;
}
- @Override
- public void visitMethod(GrMethod method) {
- if (!shouldProcess(method)) return;
-
- super.visitMethod(method);
- }
-
@Override
public void visitReturnStatement(GrReturnStatement returnStatement) {
super.visitReturnStatement(returnStatement);
@@ -196,20 +186,8 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
}
}
- protected boolean shouldProcess(GrMethod method) {
- return !GroovyPsiManager.getInstance(method.getProject()).isCompileStatic(method);
- }
-
- @Override
- public void visitField(GrField field) {
- if (GroovyPsiManager.getInstance(field.getProject()).isCompileStatic(field)) return;
- super.visitField(field);
- }
-
- @Override
- public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
- if (GroovyPsiManager.getInstance(typeDefinition.getProject()).isCompileStatic(typeDefinition)) return;
- super.visitTypeDefinition(typeDefinition);
+ protected boolean shouldProcess(GrMember member) {
+ return !GroovyPsiManager.getInstance(member.getProject()).isCompileStatic(member);
}
@Override
@@ -537,47 +515,9 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
}
@Override
- public void visitReferenceExpression(GrReferenceExpression referenceExpression) {
- super.visitReferenceExpression(referenceExpression);
-
- final PsiElement parent = referenceExpression.getParent();
- if (parent instanceof GrCall) {
- GrCall call = (GrCall)parent;
- GroovyResolveResult resolveResult = call.advancedResolve();
- GroovyResolveResult[] results = call.multiResolve(false); //cached
-
- PsiElement resolved = resolveResult.getElement();
- if (resolved == null) {
- GrExpression qualifier = referenceExpression.getQualifierExpression();
- if (qualifier == null && GrHighlightUtil.isDeclarationAssignment(referenceExpression)) return;
- }
-
- if (!checkCannotInferArgumentTypes(referenceExpression)) return;
-
- final PsiType type = referenceExpression.getType();
- if (resolved != null) {
- if (resolved instanceof PsiMethod && !resolveResult.isInvokedOnProperty()) {
- checkMethodApplicability(resolveResult, referenceExpression, true);
- }
- else {
- checkCallApplicability(type, referenceExpression, true);
- }
- }
- else if (results.length > 0) {
- for (GroovyResolveResult result : results) {
- resolved = result.getElement();
- if (resolved instanceof PsiMethod && !resolveResult.isInvokedOnProperty()) {
- if (!checkMethodApplicability(result, referenceExpression, false)) return;
- }
- else {
- if (!checkCallApplicability(type, referenceExpression, false)) return;
- }
- }
-
- registerError(getElementToHighlight(referenceExpression, PsiUtil.getArgumentsList(referenceExpression)),
- GroovyBundle.message("method.call.is.ambiguous"));
- }
- }
+ public void visitIndexProperty(GrIndexProperty expression) {
+ super.visitIndexProperty(expression);
+ checkMethodCall(expression, expression.getInvokedExpression());
}
private boolean checkCannotInferArgumentTypes(PsiElement referenceExpression) {
@@ -591,13 +531,13 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
@Override
public void visitMethodCallExpression(GrMethodCallExpression methodCallExpression) {
super.visitMethodCallExpression(methodCallExpression);
- checkMethodCall(methodCallExpression);
+ checkMethodCall(methodCallExpression, methodCallExpression.getInvokedExpression());
}
@Override
public void visitApplicationStatement(GrApplicationStatement applicationStatement) {
super.visitApplicationStatement(applicationStatement);
- checkMethodCall(applicationStatement);
+ checkMethodCall(applicationStatement, applicationStatement.getInvokedExpression());
}
@Override
@@ -650,13 +590,49 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
return false;
}
- private void checkMethodCall(GrMethodCall call) {
+ private void checkMethodCall(GrCall call, GrExpression invoked) {
if (hasErrorElements(call.getArgumentList())) return;
- final GrExpression expression = call.getInvokedExpression();
- if (!(expression instanceof GrReferenceExpression)) { //it checks in visitRefExpr(...)
- final PsiType type = expression.getType();
- checkCallApplicability(type, expression, true);
+ if (invoked instanceof GrReferenceExpression) {
+ final GrReferenceExpression referenceExpression = (GrReferenceExpression)invoked;
+ GroovyResolveResult resolveResult = call.advancedResolve();
+ GroovyResolveResult[] results = call.multiResolve(false); //cached
+
+ PsiElement resolved = resolveResult.getElement();
+ if (resolved == null) {
+ GrExpression qualifier = referenceExpression.getQualifierExpression();
+ if (qualifier == null && GrHighlightUtil.isDeclarationAssignment(referenceExpression)) return;
+ }
+
+ if (!checkCannotInferArgumentTypes(referenceExpression)) return;
+
+ final PsiType type = referenceExpression.getType();
+ if (resolved != null) {
+ if (resolved instanceof PsiMethod && !resolveResult.isInvokedOnProperty()) {
+ checkMethodApplicability(resolveResult, referenceExpression, true);
+ }
+ else {
+ checkCallApplicability(type, referenceExpression, true);
+ }
+ }
+ else if (results.length > 0) {
+ for (GroovyResolveResult result : results) {
+ resolved = result.getElement();
+ if (resolved instanceof PsiMethod && !resolveResult.isInvokedOnProperty()) {
+ if (!checkMethodApplicability(result, referenceExpression, false)) return;
+ }
+ else {
+ if (!checkCallApplicability(type, referenceExpression, false)) return;
+ }
+ }
+
+ registerError(getElementToHighlight(referenceExpression, PsiUtil.getArgumentsList(referenceExpression)),
+ GroovyBundle.message("method.call.is.ambiguous"));
+ }
+ }
+ else if (invoked != null) { //it checks in visitRefExpr(...)
+ final PsiType type = invoked.getType();
+ checkCallApplicability(type, invoked, true);
}
checkNamedArgumentsType(call);
@@ -908,14 +884,14 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
private AnnotationHolder myHolder;
@Override
- protected boolean shouldProcess(GrMethod method) {
+ protected boolean shouldProcess(GrMember member) {
return true;
}
@Override
protected void registerError(@NotNull final PsiElement location,
- final String description,
- final LocalQuickFix[] fixes,
+ @NotNull final String description,
+ @NotNull final LocalQuickFix[] fixes,
final ProblemHighlightType highlightType) {
Annotation annotation = myHolder.createErrorAnnotation(location, description);
for (final LocalQuickFix fix : fixes) {
@@ -984,4 +960,41 @@ public class GroovyAssignabilityCheckInspection extends BaseInspection {
annotatingVisitor.myHolder = oldHolder;
}
}
+
+ @Nullable
+ public ProblemDescriptor[] checkFile(@NotNull PsiFile psiFile, @NotNull InspectionManager inspectionManager, boolean isOnTheFly) {
+ if (!(psiFile instanceof GroovyFileBase)) {
+ return super.checkFile(psiFile, inspectionManager, isOnTheFly);
+ }
+
+
+ final GroovyFileBase groovyFile = (GroovyFileBase)psiFile;
+ final ProblemsHolder problemsHolder = new ProblemsHolder(inspectionManager, psiFile, isOnTheFly);
+ final MyVisitor visitor = (MyVisitor)buildGroovyVisitor(problemsHolder, isOnTheFly);
+
+ processElement(groovyFile, visitor);
+
+ return problemsHolder.getResultsArray();
+ }
+
+ private static void processElement(@NotNull GroovyPsiElement element, @NotNull MyVisitor visitor) {
+ if (element instanceof GrMember && !visitor.shouldProcess((GrMember)element)) {
+ return;
+ }
+
+ final int count = visitor.getErrorCount();
+
+ PsiElement child = element.getFirstChild();
+ while (child != null) {
+ if (child instanceof GroovyPsiElement) {
+ processElement((GroovyPsiElement)child, visitor);
+ }
+ child = child.getNextSibling();
+ }
+
+ if (count == visitor.getErrorCount()) {
+ element.accept(visitor);
+ }
+ }
+
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java
index d779fd3d11f7..dc1c4b977b82 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfiguration.java
@@ -21,27 +21,35 @@ import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration;
import com.intellij.openapi.components.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
-import com.intellij.util.xmlb.annotations.Tag;
-import org.jdom.Element;
+import org.jetbrains.jps.incremental.groovy.JpsGroovySettings;
/**
* @author peter
*/
@State(
- name = "GroovyCompilerConfiguration",
+ name = "GroovyCompilerProjectConfiguration",
storages = {
- @Storage( file = StoragePathMacros.WORKSPACE_FILE),
+ @Storage( file = StoragePathMacros.PROJECT_FILE),
@Storage( file = StoragePathMacros.PROJECT_CONFIG_DIR + "/groovyc.xml", scheme = StorageScheme.DIRECTORY_BASED)
}
)
-public class GroovyCompilerConfiguration implements PersistentStateComponent, Disposable {
- private String myHeapSize = "400";
- private boolean myInvokeDynamic = false;
- public boolean transformsOk = false;
+public class GroovyCompilerConfiguration implements PersistentStateComponent, Disposable {
+ private String myHeapSize = JpsGroovySettings.DEFAULT_HEAP_SIZE;
+ private boolean myInvokeDynamic = JpsGroovySettings.DEFAULT_INVOKE_DYNAMIC;
+ public boolean transformsOk = JpsGroovySettings.DEFAULT_TRANSFORMS_OK;
private final ExcludedEntriesConfiguration myExcludeFromStubGeneration = new ExcludedEntriesConfiguration();
- public MyStateBean getState() {
- final MyStateBean bean = new MyStateBean();
+ public GroovyCompilerConfiguration(Project project) {
+ GroovyCompilerWorkspaceConfiguration workspaceConfiguration = ServiceManager.getService(project, GroovyCompilerWorkspaceConfiguration.class);
+ loadState(workspaceConfiguration.getState());
+ workspaceConfiguration.myHeapSize = JpsGroovySettings.DEFAULT_HEAP_SIZE;
+ workspaceConfiguration.transformsOk = JpsGroovySettings.DEFAULT_TRANSFORMS_OK;
+ workspaceConfiguration.myInvokeDynamic = JpsGroovySettings.DEFAULT_INVOKE_DYNAMIC;
+ workspaceConfiguration.myExcludeFromStubGeneration.removeAllExcludeEntryDescriptions();
+ }
+
+ public JpsGroovySettings getState() {
+ final JpsGroovySettings bean = new JpsGroovySettings();
bean.heapSize = myHeapSize;
bean.invokeDynamic = myInvokeDynamic;
bean.transformsOk = transformsOk;
@@ -57,7 +65,7 @@ public class GroovyCompilerConfiguration implements PersistentStateComponent, Disposable {
+ String myHeapSize = JpsGroovySettings.DEFAULT_HEAP_SIZE;
+ boolean myInvokeDynamic = JpsGroovySettings.DEFAULT_INVOKE_DYNAMIC;
+ boolean transformsOk = JpsGroovySettings.DEFAULT_TRANSFORMS_OK;
+ final ExcludedEntriesConfiguration myExcludeFromStubGeneration = new ExcludedEntriesConfiguration();
+
+ public JpsGroovySettings getState() {
+ final JpsGroovySettings bean = new JpsGroovySettings();
+ bean.heapSize = myHeapSize;
+ bean.invokeDynamic = myInvokeDynamic;
+ bean.transformsOk = transformsOk;
+ myExcludeFromStubGeneration.writeExternal(bean.excludes);
+ return bean;
+ }
+
+ public void loadState(JpsGroovySettings state) {
+ myHeapSize = state.heapSize;
+ myInvokeDynamic = state.invokeDynamic;
+ transformsOk = state.transformsOk;
+
+ myExcludeFromStubGeneration.readExternal(state.excludes);
+ }
+
+ public void dispose() {
+ Disposer.dispose(myExcludeFromStubGeneration);
+ }
+
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
index 0adf0363c2ee..781ba5d9b47f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/params/GrParameter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.jetbrains.plugins.groovy.lang.psi.api.statements.params;
+import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiParameter;
import com.intellij.util.ArrayFactory;
import org.jetbrains.annotations.NotNull;
@@ -49,4 +50,10 @@ public interface GrParameter extends PsiParameter, GrVariable, GrCondition {
GrModifierList getModifierList();
boolean isOptional();
+
+ /**
+ * parameter can be vararg while getEllipsisDots() return null
+ */
+ @Nullable
+ PsiElement getEllipsisDots();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSwitchStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSwitchStatementImpl.java
index 42fd57bda948..ff693d0ffe51 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSwitchStatementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSwitchStatementImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class GrSwitchStatementImpl extends GroovyPsiElementImpl implements GrSwi
}
public GrExpression getCondition() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
@NotNull
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSynchronizedStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSynchronizedStatementImpl.java
index 173215e1b246..4524ae67bf5a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSynchronizedStatementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrSynchronizedStatementImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public class GrSynchronizedStatementImpl extends GroovyPsiElementImpl implements
}
public GrExpression getMonitor() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
public GrOpenBlock getBody() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
index dd5d08c1a487..46d2ea6513f7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
@@ -1,6 +1,6 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ public class GrVariableDeclarationImpl extends GrStubElementBase impl
@Nullable
@Override
public GrExpression getTupleInitializer() {
- return findChildByClass(GrExpression.class);
+ return GroovyPsiElementImpl.findExpressionChild(this);
}
@Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrAssertStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrAssertStatementImpl.java
index 8116a4e58ac8..a481509a2c4d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrAssertStatementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrAssertStatementImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public class GrAssertStatementImpl extends GroovyPsiElementImpl implements GrAss
@Nullable
public GrExpression getAssertion() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
@Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrThrowStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrThrowStatementImpl.java
index cf6efe53e276..2f146eb1d090 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrThrowStatementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/branch/GrThrowStatementImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,6 +42,6 @@ public class GrThrowStatementImpl extends GroovyPsiElementImpl implements GrThro
@Nullable
public GrExpression getException() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
}
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseLabelImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseLabelImpl.java
index dce2a779b838..f8ef8e719fba 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseLabelImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrCaseLabelImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class GrCaseLabelImpl extends GroovyPsiElementImpl implements GrCaseLabel
@Override
public GrExpression getValue() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
@Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrForInClauseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrForInClauseImpl.java
index c9d74638f77d..8ec040975f41 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrForInClauseImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/clauses/GrForInClauseImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -68,7 +68,7 @@ public class GrForInClauseImpl extends GroovyPsiElementImpl implements GrForInCl
@Nullable
public GrExpression getIteratedExpression() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
@NotNull
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrParenthesizedExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrParenthesizedExpressionImpl.java
index 3d59458c11cf..02fade2ebdfa 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrParenthesizedExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrParenthesizedExpressionImpl.java
@@ -1,4 +1,19 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions;
import com.intellij.lang.ASTNode;
@@ -34,6 +49,6 @@ public class GrParenthesizedExpressionImpl extends GrExpressionImpl implements G
@Nullable
public GrExpression getOperand() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
}
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
index e00ac9c1ca11..3fd53f405a85 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public class GrUnaryExpressionImpl extends GrExpressionImpl implements GrUnaryEx
}
public GrExpression getOperand() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
public void accept(GroovyElementVisitor visitor) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrStringInjectionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrStringInjectionImpl.java
index 229e7989e826..c7fd4a9de7ea 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrStringInjectionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/literals/GrStringInjectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ public class GrStringInjectionImpl extends GroovyPsiElementImpl implements GrStr
@Nullable
public GrExpression getExpression() {
- final GrExpression expression = findChildByClass(GrExpression.class);
+ final GrExpression expression = findExpressionChild(this);
return expression instanceof GrClosableBlock ? null : expression;
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrTypeCastExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrTypeCastExpressionImpl.java
index 850303e44dba..3d962993a8ad 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrTypeCastExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrTypeCastExpressionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class GrTypeCastExpressionImpl extends GrExpressionImpl implements GrType
}
public GrExpression getOperand() {
- return findChildByClass(GrExpression.class);
+ return findExpressionChild(this);
}
@NotNull
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
index 2b39c156554a..54c7d5f5aa22 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -185,6 +185,12 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme
return getInitializerGroovy() != null;
}
+ @Nullable
+ @Override
+ public PsiElement getEllipsisDots() {
+ return findChildByType(GroovyTokenTypes.mTRIPLE_DOT);
+ }
+
@NotNull
public SearchScope getUseScope() {
if (!isPhysical()) {
@@ -230,7 +236,7 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme
}
public boolean isVarArgs() {
- PsiElement dots = findChildByType(GroovyTokenTypes.mTRIPLE_DOT);
+ PsiElement dots = getEllipsisDots();
return dots != null;
}
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/ClosureSyntheticParameter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/ClosureSyntheticParameter.java
index 416c71e9b6aa..2f5102077552 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/ClosureSyntheticParameter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/ClosureSyntheticParameter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -83,4 +83,10 @@ public class ClosureSyntheticParameter extends GrLightParameter implements Navig
public GrExpression getInitializerGroovy() {
return GroovyPsiElementFactory.getInstance(getProject()).createExpressionFromText("null");
}
+
+ @Nullable
+ @Override
+ public PsiElement getEllipsisDots() {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameter.java
index 8d722e8e7d22..f88b263c1134 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,6 +95,12 @@ public class GrLightParameter extends LightVariableBuilder imp
return myOptional;
}
+ @Nullable
+ @Override
+ public PsiElement getEllipsisDots() {
+ return null;
+ }
+
@Override
public void setType(@Nullable PsiType type) throws IncorrectOperationException {
throw new IncorrectOperationException();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptBindingVariable.groovy b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptBindingVariable.groovy
new file mode 100644
index 000000000000..545b360fba73
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptBindingVariable.groovy
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic
+
+/**
+ * @author Max Medvedev
+ */
+class GrScriptBindingVariable {
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptField.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptField.java
index 6bb0b6331ccb..688092597b86 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptField.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrScriptField.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,22 +15,34 @@
*/
package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic;
-import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.util.RecursionManager;
import com.intellij.psi.PsiModifier;
-import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
+import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAccessorMethod;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author Max Medvedev
*/
public class GrScriptField extends GrLightField {
- private GrScriptField(GrVariable original, GroovyScriptClass scriptClass) {
+ public static final GrScriptField[] EMPTY_ARRAY = new GrScriptField[0];
+
+ private GrScriptField(@NotNull GrVariable original, @NotNull GroovyScriptClass scriptClass) {
super(scriptClass, original.getName(), original.getType(), original);
mySetterInitialized = true;
@@ -54,23 +66,69 @@ public class GrScriptField extends GrLightField {
}
- private static final Key> KEY = Key.create("script field");
+ @NotNull
+ public static GrScriptField getScriptField(@NotNull final GrVariable original) {
+ final GroovyScriptClass script = (GroovyScriptClass)((GroovyFile)original.getContainingFile()).getScriptClass();
+ assert script != null;
- public static GrScriptField createScriptFieldFrom(final GrVariable original) {
- CachedValue data = original.getUserData(KEY);
- if (data == null) {
- data = CachedValuesManager.getManager(original.getProject()).createCachedValue(new CachedValueProvider() {
- @Override
- public Result compute() {
- final GroovyScriptClass script = (GroovyScriptClass)((GroovyFile)original.getContainingFile()).getScriptClass();
- assert script != null;
- return Result.create(new GrScriptField(original, script), original);
- }
- });
- }
- return data.getValue();
+ final GrScriptField result = ContainerUtil.find(getScriptFields(script), new Condition() {
+ @Override
+ public boolean value(GrScriptField field) {
+ return field.getNavigationElement() == original;
+ }
+ });
+ assert result != null;
+
+ return result;
}
+ @NotNull
+ public static GrScriptField[] getScriptFields(@NotNull final GroovyScriptClass script) {
+ return CachedValuesManager.getManager(script.getProject()).getCachedValue(script, new CachedValueProvider() {
+ @Override
+ public Result compute() {
+ List result = RecursionManager.doPreventingRecursion(script, true, new Computable>() {
+ @Override
+ public List compute() {
+ final List result = new ArrayList();
+ script.getContainingFile().accept(new GroovyRecursiveElementVisitor() {
+ @Override
+ public void visitVariableDeclaration(GrVariableDeclaration element) {
+ if (element.getModifierList().findAnnotation(GroovyCommonClassNames.GROOVY_TRANSFORM_FIELD) != null) {
+ for (GrVariable variable : element.getVariables()) {
+ result.add(new GrScriptField(variable, script));
+ }
+ }
+ super.visitVariableDeclaration(element);
+ }
+
+ @Override
+ public void visitMethod(GrMethod method) {
+ //skip methods
+ }
+
+ @Override
+ public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
+ //skip type defs
+ }
+
+
+ });
+ return result;
+ }
+ });
+
+ if (result == null) {
+ return Result.create(EMPTY_ARRAY, script.getContainingFile());
+ }
+ else {
+ return Result.create(result.toArray(new GrScriptField[result.size()]), script.getContainingFile());
+ }
+ }
+ });
+ }
+
+ @NotNull
public GrVariable getOriginalVariable() {
return (GrVariable)getNavigationElement();
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
index c4dffba23b94..b6f594f50be4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
@@ -16,9 +16,7 @@
package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic;
import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.RecursionManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.impl.*;
@@ -29,7 +27,6 @@ import com.intellij.psi.javadoc.PsiDocComment;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
-import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.ui.RowIcon;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
@@ -37,18 +34,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
-import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration;
import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
import javax.swing.*;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
/**
@@ -203,7 +194,7 @@ public class GroovyScriptClass extends LightElement implements PsiClass, Synthet
@NotNull
public PsiField[] getFields() {
- return getScriptFields();
+ return GrScriptField.getScriptFields(this);
}
@NotNull
@@ -362,37 +353,6 @@ public class GroovyScriptClass extends LightElement implements PsiClass, Synthet
return false;
}
- private GrField[] getScriptFields() {
- return CachedValuesManager.getManager(getProject()).getCachedValue(this, new CachedValueProvider() {
- @Override
- public Result compute() {
- List result = RecursionManager.doPreventingRecursion(GroovyScriptClass.this, true, new Computable>() {
- @Override
- public List compute() {
- final List result = new ArrayList();
- myFile.accept(new GroovyRecursiveElementVisitor() {
- @Override
- public void visitVariableDeclaration(GrVariableDeclaration element) {
- if (element.getModifierList().findAnnotation(GroovyCommonClassNames.GROOVY_TRANSFORM_FIELD) != null) {
- for (GrVariable variable : element.getVariables()) {
- result.add(GrScriptField.createScriptFieldFrom(variable));
- }
- }
- super.visitVariableDeclaration(element);
- }
- });
- return result;
- }
- });
-
- if (result == null) {
- result = Collections.emptyList();
- }
- return Result.create(result.toArray(new GrField[result.size()]), PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT, myFile);
- }
- });
- }
-
public boolean processDeclarations(@NotNull final PsiScopeProcessor processor,
@NotNull final ResolveState state,
@Nullable PsiElement lastParent,
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
index 5aa5913d01b8..5f814fd4069d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java
index 07a48fbab1a9..57a0d49fa041 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.codeInspection.utils.ControlFlowUtils;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
+import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap;
import org.jetbrains.plugins.groovy.lang.psi.api.signatures.GrClosureSignature;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrBlockStatement;
@@ -443,7 +444,9 @@ public class GroovyInlineMethodUtil {
Project project = call.getProject();
- GrClosureSignature signature = GrClosureSignatureUtil.createSignature(call);
+ final GroovyResolveResult resolveResult = call.advancedResolve();
+ GrClosureSignature signature = GrClosureSignatureUtil.createSignature(method, resolveResult.getSubstitutor());
+
if (signature == null) {
return;
}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
index d1a36ef7f77a..46c7daca121a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import com.intellij.usageView.UsageInfo;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.MultiMap;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.codeInspection.utils.ControlFlowUtils;
import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster;
@@ -53,6 +54,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrC
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.path.GrMethodCallExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrReflectedMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.util.GrStatementOwner;
import org.jetbrains.plugins.groovy.lang.psi.api.util.GrVariableDeclarationOwner;
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
@@ -78,7 +80,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
}
@Nullable
- public MultiMap getConflicts(PsiReference reference, PsiElement referenced) {
+ public MultiMap getConflicts(@NotNull PsiReference reference, @NotNull PsiElement referenced) {
PsiElement element = reference.getElement();
assert element instanceof GrExpression && element.getParent() instanceof GrCallExpression;
GrCallExpression call = (GrCallExpression) element.getParent();
@@ -86,7 +88,8 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return collectConflicts(call, infos);
}
- private static MultiMap collectConflicts(GrCallExpression call, Collection infos) {
+ @NotNull
+ private static MultiMap collectConflicts(@NotNull GrCallExpression call, @NotNull Collection infos) {
MultiMap conflicts = new MultiMap();
for (GroovyInlineMethodUtil.ReferenceExpressionInfo info : infos) {
@@ -115,7 +118,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return conflicts;
}
- public void inlineUsage(UsageInfo usage, PsiElement referenced) {
+ public void inlineUsage(@NotNull UsageInfo usage, @NotNull PsiElement referenced) {
PsiElement element=usage.getElement();
assert element instanceof GrExpression && element.getParent() instanceof GrCallExpression;
@@ -139,7 +142,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
}
@Nullable
- private static Editor getCurrentEditorIfApplicable(PsiElement element) {
+ private static Editor getCurrentEditorIfApplicable(@NotNull PsiElement element) {
final Project project = element.getProject();
final Editor editor = FileEditorManager.getInstance(project).getSelectedTextEditor();
@@ -151,11 +154,12 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return null;
}
- static RangeMarker inlineReferenceImpl(GrCallExpression call,
- GrMethod method,
+ @Nullable
+ static RangeMarker inlineReferenceImpl(@NotNull GrCallExpression call,
+ @NotNull GrMethod method,
boolean resultOfCallExplicitlyUsed,
boolean isTailMethodCall,
- Editor editor) {
+ @Nullable Editor editor) {
try {
GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(call.getProject());
final Project project = call.getProject();
@@ -308,7 +312,8 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return null;
}
- private static String generateQualifierName(GrCallExpression call, GrMethod method, final Project project, GrExpression qualifier) {
+ @NotNull
+ private static String generateQualifierName(@NotNull GrCallExpression call, @Nullable GrMethod method, @NotNull final Project project, @NotNull GrExpression qualifier) {
String[] possibleNames = GroovyNameSuggestionUtil.suggestVariableNames(qualifier, new NameValidator() {
public String validateName(String name, boolean increaseNumber) {
return name;
@@ -323,7 +328,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return qualName;
}
- private static void reformatOwner(GrVariableDeclarationOwner owner) throws IncorrectOperationException {
+ private static void reformatOwner(@Nullable GrVariableDeclarationOwner owner) throws IncorrectOperationException {
if (owner == null) return;
PsiFile file = owner.getContainingFile();
Project project = file.getProject();
@@ -336,12 +341,17 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
}
- /*
- Prepare temporary method with non-conflicting local names
- */
- private static GrMethod prepareNewMethod(GrCallExpression call, GrMethod method, GrExpression qualifier) throws IncorrectOperationException {
-
+ /**
+ * Prepare temporary method with non-conflicting local names
+ */
+ @NotNull
+ private static GrMethod prepareNewMethod(@NotNull GrCallExpression call, @NotNull GrMethod method, @Nullable GrExpression qualifier) throws IncorrectOperationException {
GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(method.getProject());
+
+ if (method instanceof GrReflectedMethod) {
+ method = ((GrReflectedMethod)method).getBaseMethod();
+ }
+
GrMethod newMethod = factory.createMethodFromText(method.getText());
if (qualifier != null) {
Collection infos = GroovyInlineMethodUtil.collectReferenceInfo(method);
@@ -375,7 +385,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
return newMethod;
}
- private static void collectInnerDefinitions(PsiElement element, ArrayList defintions) {
+ private static void collectInnerDefinitions(@Nullable PsiElement element, ArrayList defintions) {
if (element == null) return;
for (PsiElement child : element.getChildren()) {
if (child instanceof GrVariable && !(child instanceof GrParameter)) {
@@ -393,7 +403,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
* @return null if method has more or less than one return statement or has void type
*/
@Nullable
- static GrExpression getAloneResultExpression(GrMethod method) {
+ static GrExpression getAloneResultExpression(@NotNull GrMethod method) {
GrOpenBlock body = method.getBlock();
assert body != null;
GrStatement[] statements = body.getStatements();
@@ -415,7 +425,7 @@ public class GroovyMethodInliner implements InlineHandler.Inliner {
Method call is used as expression in some enclosing expression or
is method return result
*/
- private static boolean isOnExpressionOrReturnPlace(GrCallExpression call) {
+ private static boolean isOnExpressionOrReturnPlace(@NotNull GrCallExpression call) {
PsiElement parent = call.getParent();
if (!(parent instanceof GrVariableDeclarationOwner)) {
return true;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java
index 882f24164b8f..176219c8cc7b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodConflictSolver.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
@@ -39,7 +40,8 @@ import org.jetbrains.plugins.groovy.refactoring.GroovyRefactoringUtil;
public class InlineMethodConflictSolver {
private InlineMethodConflictSolver() {}
- public static String suggestNewName(@NotNull String startName, @Nullable GrMethod method, PsiElement call, String... otherNames) {
+ @NotNull
+ public static String suggestNewName(@NotNull String startName, @Nullable GrMethod method, @NotNull PsiElement call, String... otherNames) {
String newName;
int i = 1;
PsiElement parent = call.getParent();
@@ -57,7 +59,7 @@ public class InlineMethodConflictSolver {
return newName;
}
- static boolean isValid(String name, String ... otherNames) {
+ static boolean isValid(@Nullable String name, String ... otherNames) {
for (String otherName : otherNames) {
if (otherName.equals(name)) {
return false;
@@ -66,17 +68,18 @@ public class InlineMethodConflictSolver {
return true;
}
- private static boolean isValidNameInMethod(@NotNull String name, GrMethod method) {
+ private static boolean isValidNameInMethod(@NotNull String name, @NotNull GrMethod method) {
for (GrParameter parameter : method.getParameters()) {
if (name.equals(parameter.getName())) return false;
}
- if (method.getBlock() != null) {
- return isValidNameDown(name, method.getBlock(), null);
+ final GrOpenBlock block = method.getBlock();
+ if (block != null) {
+ return isValidNameDown(name, block, null);
}
return true;
}
- public static boolean isValidName(@NotNull String name, PsiElement scopeElement, PsiElement call) {
+ public static boolean isValidName(@NotNull String name, @NotNull PsiElement scopeElement, PsiElement call) {
if (isValidNameDown(name, scopeElement, call)) {
if (!(scopeElement instanceof GroovyFileBase)) {
return isValidNameUp(name, scopeElement, call);
@@ -88,7 +91,7 @@ public class InlineMethodConflictSolver {
}
}
- private static boolean isValidNameDown(@NotNull String name, PsiElement startElement, @Nullable PsiElement call) {
+ private static boolean isValidNameDown(@NotNull String name, @NotNull PsiElement startElement, @Nullable PsiElement call) {
PsiElement child = startElement.getFirstChild();
while (child != null) {
@@ -121,7 +124,7 @@ public class InlineMethodConflictSolver {
return true;
}
- private static boolean isValidNameUp(@NotNull String name, PsiElement startElement, PsiElement call) {
+ private static boolean isValidNameUp(@NotNull String name, @NotNull PsiElement startElement, @Nullable PsiElement call) {
if (startElement instanceof PsiFile) {
return true;
}
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
index eb872ca5c7ce..4b61775ed25e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -469,6 +469,22 @@ def _Boolean(Boolean x) {}
_int(null)
_boolean(null)
_Boolean(null)
+''')
+ }
+
+ void testInnerWarning() {
+ testHighlighting('''\
+public static void main(String[] args) {
+ bar (foo(foo(foo('2'))))
+}
+
+static def T foo(T abc) {
+ abc
+}
+
+static bar(String s) {
+
+}
''')
}
}
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
index 2becde825783..741b649dc1c7 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -128,7 +128,7 @@ public class GroovyHighlightingTest extends GrHighlightingTestBase {
myFixture.configureByText('a.groovy', '''\
class A {
def foo(int... x){}
- def foo(int... x, double y) {}
+ def foo(int... x, double y) {}
}
''')
myFixture.checkHighlighting(true, false, false)
@@ -1052,6 +1052,18 @@ class A {
class B extends A {
def getFoo(){5}
}
+''')
+ }
+
+ void testUnresolvedQualifierHighlighting() {
+ testHighlighting('''\
+Abc.Cde abc
+''')
+ }
+
+ void testVarargParameterWithoutTypeElement() {
+ testHighlighting('''\
+def foo(def ... vararg, def last) {}
''')
}
}
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
index a2a29ecb32a7..b2fec60e65ca 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
@@ -1,5 +1,6 @@
/*
- * Copyright 2000-2007 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -52,10 +53,10 @@ public class InlineMethodTest extends LightCodeInsightFixtureTestCase {
public void testClos_arg2() throws Throwable { doTest(); }
public void testClos_arg3() throws Throwable { doTest(); }
public void testCond() throws Throwable { doTest(); }
- public void testExpr1() throws Throwable { doTest(); }
+ public void _testExpr1() throws Throwable { doTest(); }
public void testExpr2() throws Throwable { doTest(); }
public void testExpr3() throws Throwable { doTest(); }
- public void testExpr4() throws Throwable { doTest(); }
+ public void _testExpr4() throws Throwable { doTest(); }
public void testFact() throws Throwable { doTest(); }
public void testFact2() throws Throwable { doTest(); }
public void testInit1() throws Throwable { doTest(); }
diff --git a/plugins/groovy/testdata/highlighting/ClosureCallMethodWithInapplicableArguments.groovy b/plugins/groovy/testdata/highlighting/ClosureCallMethodWithInapplicableArguments.groovy
index be947b78d319..01c677096279 100644
--- a/plugins/groovy/testdata/highlighting/ClosureCallMethodWithInapplicableArguments.groovy
+++ b/plugins/groovy/testdata/highlighting/ClosureCallMethodWithInapplicableArguments.groovy
@@ -1,6 +1,6 @@
def foo={x, y->}
-print foo.call(1)
+print foo.call(1)
def bar={3}
print bar.call()
diff --git a/plugins/javaFX/src/META-INF/plugin.xml b/plugins/javaFX/src/META-INF/plugin.xml
index 71f091fc50ce..b15de6d5cab4 100644
--- a/plugins/javaFX/src/META-INF/plugin.xml
+++ b/plugins/javaFX/src/META-INF/plugin.xml
@@ -10,6 +10,7 @@
-
+
+
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
index 9d47e6df6a75..b0a948e98922 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
@@ -17,11 +17,24 @@ package org.jetbrains.plugins.javaFX.fxml;
import org.jetbrains.annotations.NonNls;
+import java.util.Arrays;
+import java.util.List;
+
/**
* User: anna
* Date: 1/14/13
*/
public class FxmlConstants {
@NonNls public static final String FX_CONTROLLER = "fx:controller";
- @NonNls public static final String JAVAFX_ANCHOR_PANE = "javafx.scene.layout.AnchorPane";
+ @NonNls public static final String FX_ID = "fx:id";
+ @NonNls public static final String VALUE = "value";
+ @NonNls public static final String FX_VALUE = "fx:value";
+ @NonNls public static final String FX_FACTORY = "fx:factory";
+ @NonNls public static final String FX_INCLUDE = "fx:include";
+ @NonNls public static final String FX_REFERENCE = "fx:reference";
+ @NonNls public static final String FX_COPY = "fx:copy";
+ @NonNls public static final String FX_DEFINE = "fx:define";
+ @NonNls public static final String FX_SCRIPT = "fx:script";
+
+ public static final List FX_DEFAULT_PROPERTIES = Arrays.asList(FX_ID, FX_CONTROLLER, VALUE, FX_VALUE, FX_FACTORY, FX_INCLUDE, FX_REFERENCE, FX_COPY, FX_DEFINE, FX_SCRIPT);
}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlJavaClassReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlJavaClassReferencesContributor.java
deleted file mode 100644
index d8b1eb23c5af..000000000000
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlJavaClassReferencesContributor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2000-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.plugins.javaFX.fxml;
-
-import com.intellij.patterns.XmlPatterns;
-import com.intellij.psi.PsiReferenceContributor;
-import com.intellij.psi.PsiReferenceRegistrar;
-import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider;
-
-/**
- * User: anna
- * Date: 1/14/13
- */
-public class FxmlJavaClassReferencesContributor extends PsiReferenceContributor {
- public static final JavaClassReferenceProvider CLASS_REFERENCE_PROVIDER = new JavaClassReferenceProvider();
-
- @Override
- public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
- registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue()
- .withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.FX_CONTROLLER)),
- CLASS_REFERENCE_PROVIDER);
- }
-}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlReferencesContributor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlReferencesContributor.java
new file mode 100644
index 000000000000..9b23e58f214e
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlReferencesContributor.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.patterns.PatternCondition;
+import com.intellij.patterns.XmlAttributeValuePattern;
+import com.intellij.patterns.XmlPatterns;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.util.ProcessingContext;
+import org.jetbrains.annotations.NotNull;
+
+import static com.intellij.patterns.StandardPatterns.string;
+
+/**
+ * User: anna
+ * Date: 1/14/13
+ */
+public class FxmlReferencesContributor extends PsiReferenceContributor {
+ public static final JavaClassReferenceProvider CLASS_REFERENCE_PROVIDER = new JavaClassReferenceProvider();
+
+ @Override
+ public void registerReferenceProviders(PsiReferenceRegistrar registrar) {
+ final XmlAttributeValuePattern attributeValueInFxml = XmlPatterns.xmlAttributeValue().with(inFxmlCondition());
+ registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.FX_CONTROLLER))
+ .and(attributeValueInFxml),
+ CLASS_REFERENCE_PROVIDER);
+
+ registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(FxmlConstants.FX_ID))
+ .and(attributeValueInFxml),
+ new JavaFxFieldIdReferenceProvider());
+
+ registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withValue(string().startsWith("#"))
+ .and(attributeValueInFxml),
+ new JavaFxEventHandlerReferenceProvider());
+
+ registrar.registerReferenceProvider(XmlPatterns.xmlAttributeValue().withValue(string().startsWith("@")).and(attributeValueInFxml),
+ new JavaFxLocationReferenceProvider());
+ }
+
+ private static PatternCondition inFxmlCondition() {
+ return new PatternCondition("inFxmlFile") {
+ @Override
+ public boolean accepts(@NotNull XmlAttributeValue value, ProcessingContext context) {
+ return JavaFxFileTypeFactory.isFxml(value.getContainingFile());
+ }
+ };
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
index 8a0a9aac7ec3..dc992b506f78 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFXNSDescriptor.java
@@ -2,7 +2,6 @@ package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.Validator;
import com.intellij.lang.ASTNode;
-import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.*;
@@ -29,13 +28,16 @@ public class JavaFXNSDescriptor implements XmlNSDescriptor, Validator {
+ private PsiMethod myEventHandler;
+ private final PsiClass myController;
+
+ public JavaFxEventHandlerReference(XmlAttributeValue element, final PsiMethod method, PsiClass controller) {
+ super(element);
+ myEventHandler = method;
+ myController = controller;
+ }
+
+ @Nullable
+ @Override
+ public PsiElement resolve() {
+ return myEventHandler;
+ }
+
+ @NotNull
+ @Override
+ public Object[] getVariants() {
+ if (myController == null) return EMPTY_ARRAY;
+ final List availableHandlers = new ArrayList();
+ for (PsiMethod psiMethod : myController.getMethods()) {
+ if (isHandlerMethod(psiMethod)) {
+ availableHandlers.add(psiMethod);
+ }
+ }
+ return availableHandlers.isEmpty() ? EMPTY_ARRAY : ArrayUtil.toObjectArray(availableHandlers);
+ }
+
+ public static boolean isHandlerMethod(PsiMethod psiMethod) {
+ if (!psiMethod.hasModifierProperty(PsiModifier.STATIC) && PsiType.VOID.equals(psiMethod.getReturnType())) {
+ if (psiMethod.hasModifierProperty(PsiModifier.PUBLIC) || AnnotationUtil.isAnnotated(psiMethod, JavaFxCommonClassNames.JAVAFX_FXML_FXML, false)) {
+ final PsiParameter[] parameters = psiMethod.getParameterList().getParameters();
+ if (parameters.length == 1) {
+ final PsiType parameterType = parameters[0].getType();
+ if (InheritanceUtil.isInheritor(parameterType, JavaFxCommonClassNames.JAVAFX_EVENT)) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public TextRange getRangeInElement() {
+ final TextRange range = super.getRangeInElement();
+ return new TextRange(range.getStartOffset() + 1, range.getEndOffset());
+ }
+
+ public static class JavaFxUnresolvedReferenceHandlerQuickfixProvider extends UnresolvedReferenceQuickFixProvider {
+
+ @Override
+ public void registerFixes(final JavaFxEventHandlerReference ref, final QuickFixActionRegistrar registrar) {
+ if (ref.myController != null && ref.myEventHandler == null) {
+ final CreateMethodQuickFix quickFix = CreateMethodQuickFix.createFix(ref.myController, getHandlerSignature(ref), "");
+ if (quickFix != null) {
+ registrar.register(quickFix);
+ }
+ }
+ }
+
+ private static String getHandlerSignature(JavaFxEventHandlerReference ref) {
+ return "public void " + ref.getElement().getValue().substring(1) + "(" + JavaFxCommonClassNames.JAVAFX_EVENT + " e)";
+ }
+
+ @NotNull
+ @Override
+ public Class getReferenceClass() {
+ return JavaFxEventHandlerReference.class;
+ }
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerReferenceProvider.java
new file mode 100644
index 000000000000..bf6fa19be092
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerReferenceProvider.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.psi.*;
+import com.intellij.psi.util.InheritanceUtil;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.ProcessingContext;
+import com.intellij.xml.XmlElementDescriptor;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * User: anna
+ * Date: 1/16/13
+ */
+class JavaFxEventHandlerReferenceProvider extends JavaFxControllerBasedReferenceProvider {
+ private static final Logger LOG = Logger.getInstance("#" + JavaFxEventHandlerReferenceProvider.class.getName());
+
+ @Override
+ protected PsiReference[] getReferencesByElement(@NotNull PsiClass controllerClass,
+ XmlAttributeValue xmlAttributeValue,
+ ProcessingContext context) {
+ final String attValueString = xmlAttributeValue.getValue();
+ LOG.assertTrue(attValueString.startsWith("#"));
+
+ final XmlAttribute attribute = (XmlAttribute)xmlAttributeValue.getContext();
+ if (attribute == null) return PsiReference.EMPTY_ARRAY;
+ final String attributeName = attribute.getName();
+ final XmlTag xmlTag = attribute.getParent();
+ final XmlElementDescriptor descriptor = xmlTag.getDescriptor();
+ if (descriptor == null) return PsiReference.EMPTY_ARRAY;
+ final PsiElement currentTagClass = descriptor.getDeclaration();
+ if (!(currentTagClass instanceof PsiClass)) return PsiReference.EMPTY_ARRAY;
+ final PsiField handlerField = ((PsiClass)currentTagClass).findFieldByName(attributeName, true);
+ if (handlerField == null) {
+ return PsiReference.EMPTY_ARRAY;
+ }
+ final PsiClass objectPropertyClass = JavaFxPropertyAttributeDescriptor.getPropertyClass(handlerField);
+ if (objectPropertyClass == null || !InheritanceUtil.isInheritor(objectPropertyClass, JavaFxCommonClassNames.JAVAFX_EVENT_EVENT_HANDLER)) {
+ return PsiReference.EMPTY_ARRAY;
+ }
+ final String eventHandlerName = attValueString.substring(1);
+ final PsiMethod[] methods = controllerClass.findMethodsByName(eventHandlerName, true);
+
+ PsiMethod handlerMethod = null;
+ for (PsiMethod psiMethod : methods) {
+ if (JavaFxEventHandlerReference.isHandlerMethod(psiMethod)) {
+ handlerMethod = psiMethod;
+ break;
+ }
+ }
+ return new PsiReference[]{new JavaFxEventHandlerReference(xmlAttributeValue, handlerMethod, controllerClass)};
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFieldIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFieldIdReferenceProvider.java
new file mode 100644
index 000000000000..824836376181
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFieldIdReferenceProvider.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.psi.*;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.ProcessingContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+* User: anna
+* Date: 1/17/13
+*/
+class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferenceProvider {
+ @Override
+ protected PsiReference[] getReferencesByElement(@NotNull PsiClass aClass,
+ XmlAttributeValue xmlAttributeValue,
+ ProcessingContext context) {
+ final PsiField field = aClass.findFieldByName(xmlAttributeValue.getValue(), false);
+ return field == null ? PsiReference.EMPTY_ARRAY : new PsiReference[]{new JavaFxIdReference(xmlAttributeValue, field)};
+ }
+
+ private static class JavaFxIdReference extends PsiReferenceBase {
+ private final PsiField myField;
+
+ public JavaFxIdReference(XmlAttributeValue xmlAttributeValue, PsiField field) {
+ super(xmlAttributeValue);
+ myField = field;
+ }
+
+ @Nullable
+ @Override
+ public PsiElement resolve() {
+ return myField;
+ }
+
+ @NotNull
+ @Override
+ public Object[] getVariants() {
+ return ArrayUtil.EMPTY_OBJECT_ARRAY;
+ }
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxLocationReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxLocationReferenceProvider.java
new file mode 100644
index 000000000000..f5ce3cc23f3e
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxLocationReferenceProvider.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
+import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
+import com.intellij.psi.xml.XmlAttributeValue;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.ProcessingContext;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * User: anna
+ */
+class JavaFxLocationReferenceProvider extends PsiReferenceProvider {
+ @NotNull
+ @Override
+ public PsiReference[] getReferencesByElement(@NotNull final PsiElement element,
+ @NotNull ProcessingContext context) {
+ final String value = ((XmlAttributeValue)element).getValue();
+ final String relativePathToResource = value.substring(1);
+
+ final VirtualFile virtualFile = element.getContainingFile().getOriginalFile().getVirtualFile();
+ if (virtualFile != null) {
+ final VirtualFile parent = virtualFile.getParent();
+ final VirtualFile resourceFile = parent != null ? parent.findFileByRelativePath(relativePathToResource) : null;
+ final PsiReferenceBase.Immediate ref =
+ new PsiReferenceBase.Immediate((XmlAttributeValue)element, resourceFile != null ? element.getManager().findFile(resourceFile) : null) {
+ @NotNull
+ @Override
+ public Object[] getVariants() {
+ if (parent != null) { //todo multilevel completion, filter by resources
+ final PsiDirectory psiDirectory = element.getManager().findDirectory(parent);
+ if (psiDirectory != null) {
+ final PsiElement[] children = psiDirectory.getChildren();
+ final List paths = new ArrayList();
+ for (PsiElement child : children) {
+ if (child instanceof PsiFileSystemItem) {
+ paths.add("@" + ((PsiFileSystemItem)child).getName());
+ }
+ }
+ return ArrayUtil.toStringArray(paths);
+ }
+ }
+ return super.getVariants();
+ }
+ };
+ return new PsiReference[]{ref};
+ }
+ return PsiReference.EMPTY_ARRAY;
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyAttributeDescriptor.java
new file mode 100644
index 000000000000..641188b6eddb
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyAttributeDescriptor.java
@@ -0,0 +1,148 @@
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.*;
+import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.util.ArrayUtil;
+import com.intellij.xml.XmlAttributeDescriptor;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * User: anna
+ * Date: 1/10/13
+ */
+public class JavaFxPropertyAttributeDescriptor implements XmlAttributeDescriptor {
+ private final String myName;
+ private final PsiClass myPsiClass;
+
+ public JavaFxPropertyAttributeDescriptor(String name, PsiClass psiClass) {
+ myName = name;
+ myPsiClass = psiClass;
+ }
+
+ @Override
+ public boolean isRequired() {
+ return false;
+ }
+
+ @Override
+ public boolean isFixed() {
+ return false;
+ }
+
+ @Override
+ public boolean hasIdType() {
+ return false;
+ }
+
+ @Override
+ public boolean hasIdRefType() {
+ return false;
+ }
+
+ @Nullable
+ @Override
+ public String getDefaultValue() {
+ return null;
+ }
+
+ @Override
+ public boolean isEnumerated() {
+ return getEnum() != null;
+ }
+
+ @Nullable
+ @Override
+ public String[] getEnumeratedValues() {
+ final PsiClass enumClass = getEnum();
+ if (enumClass != null) {
+ final PsiField[] fields = enumClass.getFields();
+ final List enumConstants = new ArrayList();
+ for (PsiField enumField : fields) {
+ if (enumField instanceof PsiEnumConstant) {
+ enumConstants.add(enumField.getName());
+ }
+ }
+ return ArrayUtil.toStringArray(enumConstants);
+ }
+ return null;
+ }
+
+ protected PsiClass getEnum() {
+ final PsiClass aClass = getPropertyClass(getDeclaration());
+ return aClass != null && aClass.isEnum() ? aClass : null;
+ }
+
+ public static PsiClass getPropertyClass(PsiElement field) {
+ if (field instanceof PsiField) {
+ final PsiType type = ((PsiField)field).getType();
+ if (type instanceof PsiClassType) {
+ final PsiClassType.ClassResolveResult resolveResult = ((PsiClassType)type).resolveGenerics();
+ final PsiClass attributeClass = resolveResult.getElement();
+ if (attributeClass != null) {
+ final PsiClass objectProperty = JavaPsiFacade.getInstance(attributeClass.getProject())
+ .findClass(JavaFxCommonClassNames.JAVAFX_BEANS_PROPERTY_OBJECT_PROPERTY, attributeClass.getResolveScope());
+ if (objectProperty != null) {
+ final PsiSubstitutor superClassSubstitutor = TypeConversionUtil
+ .getClassSubstitutor(objectProperty, attributeClass, resolveResult.getSubstitutor());
+ if (superClassSubstitutor != null) {
+ final PsiType propertyType = superClassSubstitutor.substitute(objectProperty.getTypeParameters()[0]);
+ if (propertyType instanceof PsiClassType) {
+ return ((PsiClassType)propertyType).resolve();
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public String validateValue(XmlElement context, String value) {
+ if (isEnumerated()) {
+ final String[] values = getEnumeratedValues();
+ if (values != null && !isWithingBounds(value, values)) {
+ return value + " is not withing its bounds";
+ }
+ }
+ return null;
+ }
+
+ private static boolean isWithingBounds(String value, String[] values) {
+ for (String enumConstant : values) {
+ if (StringUtil.endsWithIgnoreCase(enumConstant, value)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public PsiElement getDeclaration() {
+ return myPsiClass != null ? myPsiClass.findFieldByName(myName, true) : null;
+ }
+
+ @Override
+ public String getName(PsiElement context) {
+ return getName();
+ }
+
+ @Override
+ public String getName() {
+ return myName;
+ }
+
+ @Override
+ public void init(PsiElement element) {}
+
+ @Override
+ public Object[] getDependences() {
+ return ArrayUtil.EMPTY_OBJECT_ARRAY;
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxListPropertyElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyElementDescriptor.java
similarity index 79%
rename from plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxListPropertyElementDescriptor.java
rename to plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyElementDescriptor.java
index a5be70741770..9298a8a0f86e 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxListPropertyElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPropertyElementDescriptor.java
@@ -1,8 +1,8 @@
package org.jetbrains.plugins.javaFX.fxml;
-import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiField;
import com.intellij.psi.xml.XmlAttribute;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.ArrayUtil;
@@ -17,11 +17,11 @@ import org.jetbrains.annotations.Nullable;
* User: anna
* Date: 1/10/13
*/
-public class JavaFxListPropertyElementDescriptor implements XmlElementDescriptor {
+public class JavaFxPropertyElementDescriptor implements XmlElementDescriptor {
private final PsiClass myPsiClass;
private final String myName;
- public JavaFxListPropertyElementDescriptor(PsiClass psiClass, String name) {
+ public JavaFxPropertyElementDescriptor(PsiClass psiClass, String name) {
myPsiClass = psiClass;
myName = name;
}
@@ -47,12 +47,13 @@ public class JavaFxListPropertyElementDescriptor implements XmlElementDescriptor
@Override
public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
final String name = childTag.getName();
- if (StringUtil.isCapitalized(name)) {
+ if (JavaFxClassBackedElementDescriptor.isClassTag(name)) {
return new JavaFxClassBackedElementDescriptor(name, childTag);
}
- else {
- return myPsiClass != null ? new JavaFxListPropertyElementDescriptor(myPsiClass, name) : null;
+ else if (myPsiClass != null) {
+ return new JavaFxPropertyElementDescriptor(myPsiClass, name);
}
+ return null;
}
@Override
@@ -96,7 +97,12 @@ public class JavaFxListPropertyElementDescriptor implements XmlElementDescriptor
@Override
public PsiElement getDeclaration() {
- return myPsiClass.findFieldByName(myName, true);
+ if (myPsiClass == null) return null;
+ final PsiField field = myPsiClass.findFieldByName(myName, true);
+ if (field != null) {
+ return field;
+ }
+ return JavaFxClassBackedElementDescriptor.findPropertySetter(myName, myPsiClass);
}
@Override
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxSetterAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxSetterAttributeDescriptor.java
new file mode 100644
index 000000000000..02f85017626a
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxSetterAttributeDescriptor.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.xml.XmlElement;
+import com.intellij.util.ArrayUtil;
+import com.intellij.xml.XmlAttributeDescriptor;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * User: anna
+ * Date: 1/10/13
+ */
+public class JavaFxSetterAttributeDescriptor implements XmlAttributeDescriptor {
+ private final String myName;
+ private final PsiClass myPsiClass;
+
+ public JavaFxSetterAttributeDescriptor(String name, PsiClass psiClass) {
+ myName = name;
+ myPsiClass = psiClass;
+ }
+
+ @Override
+ public boolean isRequired() {
+ return false;
+ }
+
+ @Override
+ public boolean isFixed() {
+ return false;
+ }
+
+ @Override
+ public boolean hasIdType() {
+ return false;
+ }
+
+ @Override
+ public boolean hasIdRefType() {
+ return false;
+ }
+
+ @Nullable
+ @Override
+ public String getDefaultValue() {
+ return null;
+ }
+
+ @Override
+ public boolean isEnumerated() {
+ return false;
+ }
+
+ @Nullable
+ @Override
+ public String[] getEnumeratedValues() {
+ return null;
+ }
+
+ @Nullable
+ @Override
+ public String validateValue(XmlElement context, String value) {
+ return null;
+ }
+
+ @Override
+ public PsiElement getDeclaration() {
+ if (myPsiClass != null) {
+ final PsiMethod[] methods = myPsiClass.findMethodsByName(myName, false);
+ if (methods.length == 1) { //todo
+ return methods[0];
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String getName(PsiElement context) {
+ return getName();
+ }
+
+ @Override
+ public String getName() {
+ return myPsiClass.getName() + "." + StringUtil.decapitalize(myName.substring("set".length()));
+ }
+
+ @Override
+ public void init(PsiElement element) {}
+
+ @Override
+ public Object[] getDependences() {
+ return ArrayUtil.EMPTY_OBJECT_ARRAY;
+ }
+}
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxStaticPropertyAttributeDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxStaticPropertyAttributeDescriptor.java
new file mode 100644
index 000000000000..90570bede96d
--- /dev/null
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxStaticPropertyAttributeDescriptor.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiParameter;
+import com.intellij.psi.util.PsiUtil;
+
+/**
+ * User: anna
+ * Date: 1/10/13
+ */
+public class JavaFxStaticPropertyAttributeDescriptor extends JavaFxPropertyAttributeDescriptor {
+ private final PsiMethod mySetter;
+
+ public JavaFxStaticPropertyAttributeDescriptor(PsiMethod setter, String name) {
+ super(name, setter.getContainingClass());
+ mySetter = setter;
+ }
+
+ @Override
+ public PsiElement getDeclaration() {
+ return mySetter;
+ }
+
+ @Override
+ protected PsiClass getEnum() {
+ if (mySetter != null) {
+ final PsiParameter[] parameters = mySetter.getParameterList().getParameters();
+ if (parameters.length == 2) {
+ final PsiClass enumClass = PsiUtil.resolveClassInType(parameters[1].getType());
+ return enumClass != null && enumClass.isEnum() ? enumClass : null;
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/javaFX/testData/completion/availablePositions.fxml b/plugins/javaFX/testData/completion/availablePositions.fxml
new file mode 100644
index 000000000000..507a35ad2fcb
--- /dev/null
+++ b/plugins/javaFX/testData/completion/availablePositions.fxml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/availablePositions_after.fxml b/plugins/javaFX/testData/completion/availablePositions_after.fxml
new file mode 100644
index 000000000000..cc95a4106905
--- /dev/null
+++ b/plugins/javaFX/testData/completion/availablePositions_after.fxml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticProperties.fxml b/plugins/javaFX/testData/completion/staticProperties.fxml
new file mode 100644
index 000000000000..50399a15affe
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticProperties.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+ GridPane.rowIndex="4"/>
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml b/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml
new file mode 100644
index 000000000000..13fc3befe82a
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesEnumValue.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml b/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml
new file mode 100644
index 000000000000..0db560403195
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticPropertiesEnumValue_after.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/staticProperties_after.fxml b/plugins/javaFX/testData/completion/staticProperties_after.fxml
new file mode 100644
index 000000000000..a7ae79995e4f
--- /dev/null
+++ b/plugins/javaFX/testData/completion/staticProperties_after.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml b/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml
new file mode 100644
index 000000000000..90b7dcc85280
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/ControllerIdRefController.java b/plugins/javaFX/testData/highlighting/ControllerIdRefController.java
new file mode 100644
index 000000000000..050f592009d8
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/ControllerIdRefController.java
@@ -0,0 +1,4 @@
+import javafx.scene.text.Text;
+public class ControllerIdRefController {
+ public Text accessText;
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/RootTagConstraint.fxml b/plugins/javaFX/testData/highlighting/RootTagConstraint.fxml
deleted file mode 100644
index c275495598d0..000000000000
--- a/plugins/javaFX/testData/highlighting/RootTagConstraint.fxml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-<ArrayList xmlns:fx="http://javafx.com/fxml"/>
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/appIcon.png b/plugins/javaFX/testData/highlighting/appIcon.png
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/plugins/javaFX/testData/highlighting/enumValues.fxml b/plugins/javaFX/testData/highlighting/enumValues.fxml
new file mode 100644
index 000000000000..c149f40fd8e7
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/enumValues.fxml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+ "UNKNOWN"/>
+
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/imageIcon.fxml b/plugins/javaFX/testData/highlighting/imageIcon.fxml
new file mode 100644
index 000000000000..f951ad25d181
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/imageIcon.fxml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @unknownIcon.png"/>
+
+
+
+
diff --git a/plugins/javaFX/testData/highlighting/loginForm.fxml b/plugins/javaFX/testData/highlighting/loginForm.fxml
index 9c0187415179..5c90c09b90da 100644
--- a/plugins/javaFX/testData/highlighting/loginForm.fxml
+++ b/plugins/javaFX/testData/highlighting/loginForm.fxml
@@ -1,6 +1,6 @@
-
+unknownAttr="val" xmlns:fx="http://javafx.com/fxml">
diff --git a/plugins/javaFX/testData/highlighting/staticProperties.fxml b/plugins/javaFX/testData/highlighting/staticProperties.fxml
new file mode 100644
index 000000000000..047c4a5677b8
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/staticProperties.fxml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ AnchorPane.leftAnchor1="0.0">
+ 200
+ <AnchorPane1.bottomAnchor>200AnchorPane1.bottomAnchor>
+ 0
+
+
+
diff --git a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index 4fcef78d029b..170fbad35e6a 100644
--- a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -2,6 +2,8 @@ package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiReference;
import com.intellij.testFramework.PsiTestUtil;
import org.jetbrains.annotations.NotNull;
@@ -32,14 +34,39 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
doTest();
}
- public void testRootTagConstraint() throws Exception {
+ public void testStaticProperties() throws Exception {
doTest();
}
+ public void testEnumValues() throws Exception {
+ doTest();
+ }
+
+ public void testImageIcon() throws Exception {
+ configureByFiles(null, getTestName(true) + ".fxml", "appIcon.png");
+ doDoTest(false, false);
+ }
+
private void doTest() throws Exception {
doTest(false, false, getTestName(true) + ".fxml");
}
+ public void testControllerIdRef() throws Exception {
+ doTestIdController();
+ }
+
+ private void doTestIdController() throws Exception {
+ final String controllerClassName = getTestName(false) + "Controller";
+ configureByFiles(null, getTestName(true) + ".fxml", controllerClassName + ".java");
+ final PsiClass controllerClass = findClass(controllerClassName);
+ assertNotNull(controllerClass);
+ assertTrue(controllerClass.getFields().length > 0);
+ final int offset = myEditor.getCaretModel().getOffset();
+ final PsiReference reference = myFile.findReferenceAt(offset);
+ assertNotNull(reference);
+ assertEquals(controllerClass.getFields()[0], reference.resolve());
+ }
+
@NotNull
@Override
protected String getTestDataPath() {
diff --git a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
new file mode 100644
index 000000000000..7ccac483a614
--- /dev/null
+++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.javaFX.fxml;
+
+import com.intellij.codeInsight.completion.CompletionTestCase;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.openapi.application.PluginPathManager;
+import com.intellij.testFramework.PsiTestUtil;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * User: anna
+ * Date: 1/17/13
+ */
+public class JavaFxCompletionTest extends CompletionTestCase {
+
+ @Override
+ protected void setUpModule() {
+ super.setUpModule();
+ PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar");
+ }
+
+ public void testAvailablePositions() throws Exception {
+ doTest();
+ }
+
+ public void testStaticProperties() throws Exception {
+ doTest("GridPane.columnIndex");
+ }
+
+ public void testStaticPropertiesEnumValue() throws Exception {
+ doTest();
+ }
+
+ private void doTest() throws Exception {
+ doTest(null);
+ }
+
+ private void doTest(final String selection) throws Exception {
+ configureByFile(getTestName(true) + ".fxml");
+ assertTrue(myItems.length > 0);
+ LookupElement selectionElement = null;
+ for (LookupElement item : myItems) {
+ if (item.getLookupString().equals(selection)) {
+ selectionElement = item;
+ break;
+ }
+ }
+ if (selection != null && selectionElement == null) {
+ fail(selection + " is not suggested");
+ }
+ if (selectionElement == null) {
+ selectionElement = myItems[0];
+ }
+ selectItem(selectionElement);
+ checkResultByFile(getTestName(true) + "_after.fxml");
+ }
+
+ @NotNull
+ @Override
+ protected String getTestDataPath() {
+ return PluginPathManager.getPluginHomePath("javaFX") + "/testData/completion/";
+ }
+}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
index f74ac8866cdb..209583b6f731 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
@@ -217,7 +217,6 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler {
private static Properties loadPropertiesAndFilters(CompileContext context, MavenProject mavenProject) {
Properties properties = new Properties();
- properties.putAll(mavenProject.getProperties());
for (String each : mavenProject.getFilters()) {
try {
@@ -234,6 +233,9 @@ public class MavenResourceCompiler implements ClassPostProcessingCompiler {
context.addMessage(CompilerMessageCategory.WARNING, "Maven: Cannot read the filter. " + e.getMessage(), url, -1, -1);
}
}
+
+ properties.putAll(mavenProject.getProperties());
+
return properties;
}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
index e4a10bf46d98..04fc290b0c7b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java
@@ -156,8 +156,7 @@ public class MavenDomProjectProcessorUtils {
@NotNull
- public static Set searchDependencyUsages(@NotNull final MavenDomDependency dependency,
- @NotNull final Project project) {
+ public static Set searchDependencyUsages(@NotNull final MavenDomDependency dependency) {
final MavenDomProjectModel model = dependency.getParentOfType(MavenDomProjectModel.class, false);
if (model != null) {
final String artifactId = dependency.getArtifactId().getStringValue();
@@ -206,6 +205,43 @@ public class MavenDomProjectProcessorUtils {
return usages;
}
+ @NotNull
+ public static Collection searchManagedPluginUsages(@NotNull final MavenDomPlugin plugin) {
+ String artifactId = plugin.getArtifactId().getStringValue();
+ if (artifactId == null) return Collections.emptyList();
+
+ String groupId = plugin.getGroupId().getStringValue();
+
+ MavenDomProjectModel model = plugin.getParentOfType(MavenDomProjectModel.class, false);
+ if (model == null) return Collections.emptyList();
+
+ return searchManagedPluginUsages(model, groupId, artifactId);
+ }
+
+ @NotNull
+ public static Collection searchManagedPluginUsages(@NotNull final MavenDomProjectModel model,
+ @Nullable final String groupId,
+ @NotNull final String artifactId) {
+ Project project = model.getManager().getProject();
+
+ final Set usages = new HashSet();
+
+ Processor collectProcessor = new Processor() {
+ public boolean process(MavenDomProjectModel mavenDomProjectModel) {
+ for (MavenDomPlugin domPlugin : mavenDomProjectModel.getBuild().getPlugins().getPlugins()) {
+ if (MavenPluginDomUtil.isPlugin(domPlugin, groupId, artifactId)) {
+ usages.add(domPlugin);
+ }
+ }
+ return false;
+ }
+ };
+
+ processChildrenRecursively(model, collectProcessor, project, new HashSet(), true);
+
+ return usages;
+ }
+
public static void processChildrenRecursively(@Nullable MavenDomProjectModel model,
@NotNull Processor processor) {
processChildrenRecursively(model, processor, true);
@@ -291,48 +327,85 @@ public class MavenDomProjectProcessorUtils {
return processor.myResult;
}
+ @Nullable
+ public static MavenDomPlugin searchManagingPlugin(@NotNull final MavenDomPlugin plugin) {
+ final String artifactId = plugin.getArtifactId().getStringValue();
+ final String groupId = plugin.getGroupId().getStringValue();
+ if (artifactId == null) return null;
+
+ final MavenDomProjectModel model = plugin.getParentOfType(MavenDomProjectModel.class, false);
+ if (model == null) return null;
+
+ SearchProcessor processor = new SearchProcessor() {
+ @Override
+ protected MavenDomPlugin find(MavenDomPlugins mavenDomPlugins) {
+ if (!model.equals(mavenDomPlugins.getParentOfType(MavenDomProjectModel.class, true))) {
+ for (MavenDomPlugin domPlugin : mavenDomPlugins.getPlugins()) {
+ if (MavenPluginDomUtil.isPlugin(domPlugin, groupId, artifactId)) {
+ return domPlugin;
+ }
+ }
+ }
+
+ return null;
+ }
+ };
+
+ Function domProfileFunction = new Function() {
+ public MavenDomPlugins fun(MavenDomProjectModelBase mavenDomProfile) {
+ return mavenDomProfile.getBuild().getPluginManagement().getPlugins();
+ }
+ };
+
+ process(model, processor, model.getManager().getProject(), domProfileFunction, domProfileFunction);
+
+ return processor.myResult;
+ }
+
public static boolean processDependenciesInDependencyManagement(@NotNull MavenDomProjectModel projectDom,
@NotNull final Processor processor,
@NotNull final Project project) {
- Function domProfileFunction = new Function() {
- public MavenDomDependencies fun(MavenDomProfile mavenDomProfile) {
+ Function domFunction = new Function() {
+ public MavenDomDependencies fun(MavenDomProjectModelBase mavenDomProfile) {
return mavenDomProfile.getDependencyManagement().getDependencies();
}
};
- Function projectDomFunction = new Function() {
- public MavenDomDependencies fun(MavenDomProjectModel mavenDomProjectModel) {
- return mavenDomProjectModel.getDependencyManagement().getDependencies();
+
+ return process(projectDom, processor, project, domFunction, domFunction);
+ }
+
+ public static boolean processDependencies(@NotNull MavenDomProjectModel projectDom,
+ @NotNull final Processor processor) {
+
+ Function domFunction = new Function() {
+ public MavenDomDependencies fun(MavenDomProjectModelBase mavenDomProfile) {
+ return mavenDomProfile.getDependencies();
}
};
- return process(projectDom, processor, project, domProfileFunction, projectDomFunction);
+ return process(projectDom, processor, projectDom.getManager().getProject(), domFunction, domFunction);
}
public static boolean processProperties(@NotNull MavenDomProjectModel projectDom,
@NotNull final Processor processor,
@NotNull final Project project) {
- Function domProfileFunction = new Function() {
- public MavenDomProperties fun(MavenDomProfile mavenDomProfile) {
+ Function domFunction = new Function() {
+ public MavenDomProperties fun(MavenDomProjectModelBase mavenDomProfile) {
return mavenDomProfile.getProperties();
}
};
- Function projectDomFunction = new Function() {
- public MavenDomProperties fun(MavenDomProjectModel mavenDomProjectModel) {
- return mavenDomProjectModel.getProperties();
- }
- };
- return process(projectDom, processor, project, domProfileFunction, projectDomFunction);
+ return process(projectDom, processor, project, domFunction, domFunction);
}
public static boolean process(@NotNull MavenDomProjectModel projectDom,
@NotNull final Processor processor,
@NotNull final Project project,
- @NotNull final Function domProfileFunction,
- @NotNull final Function projectDomFunction) {
+ @NotNull final Function domProfileFunction,
+ @NotNull final Function projectDomFunction) {
return process(projectDom, processor, project, domProfileFunction, projectDomFunction, new HashSet());
}
@@ -341,8 +414,8 @@ public class MavenDomProjectProcessorUtils {
public static boolean process(@NotNull MavenDomProjectModel projectDom,
@NotNull final Processor processor,
@NotNull final Project project,
- @NotNull final Function domProfileFunction,
- @NotNull final Function projectDomFunction,
+ @NotNull final Function domProfileFunction,
+ @NotNull final Function projectDomFunction,
final Set processed) {
if (processed.contains(projectDom)) return true;
processed.add(projectDom);
@@ -358,8 +431,8 @@ public class MavenDomProjectProcessorUtils {
private static boolean processParentProjectFile(MavenDomProjectModel projectDom,
final Processor processor,
final Project project,
- final Function domProfileFunction,
- final Function projectDomFunction,
+ final Function domProfileFunction,
+ final Function projectDomFunction,
final Set processed) {
Boolean aBoolean = new DomParentProjectFileProcessor(MavenProjectsManager.getInstance(project)) {
protected Boolean doProcessParent(VirtualFile parentFile) {
@@ -378,7 +451,7 @@ public class MavenDomProjectProcessorUtils {
private static boolean processSettingsXml(@Nullable MavenProject mavenProject,
@NotNull Processor processor,
@NotNull Project project,
- Function domProfileFunction) {
+ Function domProfileFunction) {
MavenGeneralSettings settings = MavenProjectsManager.getInstance(project).getGeneralSettings();
for (VirtualFile each : settings.getEffectiveSettingsFiles()) {
@@ -394,8 +467,8 @@ public class MavenDomProjectProcessorUtils {
MavenProject mavenProjectOrNull,
Processor processor,
Project project,
- Function domProfileFunction,
- Function projectDomFunction) {
+ Function domProfileFunction,
+ Function projectDomFunction) {
if (processProfilesXml(MavenDomUtil.getVirtualFile(projectDom), mavenProjectOrNull, processor, project, domProfileFunction)) {
return true;
@@ -411,7 +484,7 @@ public class MavenDomProjectProcessorUtils {
MavenProject mavenProjectOrNull,
Processor processor,
Project project,
- Function f) {
+ Function f) {
VirtualFile profilesFile = MavenUtil.findProfilesXmlFile(projectFile);
if (profilesFile == null) return false;
@@ -424,7 +497,7 @@ public class MavenDomProjectProcessorUtils {
private static boolean processProfiles(MavenDomProfiles profilesDom,
MavenProject mavenProjectOrNull,
Processor processor,
- Function f) {
+ Function f) {
Collection activePropfiles = mavenProjectOrNull == null ? null : mavenProjectOrNull.getActivatedProfilesIds();
for (MavenDomProfile each : profilesDom.getProfiles()) {
XmlTag idTag = each.getId().getXmlTag();
@@ -438,7 +511,7 @@ public class MavenDomProjectProcessorUtils {
private static boolean processProfile(MavenDomProfile profileDom,
Processor processor,
- Function f) {
+ Function f) {
T t = f.fun(profileDom);
return t != null && processor.process(t);
}
@@ -473,7 +546,7 @@ public class MavenDomProjectProcessorUtils {
}
}
- private abstract static class SearchProcessor implements Processor {
+ public abstract static class SearchProcessor implements Processor {
private R myResult;
@@ -490,5 +563,11 @@ public class MavenDomProjectProcessorUtils {
@Nullable
protected abstract R find(T element);
+
+ public R getResult() {
+ return myResult;
+ }
}
+
+
}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginDomUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginDomUtil.java
index 4233475a5031..2d7e40bec492 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginDomUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenPluginDomUtil.java
@@ -44,18 +44,22 @@ public class MavenPluginDomUtil {
return MavenDomUtil.getMavenDomModel(p, pluginXmlFile, MavenDomPluginModel.class);
}
- public static boolean isPlugin(@NotNull MavenDomConfiguration configuration, @NotNull String groupId, @NotNull String artifactId) {
+ public static boolean isPlugin(@NotNull MavenDomConfiguration configuration, @Nullable String groupId, @NotNull String artifactId) {
MavenDomPlugin domPlugin = configuration.getParentOfType(MavenDomPlugin.class, true);
if (domPlugin == null) return false;
return isPlugin(domPlugin, groupId, artifactId);
}
- public static boolean isPlugin(@NotNull MavenDomPlugin plugin, @NotNull String groupId, @NotNull String artifactId) {
+ public static boolean isPlugin(@NotNull MavenDomPlugin plugin, @Nullable String groupId, @NotNull String artifactId) {
if (!artifactId.equals(plugin.getArtifactId().getStringValue())) return false;
String pluginGroupId = plugin.getGroupId().getStringValue();
+ if (groupId == null) {
+ return pluginGroupId == null || (pluginGroupId.equals("org.apache.maven.plugins") || pluginGroupId.equals("org.codehaus.mojo"));
+ }
+
if (pluginGroupId == null && (groupId.equals("org.apache.maven.plugins") || groupId.equals("org.codehaus.mojo"))) {
return true;
}
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java
index 7d19bb7340ef..1daf45ba9f17 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/annotator/MavenDomGutterAnnotator.java
@@ -44,7 +44,155 @@ import java.util.Set;
public class MavenDomGutterAnnotator implements Annotator {
- private static final PsiElementListCellRenderer |