diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java index 78d73295c387..86d61df0968d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java @@ -602,12 +602,17 @@ public class JavaCompletionData extends JavaAwareCompletionData{ LookupElement br = createKeyword(position, PsiKeyword.BREAK); LookupElement cont = createKeyword(position, PsiKeyword.CONTINUE); - if (!psiElement().insideSequence(true, psiElement(PsiLabeledStatement.class), - or(psiElement(PsiFile.class), psiElement(PsiMethod.class), - psiElement(PsiClassInitializer.class))).accepts(position)) { - br = TailTypeDecorator.withTail(br, TailType.SEMICOLON); - cont = TailTypeDecorator.withTail(cont, TailType.SEMICOLON); + TailType tailType; + if (psiElement().insideSequence(true, psiElement(PsiLabeledStatement.class), + or(psiElement(PsiFile.class), psiElement(PsiMethod.class), + psiElement(PsiClassInitializer.class))).accepts(position)) { + tailType = TailType.HUMBLE_SPACE; } + else { + tailType = TailType.SEMICOLON; + } + br = TailTypeDecorator.withTail(br, tailType); + cont = TailTypeDecorator.withTail(cont, tailType); if (loop != null && new InsideElementFilter(new ClassFilter(PsiStatement.class)).isAcceptable(position, loop)) { result.addElement(br); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java index 1c9bc6f99343..d94713c4e7e4 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java @@ -175,6 +175,7 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField protected boolean performRefactoring() { JavaRefactoringSettings.getInstance().INTRODUCE_CONSTANT_MOVE_TO_ANOTHER_CLASS = myMoveToAnotherClassCb.isSelected(); if (myMoveToAnotherClassCb.isSelected()) { + myEditor.putUserData(INTRODUCE_RESTART, true); ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { @@ -190,7 +191,15 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField } } finally { + myEditor.putUserData(INTRODUCE_RESTART, false); myEditor.putUserData(ACTIVE_INTRODUCE, null); + releaseResources(); + if (myLocalMarker != null) { + myLocalMarker.dispose(); + } + if (myExprMarker != null) { + myExprMarker.dispose(); + } } } }); diff --git a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java new file mode 100644 index 000000000000..27341ba94f2f --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel.java @@ -0,0 +1,7 @@ +public class Util { + void foo(int a, int b) { + Outer: for (int i = 0; i < 239; i++) { + conti + } + } +} \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java new file mode 100644 index 000000000000..c1b9a66e71bb --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/normal/ContinueLabel_after.java @@ -0,0 +1,7 @@ +public class Util { + void foo(int a, int b) { + Outer: for (int i = 0; i < 239; i++) { + continue + } + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy index 10782dea9313..dc148649b4f3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy @@ -520,6 +520,8 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase { checkResult() } + public void testContinueLabel() throws Throwable { doTest(); } + public void testAnonymousProcess() { myFixture.addClass 'package java.lang; public class Process {}' myFixture.addClass ''' diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java index fa0eed64d836..7ea13924abdb 100644 --- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java +++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java @@ -826,7 +826,9 @@ public class Mappings { if (it.isAnnotation() && it.policy == RetentionPolicy.SOURCE) { debug("Annotation, retention policy = SOURCE => a switch to non-incremental mode requested"); - return incrementalDecision(it.outerClassName, it, affectedFiles); + if (!incrementalDecision(it.outerClassName, it, affectedFiles)) { + return false; + } } if ((addedModifiers & Opcodes.ACC_PROTECTED) > 0) { @@ -866,7 +868,9 @@ public class Mappings { if (removedtargets.contains(ElementType.LOCAL_VARIABLE)) { debug("Annotation, removed target contains LOCAL_VARIABLE => a switch to non-incremental mode requested"); - return incrementalDecision(it.outerClassName, it, affectedFiles); + if (!incrementalDecision(it.outerClassName, it, affectedFiles)) { + return false; + } } if (!removedtargets.isEmpty()) { @@ -1218,7 +1222,9 @@ public class Mappings { if ((f.access & Opcodes.ACC_PRIVATE) == 0 && (f.access & mask) == mask && f.hasValue()) { debug("Field had value and was (non-private) final static => a switch to non-incremental mode requested"); - return incrementalDecision(it.name, f, affectedFiles); + if (!incrementalDecision(it.name, f, affectedFiles)) { + return false; + } } final Collection propagated = u.propagateFieldAccess(f.name, it.name); @@ -1237,7 +1243,9 @@ public class Mappings { if ((field.access & Opcodes.ACC_PRIVATE) == 0 && (field.access & mask) == mask) { if ((d.base() & Difference.ACCESS) > 0 || (d.base() & Difference.VALUE) > 0) { debug("Inline field changed it's access or value => a switch to non-incremental mode requested"); - return incrementalDecision(it.name, field, affectedFiles); + if (!incrementalDecision(it.name, field, affectedFiles)){ + return false; + } } } diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1.log b/jps/testData/incremental/fieldProperties/nonIncremental1.log new file mode 100644 index 000000000000..00c785a420df --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1.log @@ -0,0 +1,24 @@ +Request to make modules: +module nonIncremental1 +End of request +digraph X { + nonIncremental1[label="nonIncremental1"]; +} +digraph X { + nonIncremental1[label="nonIncremental1"]; +} +Propagated modules: +module nonIncremental1 +End of propagated +Cleaning output files: +out/production/nonIncremental1/A/A.class +End of files +Compiling files: +src/A/A.java +End of files +Cleaning output files: +out/production/nonIncremental1/A/C.class +End of files +Compiling files: +src/A/C.java +End of files diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/.name b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/.name new file mode 100644 index 000000000000..cc201f137875 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/.name @@ -0,0 +1 @@ +nonIncremental1 \ No newline at end of file diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml new file mode 100644 index 000000000000..a1b41c52c724 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000000..3572571ad83c --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/copyright/profiles_settings.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml new file mode 100644 index 000000000000..e206d70d8595 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/misc.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/misc.xml new file mode 100644 index 000000000000..8a6459d2c612 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/misc.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + 1.6 + + + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/modules.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/modules.xml new file mode 100644 index 000000000000..e41db5c2de60 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000000..922003b8433b --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml new file mode 100644 index 000000000000..3b0002030884 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/uiDesigner.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml new file mode 100644 index 000000000000..def6a6a18457 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml new file mode 100644 index 000000000000..f545b922a8ae --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/.idea/workspace.xml @@ -0,0 +1,449 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1327315772338 + 1327315772338 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml b/jps/testData/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml new file mode 100644 index 000000000000..d5c074327501 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src-A$A.java.new b/jps/testData/incremental/fieldProperties/nonIncremental1/src-A$A.java.new new file mode 100644 index 000000000000..f4a60220b609 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/src-A$A.java.new @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + final static int x = 1025; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/A.java b/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/A.java new file mode 100644 index 000000000000..2d38a07a9509 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/A.java @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + final static int x = 1024; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/C.java b/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/C.java new file mode 100644 index 000000000000..60ac03a014ba --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/src/A/C.java @@ -0,0 +1,14 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class C { + public int get(){ + return A.x; + } +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental1/src/B/M.java b/jps/testData/incremental/fieldProperties/nonIncremental1/src/B/M.java new file mode 100644 index 000000000000..fb5b71fd493e --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental1/src/B/M.java @@ -0,0 +1,14 @@ +package B; + +import A.C; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:52 + * To change this template use File | Settings | File Templates. + */ +public class M { + int y = new C().get(); +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2.log b/jps/testData/incremental/fieldProperties/nonIncremental2.log new file mode 100644 index 000000000000..003d98cc4518 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2.log @@ -0,0 +1,26 @@ +Request to make modules: +module NonIncremental2 +End of request +digraph X { + NonIncremental2[label="NonIncremental2"]; +} +digraph X { + NonIncremental2[label="NonIncremental2"]; +} +Propagated modules: +module NonIncremental2 +End of propagated +Cleaning output files: +out/production/NonIncremental2/A/A.class +End of files +Compiling files: +src/A/A.java +End of files +Cleaning output files: +out/production/NonIncremental2/A/C.class +out/production/NonIncremental2/B/M.class +End of files +Compiling files: +src/A/C.java +src/B/M.java +End of files diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/.name b/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/.name new file mode 100644 index 000000000000..a254a66a7aeb --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2/.idea/.name @@ -0,0 +1 @@ +nonIncremental2 \ No newline at end of file diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src-A$A.java.new b/jps/testData/incremental/fieldProperties/nonIncremental2/src-A$A.java.new new file mode 100644 index 000000000000..612f1020f7f3 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2/src-A$A.java.new @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + protected final static int x = 1025; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/A.java b/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/A.java new file mode 100644 index 000000000000..423ce28bfb62 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/A.java @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + protected final static int x = 1024; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/C.java b/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/C.java new file mode 100644 index 000000000000..60ac03a014ba --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2/src/A/C.java @@ -0,0 +1,14 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class C { + public int get(){ + return A.x; + } +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental2/src/B/M.java b/jps/testData/incremental/fieldProperties/nonIncremental2/src/B/M.java new file mode 100644 index 000000000000..b3d5b57210e9 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental2/src/B/M.java @@ -0,0 +1,13 @@ +package B; + +import A.C; +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:52 + * To change this template use File | Settings | File Templates. + */ +public class M extends A.A { + int y = A.A.x; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src-A$A.java.new b/jps/testData/incremental/fieldProperties/nonIncremental3/src-A$A.java.new new file mode 100644 index 000000000000..f4a60220b609 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental3/src-A$A.java.new @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + final static int x = 1025; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/A.java b/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/A.java new file mode 100644 index 000000000000..2d38a07a9509 --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/A.java @@ -0,0 +1,12 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class A { + final static int x = 1024; +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/C.java b/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/C.java new file mode 100644 index 000000000000..60ac03a014ba --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental3/src/A/C.java @@ -0,0 +1,14 @@ +package A; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:51 + * To change this template use File | Settings | File Templates. + */ +public class C { + public int get(){ + return A.x; + } +} diff --git a/jps/testData/incremental/fieldProperties/nonIncremental3/src/B/M.java b/jps/testData/incremental/fieldProperties/nonIncremental3/src/B/M.java new file mode 100644 index 000000000000..fb5b71fd493e --- /dev/null +++ b/jps/testData/incremental/fieldProperties/nonIncremental3/src/B/M.java @@ -0,0 +1,14 @@ +package B; + +import A.C; + +/** + * Created by IntelliJ IDEA. + * User: db + * Date: 23.01.12 + * Time: 13:52 + * To change this template use File | Settings | File Templates. + */ +public class M { + int y = new C().get(); +} diff --git a/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml b/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml new file mode 100644 index 000000000000..2581ca3fe84c --- /dev/null +++ b/jps/testData/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/jps/testData/incremental/membersChange/addMethod/.idea/.name b/jps/testData/incremental/membersChange/addMethod/.idea/.name new file mode 100644 index 000000000000..dbc10966d648 --- /dev/null +++ b/jps/testData/incremental/membersChange/addMethod/.idea/.name @@ -0,0 +1 @@ +addMethod \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java index de052c1e16fd..91a0a98cf6ba 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/ImplementationSearcher.java @@ -42,7 +42,7 @@ public class ImplementationSearcher { boolean onRef = ApplicationManager.getApplication().runReadAction(new Computable() { @Override public Boolean compute() { - return targetElementUtil.findTargetElement(editor, getFlags() & ~TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED, offset) == null; + return targetElementUtil.findTargetElement(editor, getFlags() & ~(TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED | TargetElementUtilBase.LOOKUP_ITEM_ACCEPTED), offset) == null; } }); return searchImplementations(element, offset, onRef && ApplicationManager.getApplication().runReadAction(new Computable() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java index 78ef65166fd1..6fc84c2c212f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java @@ -19,11 +19,8 @@ package com.intellij.codeInsight.navigation.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.navigation.GotoImplementationHandler; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.psi.PsiFile; +import com.intellij.openapi.project.DumbAware; import com.intellij.psi.search.searches.DefinitionsSearch; public class GotoImplementationAction extends BaseCodeInsightAction implements DumbAware { @@ -31,6 +28,10 @@ public class GotoImplementationAction extends BaseCodeInsightAction implements D return new GotoImplementationHandler(); } + protected boolean isValidForLookup() { + return true; + } + public void update(final AnActionEvent event) { if (!DefinitionsSearch.INSTANCE.hasAnyExecutors()) { event.getPresentation().setVisible(false); diff --git a/platform/lang-impl/src/com/intellij/psi/PsiAnchor.java b/platform/lang-impl/src/com/intellij/psi/PsiAnchor.java index c3a4289e08e9..042dbf6bd1fc 100644 --- a/platform/lang-impl/src/com/intellij/psi/PsiAnchor.java +++ b/platform/lang-impl/src/com/intellij/psi/PsiAnchor.java @@ -141,6 +141,7 @@ public abstract class PsiAnchor { private final VirtualFile myVirtualFile; private final Project myProject; private final Language myLanguage; + private final Language myFileLanguage; private final int myStartOffset; private final int myEndOffset; private final Class myClass; @@ -157,6 +158,7 @@ public abstract class PsiAnchor { myEndOffset = endOffset; myClass = aClass; myLanguage = language; + myFileLanguage = file.getLanguage(); } @Override @@ -178,8 +180,9 @@ public abstract class PsiAnchor { } @Override + @Nullable public PsiFile getFile() { - return SelfElementInfo.restoreFileFromVirtual(myVirtualFile, myProject); + return SelfElementInfo.restoreFileFromVirtual(myVirtualFile, myProject, myLanguage); } @Override diff --git a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java index 2c7e5ac35389..2f25cbf6732d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java @@ -213,9 +213,13 @@ public class SelfElementInfo implements SmartPointerElementInfo { @Nullable public static PsiFile restoreFileFromVirtual(final VirtualFile virtualFile, @NotNull final Project project) { + return restoreFileFromVirtual(virtualFile, project, null); + } + @Nullable + public static PsiFile restoreFileFromVirtual(final VirtualFile virtualFile, @NotNull final Project project, @Nullable final Language language) { if (virtualFile == null) return null; - return ApplicationManager.getApplication().runReadAction(new Computable() { + return ApplicationManager.getApplication().runReadAction(new NullableComputable() { @Override public PsiFile compute() { VirtualFile child; @@ -230,7 +234,10 @@ public class SelfElementInfo implements SmartPointerElementInfo { } if (child == null || !child.isValid()) return null; PsiFile file = PsiManager.getInstance(project).findFile(child); - if (file == null || !file.isValid()) return null; + if (file != null && language != null) { + return file.getViewProvider().getPsi(language); + } + return file; } }); diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java index db458a9b5b26..8d7d0c769521 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/introduce/inplace/InplaceVariableIntroducer.java @@ -212,8 +212,7 @@ public abstract class InplaceVariableIntroducer extends In } protected void releaseIfNotRestart() { - final Boolean isRestart = myEditor.getUserData(INTRODUCE_RESTART); - if (isRestart == null || !isRestart.booleanValue()) { + if (!isRestart()) { releaseResources(); } } @@ -222,8 +221,7 @@ public abstract class InplaceVariableIntroducer extends In public void finish(boolean success) { super.finish(success); if (myBalloon != null) { - final Boolean isRestart = myEditor.getUserData(INTRODUCE_RESTART); - if (isRestart == null || !isRestart.booleanValue()) { + if (!isRestart()) { myBalloon.hide(); } } diff --git a/platform/platform-api/src/com/intellij/patterns/TreeElementPattern.java b/platform/platform-api/src/com/intellij/patterns/TreeElementPattern.java index 050c8c049e34..9f843d7cb88c 100644 --- a/platform/platform-api/src/com/intellij/patterns/TreeElementPattern.java +++ b/platform/platform-api/src/com/intellij/patterns/TreeElementPattern.java @@ -171,13 +171,13 @@ public abstract class TreeElementPattern... patterns) { - return with(new PatternCondition("condInside") { + return with(new PatternCondition("insideSequence") { public boolean accepts(@NotNull final T t, final ProcessingContext context) { int i = 0; ParentType element = strict ? getParent(t) : t; - while (element != null && i >= patterns.length) { + while (element != null && i < patterns.length) { for (int j = i; j < patterns.length; j++) { - if (patterns[j].getCondition().accepts(t, context)) { + if (patterns[j].accepts(element, context)) { if (i != j) return false; i++; break; @@ -185,7 +185,7 @@ public abstract class TreeElementPattern extends S return true; } + public boolean needsLastUnchangedContent() { + return false; + } + public static boolean fileInVcsByFileStatus(final Project project, final FilePath path) { final VirtualFile virtualFile = path.getVirtualFile(); if (virtualFile != null) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java index 6d2c63326af6..a1e02e799576 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java @@ -450,7 +450,9 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec }); for (VcsDirtyScope scope : scopes) { - updateLastUnchangedContents(scope); + if (scope.getVcs().needsLastUnchangedContent()) { + updateLastUnchangedContents(scope); + } } myChangesViewManager.scheduleRefresh(); @@ -644,7 +646,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec for (VcsDirectoryMapping mapping : vcsManager.getDirectoryMappings()) { final AbstractVcs vcs = vcsManager.findVcsByName(mapping.getVcs()); final VirtualFile file = LocalFileSystem.getInstance().findFileByPath(mapping.getDirectory()); - if (vcs != null && file != null) { + if (vcs != null && file != null && vcs.needsLastUnchangedContent()) { if (indicator != null) { indicator.setText(mapping.getDirectory()); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java index f94da588ca6b..636d85ee0f75 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java @@ -36,7 +36,7 @@ public class LastUnchangedContentTracker { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.LastUnchangedContentTracker"); private static final Key LAST_TS_KEY = Key.create("LAST_TS_KEY"); private static final FileAttribute LAST_TS_ATTR = new FileAttribute("LAST_TS_ATTR", 0, true); - private static final FileAttribute ACQUIRED_CONTENT_ATTR = new FileAttribute("ACQUIRED_CONTENT_ATTR", 0, false); + private static final FileAttribute ACQUIRED_CONTENT_ATTR = new FileAttribute("ACQUIRED_CONTENT_ATTR", 1, true); public static void updateLastUnchangedContent(@NotNull VirtualFile file) { Long lastTs = getLastSavedStamp(file); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java index e4830966af79..8d2d85409c13 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTasksProvider.java @@ -100,7 +100,7 @@ public class MavenBeforeRunTasksProvider extends BeforeRunTaskProvider BrowserUtil.launchBrowser(url); } else { - getInstance().doLaunchBrowser(family, url, ArrayUtil.EMPTY_STRING_ARRAY, false); + getInstance().doLaunchBrowser(family, url, ArrayUtil.EMPTY_STRING_ARRAY, Conditions.alwaysTrue(), false); } } @@ -221,12 +224,22 @@ public class BrowsersConfiguration implements PersistentStateComponent @NotNull final String url, final boolean forceOpenNewInstanceOnMac, String... parameters) { - getInstance().doLaunchBrowser(family, url, parameters, forceOpenNewInstanceOnMac); + launchBrowser(family, url, forceOpenNewInstanceOnMac, Conditions.alwaysTrue(), parameters); + } + + public static void launchBrowser(final @NotNull BrowserFamily family, + @NotNull final String url, + final boolean forceOpenNewInstanceOnMac, + final Condition browserSpecificParametersFilter, + String... parameters) { + getInstance().doLaunchBrowser(family, url, parameters, browserSpecificParametersFilter, forceOpenNewInstanceOnMac); } private void doLaunchBrowser(final BrowserFamily family, @NotNull String url, - @NotNull String[] additionalParameters, final boolean forceOpenNewInstanceOnMac) { + @NotNull String[] additionalParameters, + @NotNull Condition browserSpecificParametersFilter, + final boolean forceOpenNewInstanceOnMac) { final WebBrowserSettings settings = getBrowserSettings(family); final String path = settings.getPath(); if (path != null && path.length() > 0) { @@ -234,7 +247,8 @@ public class BrowsersConfiguration implements PersistentStateComponent try { final BrowserSpecificSettings specificSettings = settings.getBrowserSpecificSettings(); final String[] browserParameters = specificSettings != null ? specificSettings.getAdditionalParameters() : ArrayUtil.EMPTY_STRING_ARRAY; - String[] parameters = ArrayUtil.mergeArrays(browserParameters, additionalParameters); + String[] parameters = ArrayUtil.mergeArrays(ContainerUtil.findAllAsArray(browserParameters, browserSpecificParametersFilter), + additionalParameters); launchBrowser(path, url, forceOpenNewInstanceOnMac, parameters); } catch (IOException e) { diff --git a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java b/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java index 40d43763179e..9e470ac2022c 100644 --- a/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java +++ b/xml/impl/src/com/intellij/ide/browsers/chrome/ChromeSettings.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; * @author nik */ public class ChromeSettings extends BrowserSpecificSettings { - @NonNls public static final String REMOTE_SHELL_PORT_ARG = "--remote-shell-port="; + @NonNls public static final String REMOTE_DEBUGGING_PORT_ARG = "--remote-debugging-port="; @NonNls public static final String USER_DATA_DIR_ARG = "--user-data-dir="; public static final int DEFAULT_REMOTE_SHELL_PORT = 7930; private String myUserDataDirectoryPath; @@ -88,7 +88,7 @@ public class ChromeSettings extends BrowserSpecificSettings { String[] remoteShellArg; if (myEnableRemoteDebug) { - remoteShellArg = new String[]{REMOTE_SHELL_PORT_ARG + myRemoteShellPort}; + remoteShellArg = new String[]{REMOTE_DEBUGGING_PORT_ARG + myRemoteShellPort}; } else { remoteShellArg = ArrayUtil.EMPTY_STRING_ARRAY;