From 27d067cfb3b98e18f4c502cfc8ef03a968da2025 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 20 Oct 2010 15:08:05 +0400 Subject: [PATCH 01/98] test fix --- .../standardDsls/defaultArithmeticOperations.gdsl | 11 +++++++++++ .../psi/impl/statements/expressions/TypesUtil.java | 12 +----------- .../groovy/dsl/GroovyTransformationsTest.groovy | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl b/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl index 1f31af2bc145..0d0248ac16f0 100644 --- a/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl +++ b/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl @@ -20,6 +20,7 @@ package standardDsls */ final String NUMBER = "java.lang.Number" +final String STRING = "java.lang.String" contributor(ctype:NUMBER) { method name: "plus", type: NUMBER, params:[arg:NUMBER] method name: "minus", type: NUMBER, params:[arg:NUMBER] @@ -34,4 +35,14 @@ contributor(ctype:NUMBER) { method name: "previous", type: psiType.canonicalText method name: "negative", type: psiType.canonicalText method name: "positive", type: psiType.canonicalText + + method name: "plus", type: STRING, params:[arg:STRING] + method name: "minus", type: STRING, params:[arg:STRING] + method name: "multiply", type: STRING, params:[arg:STRING] + method name: "power", type: STRING, params:[arg:STRING] + method name: "div", type: STRING, params:[arg:STRING] + method name: "mod", type: STRING, params:[arg:STRING] + method name: "or", type: STRING, params:[arg:STRING] + method name: "and", type: STRING, params:[arg:STRING] + method name: "xor", type: STRING, params:[arg:STRING] } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java index fa3e9b193166..e4c0aa9a5431 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java @@ -76,17 +76,7 @@ public class TypesUtil { return JavaPsiFacade.getInstance(binaryExpression.getProject()).getElementFactory().createTypeByFQClassName(qName, scope); } - final PsiType type = getOverloadedOperatorType(lType, binaryExpression.getOperationTokenType(), binaryExpression, new PsiType[]{rType}); - if (type != null) { - return type; - } - - if (typeEqualsToText(rType, GrStringUtil.GROOVY_LANG_GSTRING)) { - PsiType gstringType = JavaPsiFacade.getInstance(binaryExpression.getProject()).getElementFactory() - .createTypeByFQClassName(GrStringUtil.GROOVY_LANG_GSTRING, binaryExpression.getResolveScope()); - return getOverloadedOperatorType(lType, binaryExpression.getOperationTokenType(), binaryExpression, new PsiType[]{gstringType}); - } - return null; + return getOverloadedOperatorType(lType, binaryExpression.getOperationTokenType(), binaryExpression, new PsiType[]{rType}); } @Nullable diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy index cbe09540691b..5218ac2d2e13 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy @@ -48,7 +48,7 @@ class GroovyTransformationsTest extends LightCodeInsightFixtureTestCase { public void testVetoableTransform() throws Throwable { doPlainTest() } - public void testNewifyTransform1() throws Throwable { doVariantsTest('newInstance', 'new', 'new', + public void testNewifyTransform1() throws Throwable { doVariantsTest('negative', 'newInstance', 'new', 'new', 'newInstance', 'newInstance0', 'newInstanceCallerCache', 'next') } public void testNewifyTransform2() throws Throwable { doVariantsTest('Leaf', 'Leaf', 'Leaf') } From f91d736dd450349bf6f9a61820117e73949bb4c3 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 20 Oct 2010 15:22:40 +0400 Subject: [PATCH 02/98] Java parser switched to new version --- .../src/com/intellij/lang/java/JavaParserDefinition.java | 2 +- .../testData/codeInsight/invertIfCondition/afterSCR2542.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java index ea1bfcf09b5b..843d1d396445 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java @@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull; * @author max */ public class JavaParserDefinition implements ParserDefinition { - public static boolean USE_NEW_PARSER = false; + public static boolean USE_NEW_PARSER = true; @NotNull public Lexer createLexer(final Project project) { diff --git a/java/java-tests/testData/codeInsight/invertIfCondition/afterSCR2542.java b/java/java-tests/testData/codeInsight/invertIfCondition/afterSCR2542.java index 3a9ca8c41b6f..17bec6b8b332 100644 --- a/java/java-tests/testData/codeInsight/invertIfCondition/afterSCR2542.java +++ b/java/java-tests/testData/codeInsight/invertIfCondition/afterSCR2542.java @@ -4,7 +4,7 @@ class TestInvertIf { void invertIf(Object object) { if (object != "adf") { System.out.println("1"); - } // comment + } // comment else { System.out.println("2"); } From ed831b2672118ba5b8db884573e1724e938473ed Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 20 Oct 2010 15:24:49 +0400 Subject: [PATCH 03/98] ListCellRendererWrapper javadoc cleanup --- .../ide/ui/ListCellRendererWrapper.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java b/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java index ed9f4ddced4e..bf5bb390eb00 100644 --- a/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java +++ b/platform/util/src/com/intellij/ide/ui/ListCellRendererWrapper.java @@ -15,16 +15,15 @@ */ package com.intellij.ide.ui; -import org.jetbrains.annotations.Nullable; - import javax.swing.*; import java.awt.*; /** - * @author oleg - * @date 9/30/10 * Please use this wrapper in case you need simple cell renderer with text and icon. - * This avoids ugly UI under GTK look and feel, because in this case SynthComboBoxUI#SynthComboBoxRenderer is used instead of DefaultComboBoxRenderer + * This avoids ugly UI under GTK+ look&feel, because in this case SynthComboBoxUI#SynthComboBoxRenderer is used instead of DefaultComboBoxRenderer. + * + * @author oleg + * Date: 9/30/10 */ public abstract class ListCellRendererWrapper implements ListCellRenderer { private final ListCellRenderer myOriginalRenderer; @@ -34,7 +33,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { /** * Default JComboBox cell renderer should be passed here. - * @param listCellRenderer + * @param listCellRenderer Default cell renderer ({@link javax.swing.JComboBox#getRenderer()}). */ public ListCellRendererWrapper(final ListCellRenderer listCellRenderer) { this.myOriginalRenderer = listCellRenderer; @@ -46,6 +45,7 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { final boolean isSelected, final boolean cellHasFocus) { try { + //noinspection unchecked customize(list, (T)value, index, isSelected, cellHasFocus); final Component component = myOriginalRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (myIcon != null && component instanceof JLabel) { @@ -64,14 +64,15 @@ public abstract class ListCellRendererWrapper implements ListCellRenderer { /** * Implement this method to configure text and icon for given value. - * Use setIcon(icon) and setText(text) methods. - * @param list - * @param value Value to customize presentation for - * @param index - * @param selected - * @param cellHasFocus + * Use {@link #setIcon(javax.swing.Icon)} and {@link #setText(String)} methods. + * + * @param list The JList we're painting. + * @param value The value returned by list.getModel().getElementAt(index). + * @param index The cells index. + * @param selected True if the specified cell was selected. + * @param hasFocus True if the specified cell has the focus. */ - public abstract void customize(final JList list, final T value, final int index, final boolean selected, final boolean cellHasFocus); + public abstract void customize(final JList list, final T value, final int index, final boolean selected, final boolean hasFocus); public final void setIcon(final Icon icon) { myIcon = icon; From a596368eb84ff39fc2bed088e20329f877d3c14a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 20 Oct 2010 15:30:24 +0400 Subject: [PATCH 04/98] Combo box rendering fix for GTK+ L&F: Java compilers --- .../intellij/compiler/options/JavaCompilersTab.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index 87990a318c5c..6a87175f4712 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -18,6 +18,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; +import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -63,12 +64,10 @@ public class JavaCompilersTab implements SearchableConfigurable { myContentPanel.add(configurable.createComponent(), compiler.getId()); } myCompiler.setModel(new DefaultComboBoxModel(new Vector(compilers))); - myCompiler.setRenderer(new DefaultListCellRenderer(){ - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - JLabel component = (JLabel)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - final String presentableName = value != null? ((BackendCompiler)value).getPresentableName() : ""; - component.setText(presentableName); - return component; + myCompiler.setRenderer(new ListCellRendererWrapper(myCompiler.getRenderer()) { + @Override + public void customize(final JList list, final BackendCompiler value, final int index, final boolean selected, final boolean hasFocus) { + setText(value != null ? value.getPresentableName() : ""); } }); myCompiler.addActionListener(new ActionListener() { From 83aff0640a99204de43621898bf7b07f0a9f8af2 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 20 Oct 2010 15:36:02 +0400 Subject: [PATCH 05/98] remove unnecessary dsl methods --- .../standardDsls/defaultArithmeticOperations.gdsl | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl b/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl index 0d0248ac16f0..0440383bdf52 100644 --- a/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl +++ b/plugins/groovy/resources/standardDsls/defaultArithmeticOperations.gdsl @@ -37,12 +37,4 @@ contributor(ctype:NUMBER) { method name: "positive", type: psiType.canonicalText method name: "plus", type: STRING, params:[arg:STRING] - method name: "minus", type: STRING, params:[arg:STRING] - method name: "multiply", type: STRING, params:[arg:STRING] - method name: "power", type: STRING, params:[arg:STRING] - method name: "div", type: STRING, params:[arg:STRING] - method name: "mod", type: STRING, params:[arg:STRING] - method name: "or", type: STRING, params:[arg:STRING] - method name: "and", type: STRING, params:[arg:STRING] - method name: "xor", type: STRING, params:[arg:STRING] } From b7c47c1c2f613d08d65bcd5882715b13d2e32815 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 20 Oct 2010 15:07:03 +0400 Subject: [PATCH 06/98] Maven: do not call vfs refresh from under read lock(ea-21499) --- .../java/org/jetbrains/idea/maven/project/MavenProject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java index 467abb10a846..23707400f743 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java @@ -445,7 +445,7 @@ public class MavenProject { result.addAll(state.myReadingProblems); for (Map.Entry each : state.myModulesPathsAndNames.entrySet()) { - if (LocalFileSystem.getInstance().refreshAndFindFileByPath(each.getKey()) == null) { + if (LocalFileSystem.getInstance().findFileByPath(each.getKey()) == null) { result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.moduleNotFound", each.getValue()))); } } @@ -549,7 +549,7 @@ public class MavenProject { List result = new ArrayList(); Set pathsInStack = getModulePaths(); for (String each : pathsInStack) { - VirtualFile f = fs.refreshAndFindFileByPath(each); + VirtualFile f = fs.findFileByPath(each); if (f != null) result.add(f); } return result; From af43e099abd8c7ebde814b9ac5cb92922115475e Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 20 Oct 2010 16:11:51 +0400 Subject: [PATCH 07/98] internal inspections only run on idea-platform based projects and plugins --- ...kPreferredJComboBoxRendererInspection.java | 5 +- .../internal/InternalInspection.java | 52 +++++++++++++++++++ .../UndesirableClassUsageInspection.java | 14 +---- 3 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 java/java-impl/src/com/intellij/codeInspection/internal/InternalInspection.java diff --git a/java/java-impl/src/com/intellij/codeInspection/internal/GtkPreferredJComboBoxRendererInspection.java b/java/java-impl/src/com/intellij/codeInspection/internal/GtkPreferredJComboBoxRendererInspection.java index 61d8fe8e56d1..5642a0cde178 100644 --- a/java/java-impl/src/com/intellij/codeInspection/internal/GtkPreferredJComboBoxRendererInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/internal/GtkPreferredJComboBoxRendererInspection.java @@ -15,15 +15,14 @@ */ package com.intellij.codeInspection.internal; -import com.intellij.codeInspection.BaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.*; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -import javax.swing.DefaultListCellRenderer; +import javax.swing.*; -public class GtkPreferredJComboBoxRendererInspection extends BaseJavaLocalInspectionTool { +public class GtkPreferredJComboBoxRendererInspection extends InternalInspection { private static final String RENDERER_CLASS_NAME = DefaultListCellRenderer.class.getName(); private static final String MESSAGE = "Please use ListCellRendererWrapper instead to prevent artifacts under GTK+ Look and Feel."; diff --git a/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspection.java b/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspection.java new file mode 100644 index 000000000000..ef7124f6101a --- /dev/null +++ b/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspection.java @@ -0,0 +1,52 @@ +/* + * Copyright 2000-2010 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 com.intellij.codeInspection.internal; + +import com.intellij.codeInspection.BaseJavaLocalInspectionTool; +import com.intellij.codeInspection.LocalInspectionToolSession; +import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiElementVisitor; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.ui.components.JBList; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; + +public abstract class InternalInspection extends BaseJavaLocalInspectionTool { + @Nls + @NotNull + @Override + public String getGroupDisplayName() { + return InternalInspectionToolsProvider.GROUP_NAME; + } + + public boolean isEnabledByDefault() { + return true; + } + + @NotNull + @Override + public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, + boolean isOnTheFly, + LocalInspectionToolSession session) { + if (JavaPsiFacade.getInstance(holder.getProject()).findClass(JBList.class.getName(), + GlobalSearchScope.allScope(holder.getProject())) == null) { + return new PsiElementVisitor() { + }; + } + return super.buildVisitor(holder, isOnTheFly, session); + } +} diff --git a/java/java-impl/src/com/intellij/codeInspection/internal/UndesirableClassUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/internal/UndesirableClassUsageInspection.java index e06b26509aae..8d8e510e20b3 100644 --- a/java/java-impl/src/com/intellij/codeInspection/internal/UndesirableClassUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/internal/UndesirableClassUsageInspection.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInspection.internal; -import com.intellij.codeInspection.BaseJavaLocalInspectionTool; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.openapi.application.QueryExecutorBase; @@ -32,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Map; -public class UndesirableClassUsageInspection extends BaseJavaLocalInspectionTool { +public class UndesirableClassUsageInspection extends InternalInspection { private static final Map CLASSES = new THashMap(); static { @@ -43,13 +42,6 @@ public class UndesirableClassUsageInspection extends BaseJavaLocalInspectionTool CLASSES.put(QueryExecutor.class.getName(), QueryExecutorBase.class.getName()); } - @Nls - @NotNull - @Override - public String getGroupDisplayName() { - return InternalInspectionToolsProvider.GROUP_NAME; - } - @Nls @NotNull @Override @@ -63,10 +55,6 @@ public class UndesirableClassUsageInspection extends BaseJavaLocalInspectionTool return "UndesirableClassUsage"; } - public boolean isEnabledByDefault() { - return true; - } - @NotNull public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { return new JavaElementVisitor() { From 5039765e9fc3d8e6ccaa2512609cd725ce8b50be Mon Sep 17 00:00:00 2001 From: "Rustam.Vishnyakov" Date: Tue, 19 Oct 2010 19:51:19 +0400 Subject: [PATCH 08/98] Download a javascript library intention: global (application-level) storage --- .../scripting/ScriptingLibraryManager.java | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java index 44ca8818e72a..97fc8a5c8ba7 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import org.jetbrains.annotations.Nullable; /** @@ -28,22 +29,36 @@ import org.jetbrains.annotations.Nullable; */ public class ScriptingLibraryManager { + public enum LibraryLevel {GLOBAL, PROJECT} + public static final String WEB_MODULE_TYPE = "WEB_MODULE"; private ModifiableRootModel myRootModel; private Project myProject; + private LibraryLevel myLibLevel = LibraryLevel.PROJECT; public ScriptingLibraryManager(Project project) { + this(LibraryLevel.GLOBAL, project); + } + + public ScriptingLibraryManager(LibraryLevel libLevel, Project project) { myProject = project; - myRootModel = getRootModel(project); + myLibLevel = libLevel; + myRootModel = getRootModel(libLevel, project); } @Nullable - private static ModifiableRootModel getRootModel(Project project) { - for (Module module : ModuleManager.getInstance(project).getModules()) { - if (WEB_MODULE_TYPE.equals(module.getModuleType().getId())) { - return ModuleRootManager.getInstance(module).getModifiableModel(); - } + private static ModifiableRootModel getRootModel(LibraryLevel libraryLevel, Project project) { + switch (libraryLevel) { + case PROJECT: + for (Module module : ModuleManager.getInstance(project).getModules()) { + if (WEB_MODULE_TYPE.equals(module.getModuleType().getId())) { + return ModuleRootManager.getInstance(module).getModifiableModel(); + } + } + break; + case GLOBAL: + return null; } return null; } @@ -56,6 +71,10 @@ public class ScriptingLibraryManager { } public void commitModel() { + if (myLibLevel == LibraryLevel.GLOBAL) { + ModuleManager.getInstance(myProject).getModifiableModel().commit(); + return; + } if (myRootModel != null && !myRootModel.isDisposed()) { myRootModel.commit(); resetModel(); @@ -64,13 +83,20 @@ public class ScriptingLibraryManager { public void resetModel() { disposeModel(); - myRootModel = getRootModel(myProject); + myRootModel = getRootModel(myLibLevel, myProject); } @Nullable public LibraryTable getLibraryTable() { - if (myRootModel != null) { - return myRootModel.getModuleLibraryTable(); + switch (myLibLevel) { + case PROJECT: + if (myRootModel != null) { + return myRootModel.getModuleLibraryTable(); + } + break; + case GLOBAL: + return + LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(LibraryTablesRegistrar.APPLICATION_LEVEL, myProject); } return null; } From b86bb7c2970c5b9d9c70acbd6dd297bf011477bc Mon Sep 17 00:00:00 2001 From: "Rustam.Vishnyakov" Date: Wed, 20 Oct 2010 15:49:37 +0400 Subject: [PATCH 09/98] Download a javascript library intention: more improvements, UI changes --- .../ScriptingIndexableSetContributor.java | 4 +--- .../scripting/ScriptingLibraryManager.java | 22 ++++++++++++++----- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java index 498dddbaf9b4..12c134d07083 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.roots.libraries.scripting; -import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; @@ -46,7 +45,7 @@ public abstract class ScriptingIndexableSetContributor extends IndexableSetContr final THashSet libFiles = new THashSet(); if (project != null) { ScriptingLibraryManager manager = new ScriptingLibraryManager(project); - LibraryTable libTable = manager.getLibraryTable(); + LibraryTable libTable = manager.getLibraryTable(true); if (libTable != null) { for (Library lib : libTable.getLibraries()) { for (VirtualFile libFile : lib.getFiles(OrderRootType.CLASSES)) { @@ -55,7 +54,6 @@ public abstract class ScriptingIndexableSetContributor extends IndexableSetContr } } } - manager.disposeModel(); } return libFiles; } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java index 97fc8a5c8ba7..9351421de615 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingLibraryManager.java @@ -87,20 +87,30 @@ public class ScriptingLibraryManager { } @Nullable - public LibraryTable getLibraryTable() { + public LibraryTable getLibraryTable(boolean readOnly) { + if (!readOnly && myLibLevel == LibraryLevel.PROJECT) { + return myRootModel != null ? myRootModel.getModuleLibraryTable() : null; + } + String libLevel = null; switch (myLibLevel) { case PROJECT: - if (myRootModel != null) { - return myRootModel.getModuleLibraryTable(); - } + libLevel = LibraryTablesRegistrar.PROJECT_LEVEL; break; case GLOBAL: - return - LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(LibraryTablesRegistrar.APPLICATION_LEVEL, myProject); + libLevel = LibraryTablesRegistrar.APPLICATION_LEVEL; + break; + } + if (libLevel != null) { + return LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(libLevel, myProject); } return null; } + @Nullable + public LibraryTable getLibraryTable() { + return getLibraryTable(false); + } + public Project getProject() { return myProject; } From d0d2946d1c84e7b820b5febbaac463924003e9f0 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 15:30:49 +0400 Subject: [PATCH 10/98] remove plugin.dtd references from plugin.xml of sample plugins --- samples/actions/src/META-INF/plugin.xml | 1 - samples/conditionalOperatorConvertor/META-INF/plugin.xml | 3 --- samples/plugin/src/META-INF/plugin.xml | 1 - samples/vfs/src/META-INF/plugin.xml | 1 - 4 files changed, 6 deletions(-) diff --git a/samples/actions/src/META-INF/plugin.xml b/samples/actions/src/META-INF/plugin.xml index 89b79070d4de..489749c669ee 100644 --- a/samples/actions/src/META-INF/plugin.xml +++ b/samples/actions/src/META-INF/plugin.xml @@ -1,4 +1,3 @@ - ActionsSample diff --git a/samples/conditionalOperatorConvertor/META-INF/plugin.xml b/samples/conditionalOperatorConvertor/META-INF/plugin.xml index ceb6ce3046cd..e63ba2e6da1a 100644 --- a/samples/conditionalOperatorConvertor/META-INF/plugin.xml +++ b/samples/conditionalOperatorConvertor/META-INF/plugin.xml @@ -1,6 +1,3 @@ - Conditional Operator Converter ConditionalOperatorConverter diff --git a/samples/plugin/src/META-INF/plugin.xml b/samples/plugin/src/META-INF/plugin.xml index c194183509af..031152e4f8b3 100644 --- a/samples/plugin/src/META-INF/plugin.xml +++ b/samples/plugin/src/META-INF/plugin.xml @@ -1,4 +1,3 @@ - Sample diff --git a/samples/vfs/src/META-INF/plugin.xml b/samples/vfs/src/META-INF/plugin.xml index ff45e7859720..a10dc993a13a 100644 --- a/samples/vfs/src/META-INF/plugin.xml +++ b/samples/vfs/src/META-INF/plugin.xml @@ -1,4 +1,3 @@ - VfsSample From 8d65cda320aa82f18f5f6096a96eb90111e3465e Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 15:41:12 +0400 Subject: [PATCH 11/98] restart instead of shutdown if capable --- .../src/com/intellij/diagnostic/IdeErrorsDialog.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 63edca149149..66f6b15a9409 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -445,14 +445,20 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene private class ShutdownAction extends AbstractAction { public ShutdownAction() { - super(DiagnosticBundle.message("error.list.shutdown.action")); + super(ApplicationManager.getApplication().isRestartCapable() ? "Restart" : DiagnosticBundle.message("error.list.shutdown.action")); } public void actionPerformed(ActionEvent e) { myMessagePool.setJvmIsShuttingDown(); LaterInvocator.invokeLater(new Runnable() { public void run() { - ApplicationManager.getApplication().exit(); + final Application app = ApplicationManager.getApplication(); + if (app.isRestartCapable()) { + app.restart(); + } + else { + app.exit(); + } } }, ModalityState.NON_MODAL); doOKAction(); From 96043c3e1ef439e9b65ec349661b66b01e9facca Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 16:16:21 +0400 Subject: [PATCH 12/98] report exceptions in the backgroud (IDEA-33675) --- .../diagnostic/ErrorReportSubmitter.java | 5 + .../intellij/diagnostic/AbstractMessage.java | 9 + .../com/intellij/diagnostic/ITNReporter.java | 161 ++++++++++-------- .../intellij/diagnostic/IdeErrorsDialog.java | 24 ++- .../errorreport/ErrorReportSender.java | 61 +++---- 5 files changed, 142 insertions(+), 118 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java index 520abaa99634..9c6b45a6833e 100644 --- a/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java +++ b/platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java @@ -17,6 +17,7 @@ package com.intellij.openapi.diagnostic; import com.intellij.openapi.extensions.PluginAware; import com.intellij.openapi.extensions.PluginDescriptor; +import com.intellij.util.Consumer; import java.awt.*; @@ -57,4 +58,8 @@ public abstract class ErrorReportSubmitter implements PluginAware { * @return submission result status. */ public abstract SubmittedReportInfo submit(IdeaLoggingEvent[] events, Component parentComponent); + + public void submitAsync(IdeaLoggingEvent[] events, Component parentComponent, Consumer consumer) { + consumer.consume(submit(events, parentComponent)); + } } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/AbstractMessage.java b/platform/platform-impl/src/com/intellij/diagnostic/AbstractMessage.java index eb561e47b29d..50de1d415489 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/AbstractMessage.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/AbstractMessage.java @@ -23,6 +23,7 @@ import java.util.Date; public abstract class AbstractMessage { private boolean myIsRead = false; + private boolean myIsSubmitting = false; private SubmittedReportInfo mySubmissionInfo; private String myScrID; @@ -52,6 +53,14 @@ public abstract class AbstractMessage { return mySubmissionInfo; } + public boolean isSubmitting() { + return myIsSubmitting; + } + + public void setSubmitting(boolean isSubmitting) { + myIsSubmitting = isSubmitting; + } + public boolean isSubmitted() { return mySubmissionInfo != null && (mySubmissionInfo.getStatus() == SubmittedReportInfo.SubmissionStatus.NEW_ISSUE || diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java index 1a4ad75788ed..b41d02c1397e 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java @@ -23,6 +23,9 @@ import com.intellij.errorreport.error.NoSuchEAPUserException; import com.intellij.ide.DataManager; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.idea.IdeaLogger; +import com.intellij.notification.Notification; +import com.intellij.notification.NotificationType; +import com.intellij.notification.Notifications; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -32,12 +35,10 @@ import com.intellij.openapi.diagnostic.SubmittedReportInfo; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.util.net.IOExceptionDialog; +import com.intellij.util.Consumer; import org.jetbrains.annotations.NonNls; -import javax.swing.*; import java.awt.*; -import java.io.IOException; /** * @author max @@ -52,98 +53,110 @@ public class ITNReporter extends ErrorReportSubmitter { } public SubmittedReportInfo submit(IdeaLoggingEvent[] events, Component parentComponent) { - return sendError(events[0], parentComponent); + // obsolete API + return new SubmittedReportInfo(null, "0", SubmittedReportInfo.SubmissionStatus.FAILED); + } + + @Override + public void submitAsync(IdeaLoggingEvent[] events, Component parentComponent, Consumer consumer) { + sendError(events [0], parentComponent, consumer); } /** * @noinspection ThrowablePrintStackTrace */ - private static SubmittedReportInfo sendError(IdeaLoggingEvent event, Component parentComponent) { + private static void sendError(IdeaLoggingEvent event, final Component parentComponent, final Consumer callback) { String newBuild = ErrorReportSender.checkNewBuild(); if (newBuild != null) { Messages.showMessageDialog(parentComponent, DiagnosticBundle.message("error.report.new.eap.build.message", newBuild), CommonBundle.getWarningTitle(), Messages.getWarningIcon()); - return new SubmittedReportInfo(null, "0", SubmittedReportInfo.SubmissionStatus.FAILED); + callback.consume(new SubmittedReportInfo(null, "0", SubmittedReportInfo.SubmissionStatus.FAILED)); } ErrorBean errorBean = new ErrorBean(event.getThrowable(), IdeaLogger.ourLastActionId); - int threadId = 0; - SubmittedReportInfo.SubmissionStatus submissionStatus = SubmittedReportInfo.SubmissionStatus.FAILED; + String description = ""; + doSubmit(event, parentComponent, callback, errorBean, description); + } + + private static void doSubmit(final IdeaLoggingEvent event, + final Component parentComponent, + final Consumer callback, + final ErrorBean errorBean, final String description) { final DataContext dataContext = DataManager.getInstance().getDataContext(parentComponent); Project project = PlatformDataKeys.PROJECT.getData(dataContext); - String description = ""; - do { - // prepare - try { - EAPSendErrorDialog dlg = new EAPSendErrorDialog(); - dlg.setErrorDescription(description); - dlg.show(); - - @NonNls String login = ErrorReportConfigurable.getInstance().ITN_LOGIN; - @NonNls String password = ErrorReportConfigurable.getInstance().getPlainItnPassword(); - if (login.trim().length() == 0 && password.trim().length() == 0) { - login = "idea_anonymous"; - password = "guest"; - } - - description = dlg.getErrorDescription(); - @NonNls StringBuilder descBuilder = buildDescription(event, description); - errorBean.setDescription(descBuilder.toString()); - - if (dlg.isShouldSend()) { - threadId = ErrorReportSender.sendError(project, login, password, errorBean); - previousExceptionThreadId = threadId; - wasException = true; - submissionStatus = SubmittedReportInfo.SubmissionStatus.NEW_ISSUE; - - Messages.showInfoMessage(parentComponent, - DiagnosticBundle.message("error.report.confirmation"), - ReportMessages.ERROR_REPORT); - break; - } - else { - break; - } - - } - catch (NoSuchEAPUserException e) { - if (Messages.showYesNoDialog(parentComponent, DiagnosticBundle.message("error.report.authentication.failed"), - ReportMessages.ERROR_REPORT, Messages.getErrorIcon()) != 0) { - break; - } - } - catch (InternalEAPException e) { - if (Messages.showYesNoDialog(parentComponent, DiagnosticBundle.message("error.report.posting.failed", e.getMessage()), - ReportMessages.ERROR_REPORT, Messages.getErrorIcon()) != 0) { - break; - } - } - catch (IOException e) { - if (!IOExceptionDialog.showErrorDialog(DiagnosticBundle.message("error.report.exception.title"), - DiagnosticBundle.message("error.report.failure.message"))) { - break; - } - } - catch (Exception e) { - if (Messages.showYesNoDialog(JOptionPane.getRootFrame(), DiagnosticBundle.message("error.report.sending.failure"), - ReportMessages.ERROR_REPORT, Messages.getErrorIcon()) != 0) { - break; - } - } - + final EAPSendErrorDialog dlg = new EAPSendErrorDialog(); + dlg.setErrorDescription(description); + dlg.show(); + if (!dlg.isShouldSend()) { + return; } - while (true); - return new SubmittedReportInfo(submissionStatus != SubmittedReportInfo.SubmissionStatus.FAILED ? URL_HEADER + threadId : null, - String.valueOf(threadId), - submissionStatus); + @NonNls String login = ErrorReportConfigurable.getInstance().ITN_LOGIN; + @NonNls String password = ErrorReportConfigurable.getInstance().getPlainItnPassword(); + if (login.trim().length() == 0 && password.trim().length() == 0) { + login = "idea_anonymous"; + password = "guest"; + } + + errorBean.setDescription(buildDescription(event, dlg.getErrorDescription())); + + ErrorReportSender.sendError(project, login, password, errorBean, new Consumer() { + @SuppressWarnings({"AssignmentToStaticFieldFromInstanceMethod"}) + @Override + public void consume(Integer threadId) { + previousExceptionThreadId = threadId; + wasException = true; + callback.consume(new SubmittedReportInfo(URL_HEADER + threadId, String.valueOf(threadId), + SubmittedReportInfo.SubmissionStatus.NEW_ISSUE)); + ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override + public void run() { + Notification notification = new Notification(ReportMessages.ERROR_REPORT, ReportMessages.ERROR_REPORT, + DiagnosticBundle.message("error.report.confirmation"), + NotificationType.INFORMATION); + Notifications.Bus.notify(notification); + } + }); + } + }, new Consumer() { + @Override + public void consume(final Exception e) { + ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override + public void run() { + String msg; + if (e instanceof NoSuchEAPUserException) { + msg = DiagnosticBundle.message("error.report.authentication.failed"); + } + else if (e instanceof InternalEAPException) { + msg = DiagnosticBundle.message("error.report.posting.failed", e.getMessage()); + } + else { + msg = DiagnosticBundle.message("error.report.sending.failure"); + } + if (Messages.showYesNoDialog(parentComponent, msg, + ReportMessages.ERROR_REPORT, Messages.getErrorIcon()) != 0) { + callback.consume(new SubmittedReportInfo(null, "0", SubmittedReportInfo.SubmissionStatus.FAILED)); + } + else { + ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override + public void run() { + doSubmit(event, parentComponent, callback, errorBean, dlg.getErrorDescription()); + } + }); + } + } + }); + } + }); } - private static StringBuilder buildDescription(IdeaLoggingEvent event, String description) { + private static String buildDescription(IdeaLoggingEvent event, String description) { String message = event.getMessage(); @NonNls StringBuilder descBuilder = new StringBuilder(); @@ -171,6 +184,6 @@ public class ITNReporter extends ErrorReportSubmitter { if (wasException) { descBuilder.append("There was at least one exception before this one.\n"); } - return descBuilder; + return descBuilder.toString(); } } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 66f6b15a9409..2eeed8dc10d5 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -48,6 +48,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.util.Consumer; import com.intellij.util.text.DateFormatUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -182,11 +183,11 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene if (message.isSubmitted()) { final SubmittedReportInfo info = message.getSubmissionInfo(); if (info.getStatus() == SubmittedReportInfo.SubmissionStatus.FAILED) { - txt.append(DiagnosticBundle.message("error.list.message.submission.failed")); + txt.append(" ").append(DiagnosticBundle.message("error.list.message.submission.failed")); } else { if (info.getLinkText() != null) { - txt.append(DiagnosticBundle.message("error.list.message.submitted.as.link", info.getLinkText())); + txt.append(" ").append(DiagnosticBundle.message("error.list.message.submitted.as.link", info.getLinkText())); if (info.getStatus() == SubmittedReportInfo.SubmissionStatus.DUPLICATE) { txt.append(DiagnosticBundle.message("error.list.message.duplicate")); } @@ -197,6 +198,9 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene } txt.append(". "); } + else if (message.isSubmitting()) { + txt.append(" Submitting..."); + } else if (!message.isRead()) { txt.append(" ").append(DiagnosticBundle.message("error.list.message.unread")); } @@ -508,7 +512,21 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene ErrorReportSubmitter submitter = getSubmitter(logMessage.getThrowable()); if (submitter != null) { - logMessage.setSubmitted(submitter.submit(getEvents(logMessage), getContentPane())); + logMessage.setSubmitting(true); + updateControls(); + submitter.submitAsync(getEvents(logMessage), getContentPane(), new Consumer() { + @Override + public void consume(SubmittedReportInfo submittedReportInfo) { + logMessage.setSubmitting(false); + logMessage.setSubmitted(submittedReportInfo); + ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override + public void run() { + updateControls(); + } + }); + } + }); } } diff --git a/platform/platform-impl/src/com/intellij/errorreport/ErrorReportSender.java b/platform/platform-impl/src/com/intellij/errorreport/ErrorReportSender.java index 5ab173712b8e..333ff16c9567 100644 --- a/platform/platform-impl/src/com/intellij/errorreport/ErrorReportSender.java +++ b/platform/platform-impl/src/com/intellij/errorreport/ErrorReportSender.java @@ -17,24 +17,24 @@ package com.intellij.errorreport; import com.intellij.diagnostic.DiagnosticBundle; import com.intellij.errorreport.bean.ErrorBean; -import com.intellij.errorreport.error.InternalEAPException; -import com.intellij.errorreport.error.NoSuchEAPUserException; import com.intellij.errorreport.itn.ITNProxy; import com.intellij.ide.reporter.ConnectionException; import com.intellij.idea.IdeaLogger; +import com.intellij.openapi.progress.EmptyProgressIndicator; +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.updateSettings.impl.BuildInfo; import com.intellij.openapi.updateSettings.impl.UpdateChannel; import com.intellij.openapi.updateSettings.impl.UpdateChecker; -import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.Consumer; import com.intellij.util.net.HttpConfigurable; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.IOException; - /** * Created by IntelliJ IDEA. * User: stathik @@ -44,7 +44,9 @@ import java.io.IOException; */ public class ErrorReportSender { @NonNls public static final String PREPARE_URL = "http://www.intellij.net/"; - //public static String REPORT_URL = "http://unit-038:8080/error/report?sender=i"; + + private ErrorReportSender() { + } @Nullable public static String checkNewBuild() { @@ -64,74 +66,51 @@ public class ErrorReportSender { private String myLogin; private String myPassword; private ErrorBean errorBean; - private int myThreadId; public SendTask(final Project project, ErrorBean errorBean) { myProject = project; this.errorBean = errorBean; } - public int getThreadId () { - return myThreadId; - } - public void setCredentials(String login, String password) { myLogin = login; myPassword = password; } - public void sendReport() throws Exception { - final Ref err = new Ref(); - Runnable runnable = new Runnable() { - public void run() { + public void sendReport(final Consumer callback, final Consumer errback) { + Task.Backgroundable task = new Task.Backgroundable(myProject, DiagnosticBundle.message("title.submitting.error.report")) { + @Override + public void run(@NotNull ProgressIndicator indicator) { try { HttpConfigurable.getInstance().prepareURL(PREPARE_URL); if (!StringUtil.isEmpty(myLogin)) { - myThreadId = ITNProxy.postNewThread( + int threadId = ITNProxy.postNewThread( myLogin, myPassword, errorBean, IdeaLogger.getOurCompilationTimestamp()); + callback.consume(threadId); } } catch (Exception ex) { - err.set(ex); + errback.consume(ex); } } }; if (myProject == null) { - runnable.run(); + task.run(new EmptyProgressIndicator()); } else { - ProgressManager.getInstance().runProcessWithProgressSynchronously(runnable, - DiagnosticBundle.message("title.submitting.error.report"), - false, myProject); - } - if (!err.isNull()) { - throw err.get(); + ProgressManager.getInstance().run(task); } } } - public static int sendError(Project project, String login, String password, ErrorBean error) - throws IOException, NoSuchEAPUserException, InternalEAPException { - + public static void sendError(Project project, String login, String password, ErrorBean error, + Consumer callback, Consumer errback) { SendTask sendTask = new SendTask (project, error); sendTask.setCredentials(login, password); - - try { - sendTask.sendReport(); - return sendTask.getThreadId(); - } catch (IOException e) { - throw e; - } catch (NoSuchEAPUserException e) { - throw e; - } catch (InternalEAPException e) { - throw e; - } catch (Throwable e) { - e.printStackTrace(); - throw new RuntimeException(e); - } + sendTask.sendReport(callback, errback); } } From aa3cc8bc5a3a11ef2560679ae9f9fcaee7cd72b3 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 20 Oct 2010 16:29:19 +0400 Subject: [PATCH 13/98] IDEA-59569 If current branch configuration wasn't once detected (for example, because git executable wasn't configured yet at that time), it wouldn't update anymore. Fixed to update it if it's null on GitBranchConfigurations component activation. --- .../branches/GitBranchConfigurations.java | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java index 5d4dd5e90a00..23048b1a0739 100644 --- a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java +++ b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java @@ -499,23 +499,15 @@ public class GitBranchConfigurations implements PersistentStateComponent currents = new HashMap(); + final HashMap rootToCurrentBranch = new HashMap(); for (VirtualFile root : myGitRoots) { GitBranch current = GitBranch.current(myProject, root); - currents.put(root, current == null ? "" : current.getName()); + rootToCurrentBranch.put(root, current == null ? "" : current.getName()); } + if (myConfigurations.isEmpty()) { detectLocalConfigurations(true); - for (GitBranchConfiguration configuration : myConfigurations.values()) { - boolean currentsMatched = true; - for (VirtualFile root : myGitRoots) { - currentsMatched &= currents.get(root).equals(configuration.getReference(root.getPath())); - } - if (currentsMatched) { - myCurrentConfiguration = configuration; - break; - } - } + updateCurrentConfiguration(rootToCurrentBranch); if (myCurrentConfiguration == null) { // the configuration does not matches any standard, there could be no configurations with spaces at this point // since it is not allowed branch name. @@ -539,12 +531,32 @@ public class GitBranchConfigurations implements PersistentStateComponent rootToCurrentBranch) { + for (GitBranchConfiguration configuration : myConfigurations.values()) { + boolean currentsMatched = true; + for (VirtualFile root : myGitRoots) { + currentsMatched &= rootToCurrentBranch.get(root).equals(configuration.getReference(root.getPath())); + } + if (currentsMatched) { + myCurrentConfiguration = configuration; + break; + } + } + } + /** * Detect local configurations * From 864ea374ca93e293f6721a16c00546fb01a8afd0 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 20 Oct 2010 16:25:41 +0400 Subject: [PATCH 14/98] test fix & bomb --- plugins/android/testData/dom/manifest/tn3_after.xml | 2 +- plugins/android/testData/dom/manifest/tn4_after.xml | 2 +- .../org/jetbrains/android/dom/AndroidManifestDomTest.java | 3 +++ .../intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/android/testData/dom/manifest/tn3_after.xml b/plugins/android/testData/dom/manifest/tn3_after.xml index d64f167c2ed1..6daccebd3bc0 100644 --- a/plugins/android/testData/dom/manifest/tn3_after.xml +++ b/plugins/android/testData/dom/manifest/tn3_after.xml @@ -1,5 +1,5 @@ - diff --git a/plugins/android/testData/dom/manifest/tn4_after.xml b/plugins/android/testData/dom/manifest/tn4_after.xml index ca81825c1a8a..4ab70d1dda30 100644 --- a/plugins/android/testData/dom/manifest/tn4_after.xml +++ b/plugins/android/testData/dom/manifest/tn4_after.xml @@ -3,7 +3,7 @@ package="p1.a"> - diff --git a/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java b/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java index 366448b71c21..33d8db280bd8 100644 --- a/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java +++ b/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java @@ -1,6 +1,7 @@ package org.jetbrains.android.dom; import com.android.sdklib.SdkConstants; +import com.intellij.idea.Bombed; import com.intellij.util.ArrayUtil; import org.jetbrains.android.inspections.AndroidUnknownAttributeInspection; import org.jetbrains.android.sdk.Android15TestProfile; @@ -58,10 +59,12 @@ public class AndroidManifestDomTest extends AndroidDomTest { doTestHighlighting("hl2.xml"); } + @Bombed(month = 10, day = 30) public void testTagNameCompletion3() throws Throwable { toTestCompletion("tn3.xml", "tn3_after.xml"); } + @Bombed(month = 10, day = 30) public void testTagNameCompletion4() throws Throwable { toTestCompletion("tn4.xml", "tn4_after.xml"); } diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java index 8e1f105a9a4d..32b50c3e7707 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java @@ -206,7 +206,7 @@ public abstract class AbstractDomChildrenDescriptor implements XmlElementDescrip } public int getContentType() { - throw new UnsupportedOperationException("Method getContentType not implemented in " + getClass()); + return CONTENT_TYPE_ANY; } public void init(final PsiElement element) { From 05c84340233b093c473a85df013eb2ec17c18c28 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 20 Oct 2010 15:56:21 +0400 Subject: [PATCH 15/98] fixed creating project/global library without name --- .../classpath/NewLibraryChooser.java | 5 ++-- .../libraries/CreateCustomLibraryAction.java | 4 +-- .../libraryEditor/CreateNewLibraryDialog.java | 28 ++++++++++--------- .../EditExistingLibraryDialog.java | 5 ++++ .../LibraryEditorDialogBase.java | 10 +++++-- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/NewLibraryChooser.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/NewLibraryChooser.java index 960a5bdfb5aa..47dbf09ba63c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/NewLibraryChooser.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/NewLibraryChooser.java @@ -25,6 +25,7 @@ import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.roots.ui.configuration.libraryEditor.CreateNewLibraryDialog; +import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor; import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext; import javax.swing.*; @@ -61,13 +62,13 @@ class NewLibraryChooser implements ClasspathElementChooser { List tables = Arrays.asList(myRootModel.getModuleLibraryTable(), registrar.getLibraryTable(myProject), registrar.getLibraryTable()); - CreateNewLibraryDialog dialog = CreateNewLibraryDialog.createDialog(myParentComponent, myProject, tables, 1); + CreateNewLibraryDialog dialog = new CreateNewLibraryDialog(myParentComponent, myContext, new NewLibraryEditor(), tables, 1); final Module contextModule = DataKeys.MODULE_CONTEXT.getData(DataManager.getInstance().getDataContext(myParentComponent)); dialog.addFileChooserContext(LangDataKeys.MODULE_CONTEXT, contextModule); dialog.show(); myIsOk = dialog.isOK(); if (myIsOk) { - myChosenLibrary = dialog.createLibrary(myContext.getModifiableLibraryTable(dialog.getSelectedTable())); + myChosenLibrary = dialog.createLibrary(); } else { myChosenLibrary = null; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/CreateCustomLibraryAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/CreateCustomLibraryAction.java index 6fab61fa26ba..89e5ef6f9b26 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/CreateCustomLibraryAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/CreateCustomLibraryAction.java @@ -64,10 +64,10 @@ public class CreateCustomLibraryAction extends CustomLibraryActionBase { LibraryTablesRegistrar registrar = LibraryTablesRegistrar.getInstance(); final Project project = myContext.getProject(); final List tables = Arrays.asList(registrar.getLibraryTable(project), registrar.getLibraryTable()); - final CreateNewLibraryDialog dialog = new CreateNewLibraryDialog(myModuleStructureConfigurable.getTree(), project, libraryEditor, tables, 0); + final CreateNewLibraryDialog dialog = new CreateNewLibraryDialog(myModuleStructureConfigurable.getTree(), myContext, libraryEditor, tables, 0); dialog.show(); if (dialog.isOK()) { - final Library library = dialog.createLibrary(myContext.getModifiableLibraryTable(dialog.getSelectedTable())); + final Library library = dialog.createLibrary(); final ModifiableRootModel rootModel = myContext.getModulesConfigurator().getOrCreateModuleEditor(myModule).getModifiableRootModelProxy(); if (!askAndRemoveDuplicatedLibraryEntry(myCreator.getDescription(), rootModel)) { return; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java index 3a01e7c716e5..c953df9490ed 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryDialog.java @@ -17,13 +17,12 @@ package com.intellij.openapi.roots.ui.configuration.libraryEditor; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; -import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext; import com.intellij.openapi.ui.ComboBox; import com.intellij.util.ui.FormBuilder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -33,18 +32,14 @@ import java.util.List; * @author nik */ public class CreateNewLibraryDialog extends LibraryEditorDialogBase { + private final StructureConfigurableContext myContext; private NewLibraryEditor myLibraryEditor; private ComboBox myLibraryLevelCombobox; - public static CreateNewLibraryDialog createDialog(JComponent parent, @Nullable Project project, - @NotNull List libraryTables, - int selectedTable) { - return new CreateNewLibraryDialog(parent, project, new NewLibraryEditor(), libraryTables, selectedTable); - } - - public CreateNewLibraryDialog(@NotNull JComponent parent, @Nullable Project project, @NotNull NewLibraryEditor libraryEditor, + public CreateNewLibraryDialog(@NotNull JComponent parent, @NotNull StructureConfigurableContext context, @NotNull NewLibraryEditor libraryEditor, @NotNull List libraryTables, int selectedTable) { - super(parent, new LibraryRootsComponent(project, libraryEditor)); + super(parent, new LibraryRootsComponent(context.getProject(), libraryEditor)); + myContext = context; myLibraryEditor = libraryEditor; final DefaultComboBoxModel model = new DefaultComboBoxModel(); for (LibraryTable table : libraryTables) { @@ -65,11 +60,14 @@ public class CreateNewLibraryDialog extends LibraryEditorDialogBase { init(); } - public LibraryTable getSelectedTable() { - return (LibraryTable)myLibraryLevelCombobox.getSelectedItem(); + @NotNull @Override + protected LibraryTable.ModifiableModel getTableModifiableModel() { + final LibraryTable selectedTable = (LibraryTable)myLibraryLevelCombobox.getSelectedItem(); + return myContext.getModifiableLibraryTable(selectedTable); } - public Library createLibrary(final @NotNull LibraryTable.ModifiableModel modifiableModel) { + public Library createLibrary() { + final LibraryTable.ModifiableModel modifiableModel = getTableModifiableModel(); final Library library = modifiableModel.createLibrary(myLibraryEditor.getName()); final Library.ModifiableModel model = library.getModifiableModel(); myLibraryEditor.apply(model); @@ -85,4 +83,8 @@ public class CreateNewLibraryDialog extends LibraryEditorDialogBase { protected void addNorthComponents(FormBuilder formBuilder) { formBuilder.addLabeledComponent("Level:", myLibraryLevelCombobox); } + + protected boolean shouldCheckName(String newName) { + return true; + } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/EditExistingLibraryDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/EditExistingLibraryDialog.java index 5c5665f4a10b..3f9b53b76455 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/EditExistingLibraryDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/EditExistingLibraryDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.ui.configuration.LibraryTableModifiableModelProvider; import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesModifiableModel; +import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.Nullable; @@ -79,4 +80,8 @@ public class EditExistingLibraryDialog extends LibraryEditorDialogBase { protected LibraryTable.ModifiableModel getTableModifiableModel() { return myTableModifiableModel; } + + protected boolean shouldCheckName(String newName) { + return !Comparing.equal(newName, getLibraryRootsComponent().getLibraryEditor().getName()); + } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditorDialogBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditorDialogBase.java index a344d339f2f2..fa0e0dcb770d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditorDialogBase.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryEditorDialogBase.java @@ -22,7 +22,6 @@ import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.ui.configuration.libraries.LibraryEditingUtil; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.util.ui.FormBuilder; import org.jetbrains.annotations.Nullable; @@ -65,12 +64,11 @@ public abstract class LibraryEditorDialogBase extends DialogWrapper { } protected boolean validateAndApply() { - final String currentName = myLibraryRootsComponent.getLibraryEditor().getName(); String newName = myNameField.getText().trim(); if (newName.length() == 0) { newName = null; } - if (!Comparing.equal(newName, currentName)) { + if (shouldCheckName(newName)) { final LibraryTable.ModifiableModel tableModifiableModel = getTableModifiableModel(); if (tableModifiableModel != null && !(tableModifiableModel instanceof ModuleLibraryTable)) { if (newName == null) { @@ -88,11 +86,17 @@ public abstract class LibraryEditorDialogBase extends DialogWrapper { return true; } + protected abstract boolean shouldCheckName(String newName); + @Nullable protected LibraryTable.ModifiableModel getTableModifiableModel() { return null; } + protected LibraryRootsComponent getLibraryRootsComponent() { + return myLibraryRootsComponent; + } + protected JComponent createNorthPanel() { FormBuilder formBuilder = new FormBuilder(); String currentName = myLibraryRootsComponent.getLibraryEditor().getName(); From 2fecda0da1bfe8e2e4d0332c52e7f18be8238e12 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 20 Oct 2010 16:50:37 +0400 Subject: [PATCH 16/98] IDEA-59955 IDEA does not infert the 'def' type in Groovy if we use factory methods instead of actual constructors. --- .../src/com/intellij/psi/GenericsUtil.java | 2 +- .../statements/expressions/TypesUtil.java | 10 +++++++++ .../GrMethodCallUsageInfo.java | 21 ++++++------------- .../lang/resolve/TypeInferenceTest.java | 4 ++++ .../rawTypeInReturnExpression/A.groovy | 14 +++++++++++++ 5 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy diff --git a/java/openapi/src/com/intellij/psi/GenericsUtil.java b/java/openapi/src/com/intellij/psi/GenericsUtil.java index 585f9692aec9..412e11a52c85 100644 --- a/java/openapi/src/com/intellij/psi/GenericsUtil.java +++ b/java/openapi/src/com/intellij/psi/GenericsUtil.java @@ -15,8 +15,8 @@ */ package com.intellij.psi; -import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Pair; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiUtil; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java index e4c0aa9a5431..88c645aacb77 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java @@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; +import com.intellij.psi.impl.PsiSubstitutorImpl; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.InheritanceUtil; @@ -487,4 +488,13 @@ public class TypesUtil { public static boolean typeEqualsToText(@NotNull PsiType type, @NotNull String text) { return text.endsWith(type.getPresentableText()) && text.equals(type.getCanonicalText()); } + + public static PsiSubstitutor composeSubstitutors(PsiSubstitutor s1, PsiSubstitutor s2) { + final Map map = s1.getSubstitutionMap(); + Map result = new com.intellij.util.containers.hash.HashMap(map.size()); + for (PsiTypeParameter parameter : map.keySet()) { + result.put(parameter, s2.substitute(map.get(parameter))); + } + return PsiSubstitutorImpl.createSubstitutor(result); + } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java index e00a97424b9c..a5c0ff4b734b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrMethodCallUsageInfo.java @@ -15,15 +15,16 @@ */ package org.jetbrains.plugins.groovy.refactoring.changeSignature; -import com.intellij.psi.*; -import com.intellij.psi.impl.PsiSubstitutorImpl; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.refactoring.changeSignature.PossiblyIncorrectUsage; import com.intellij.usageView.UsageInfo; -import com.intellij.util.containers.hash.HashMap; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; @@ -33,11 +34,10 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrMethod import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEnumConstant; import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClosureSignature; +import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil; import org.jetbrains.plugins.groovy.lang.psi.impl.types.GrClosureSignatureUtil; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; -import java.util.Map; - /** * @author Maxim.Medvedev */ @@ -73,7 +73,7 @@ public class GrMethodCallUsageInfo extends UsageInfo implements PossiblyIncorrec final MethodSignature methodSignature = resolved.getSignature(PsiSubstitutor.EMPTY); final PsiSubstitutor superMethodSignatureSubstitutor = MethodSignatureUtil.getSuperMethodSignatureSubstitutor(methodSignature, superMethodSignature); - mySubstitutor = composeSubstitutors(superMethodSignatureSubstitutor, mySubstitutor); + mySubstitutor = TypesUtil.composeSubstitutors(superMethodSignatureSubstitutor, mySubstitutor); } } } @@ -90,15 +90,6 @@ public class GrMethodCallUsageInfo extends UsageInfo implements PossiblyIncorrec } } - private static PsiSubstitutor composeSubstitutors(PsiSubstitutor s1, PsiSubstitutor s2) { - final Map map = s1.getSubstitutionMap(); - Map result = new HashMap(map.size()); - for (PsiTypeParameter parameter : map.keySet()) { - result.put(parameter, s2.substitute(map.get(parameter))); - } - return PsiSubstitutorImpl.createSubstitutor(result); - } - @Nullable public static GroovyResolveResult resolveMethod(final PsiElement ref) { if (ref instanceof GrEnumConstant) return ((GrEnumConstant)ref).resolveConstructorGenerics(); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java index 6a6fd3b29023..76f913c140d0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java @@ -138,4 +138,8 @@ public class TypeInferenceTest extends GroovyResolveTestCase { GrReferenceExpression refExpr = (GrReferenceExpression)configureByFile("parameterWithBuiltinType/A.groovy"); assertEquals("java.lang.Integer", refExpr.getType().getCanonicalText()); } + + public void testRawTypeInReturnExpression() { + assertNotNull(resolve("A.groovy")); + } } diff --git a/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy b/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy new file mode 100644 index 000000000000..c650108e22e7 --- /dev/null +++ b/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy @@ -0,0 +1,14 @@ +class MissingInferenceTest { + Map>> factoryMethod() { [:]} + + def myMethod() { + Map>> dataTyped = [:] + def dataInferred = new HashMap>>() + def dataNotInferred = factoryMethod() + + println dataTyped ['foo'][5][2].time() + println dataInferred ['foo'][5][2].time() + println dataNotInferred['foo'][5][2].time() // no completion, highlighted as dynamic + } +} + From 6446b0c8beb2d9840f74f3c4e0ade5bb1ce73e11 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 20 Oct 2010 16:52:36 +0400 Subject: [PATCH 17/98] IDEA-59955 IDEA does not infert the 'def' type in Groovy if we use factory methods instead of actual constructors. --- .../typedef/members/GrMethodBaseImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java index 8bcc56e7e44c..5bc64ebe2ba6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java @@ -29,6 +29,7 @@ import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.NamedStub; import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; +import com.intellij.psi.util.TypeConversionUtil; import com.intellij.ui.RowIcon; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; @@ -65,6 +66,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyBaseElementImpl; import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyFileImpl; import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiManager; 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.impl.statements.params.GrParameterListImpl; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; import org.jetbrains.plugins.groovy.lang.resolve.MethodTypeInferencer; @@ -175,6 +177,26 @@ public abstract class GrMethodBaseImpl extends GroovyBaseEl return inferred; } if (inferred != null && inferred != PsiType.NULL) { + if (inferred instanceof PsiClassType && nominal instanceof PsiClassType) { + final PsiClassType.ClassResolveResult declaredResult = ((PsiClassType)nominal).resolveGenerics(); + final PsiClass declaredClass = declaredResult.getElement(); + if (declaredClass != null) { + final PsiClassType.ClassResolveResult initializerResult = ((PsiClassType)inferred).resolveGenerics(); + final PsiClass initializerClass = initializerResult.getElement(); + if (initializerClass != null && + com.intellij.psi.util.PsiUtil.isRawSubstitutor(initializerClass, initializerResult.getSubstitutor())) { + if (declaredClass == initializerClass) return nominal; + final PsiSubstitutor declaredResultSubstitutor = declaredResult.getSubstitutor(); + final PsiSubstitutor superSubstitutor = + TypeConversionUtil.getClassSubstitutor(declaredClass, initializerClass, declaredResultSubstitutor); + + if (superSubstitutor != null) { + return JavaPsiFacade.getInstance(method.getProject()).getElementFactory() + .createType(declaredClass, TypesUtil.composeSubstitutors(declaredResultSubstitutor, superSubstitutor)); + } + } + } + } if (nominal.isAssignableFrom(inferred)) return inferred; } return nominal; From f9add30958ff165239a8dbdfa001b0e842863923 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Wed, 20 Oct 2010 16:54:26 +0400 Subject: [PATCH 18/98] IDEA-59099 Groovy 1.8: Introduce Variable Refactoring applied to command expressions cut off part of resulted definition --- .../introduceVariable/GroovyIntroduceVariableBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceVariable/GroovyIntroduceVariableBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceVariable/GroovyIntroduceVariableBase.java index ece0e8a02fcd..8aeb31c50d25 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceVariable/GroovyIntroduceVariableBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceVariable/GroovyIntroduceVariableBase.java @@ -180,7 +180,8 @@ public abstract class GroovyIntroduceVariableBase implements RefactoringActionHa if (selectedExpr instanceof GrReferenceExpression && selectedExpr.getParent() instanceof GrMethodCall && - (((GrMethodCall)selectedExpr.getParent()).isCommandExpression() || selectedExpr.getParent() instanceof GrApplicationStatement)) { + (((GrMethodCall)selectedExpr.getParent()).isCommandExpression() || selectedExpr.getParent() instanceof GrApplicationStatement) || + selectedExpr instanceof GrApplicationStatement) { String message = RefactoringBundle.getCannotRefactorMessage(GroovyRefactoringBundle.message("selected.expression.in.command.expression")); showErrorMessage(project, editor, message); return false; From 3a6d36de1b7a336cc737e81565850d7f02face78 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 20 Oct 2010 17:16:40 +0400 Subject: [PATCH 19/98] IDEA-60084 Copy/Paste in Project pane does not duplicate a file --- .../lang-impl/src/com/intellij/ide/PsiCopyPasteManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/PsiCopyPasteManager.java b/platform/lang-impl/src/com/intellij/ide/PsiCopyPasteManager.java index 4c69bfccff8f..a0a56ba13ab2 100644 --- a/platform/lang-impl/src/com/intellij/ide/PsiCopyPasteManager.java +++ b/platform/lang-impl/src/com/intellij/ide/PsiCopyPasteManager.java @@ -201,7 +201,7 @@ public class PsiCopyPasteManager { return getDataAsText(); } if (DataFlavor.javaFileListFlavor.equals(flavor)) { - ApplicationManager.getApplication().runReadAction(new Computable>() { + return ApplicationManager.getApplication().runReadAction(new Computable>() { @Override public List compute() { return asFileList(myDataProxy.getElements()); From 736dad4c9ff5416d8aaf490998c1d955b7db4898 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 20 Oct 2010 17:24:21 +0400 Subject: [PATCH 20/98] unknown xml tag content type --- plugins/android/testData/dom/manifest/tn3_after.xml | 2 +- plugins/android/testData/dom/manifest/tn4_after.xml | 2 +- .../org/jetbrains/android/dom/AndroidManifestDomTest.java | 3 --- .../intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java | 2 +- .../intellij/codeInsight/completion/XmlTagInsertHandler.java | 2 ++ .../com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java | 2 +- xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java | 1 + 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/android/testData/dom/manifest/tn3_after.xml b/plugins/android/testData/dom/manifest/tn3_after.xml index 6daccebd3bc0..72d40f30b18e 100644 --- a/plugins/android/testData/dom/manifest/tn3_after.xml +++ b/plugins/android/testData/dom/manifest/tn3_after.xml @@ -1,5 +1,5 @@ - + diff --git a/plugins/android/testData/dom/manifest/tn4_after.xml b/plugins/android/testData/dom/manifest/tn4_after.xml index 4ab70d1dda30..4c2047be5614 100644 --- a/plugins/android/testData/dom/manifest/tn4_after.xml +++ b/plugins/android/testData/dom/manifest/tn4_after.xml @@ -3,7 +3,7 @@ package="p1.a"> - + diff --git a/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java b/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java index 33d8db280bd8..366448b71c21 100644 --- a/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java +++ b/plugins/android/tests/org/jetbrains/android/dom/AndroidManifestDomTest.java @@ -1,7 +1,6 @@ package org.jetbrains.android.dom; import com.android.sdklib.SdkConstants; -import com.intellij.idea.Bombed; import com.intellij.util.ArrayUtil; import org.jetbrains.android.inspections.AndroidUnknownAttributeInspection; import org.jetbrains.android.sdk.Android15TestProfile; @@ -59,12 +58,10 @@ public class AndroidManifestDomTest extends AndroidDomTest { doTestHighlighting("hl2.xml"); } - @Bombed(month = 10, day = 30) public void testTagNameCompletion3() throws Throwable { toTestCompletion("tn3.xml", "tn3_after.xml"); } - @Bombed(month = 10, day = 30) public void testTagNameCompletion4() throws Throwable { toTestCompletion("tn4.xml", "tn4_after.xml"); } diff --git a/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java b/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java index 32b50c3e7707..95a2c47d9cbf 100644 --- a/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java +++ b/xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java @@ -206,7 +206,7 @@ public abstract class AbstractDomChildrenDescriptor implements XmlElementDescrip } public int getContentType() { - return CONTENT_TYPE_ANY; + return CONTENT_TYPE_UNKNOWN; } public void init(final PsiElement element) { diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java index 4ca49d304c7e..a5401bd2a601 100644 --- a/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlTagInsertHandler.java @@ -320,6 +320,8 @@ public class XmlTagInsertHandler implements InsertHandler { private static void completeTagTail(Template template, XmlElementDescriptor descriptor, PsiFile file, XmlTag context, boolean firstLevel) { boolean completeIt = !firstLevel || descriptor.getAttributesDescriptors(null).length == 0; switch (descriptor.getContentType()) { + case XmlElementDescriptor.CONTENT_TYPE_UNKNOWN: + return; case XmlElementDescriptor.CONTENT_TYPE_EMPTY: if (completeIt) { template.addTextSegment("/>"); diff --git a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java index 36d365137c04..36d06639dceb 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/AnyXmlElementDescriptor.java @@ -99,6 +99,6 @@ public class AnyXmlElementDescriptor implements XmlElementDescriptor { } public int getContentType() { - return 0; + return CONTENT_TYPE_UNKNOWN; } } diff --git a/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java b/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java index 22d0422edfeb..1b05741cb168 100644 --- a/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java +++ b/xml/openapi/src/com/intellij/xml/XmlElementDescriptor.java @@ -63,6 +63,7 @@ public interface XmlElementDescriptor extends PsiMetaData { int getContentType(); + int CONTENT_TYPE_UNKNOWN = -1; int CONTENT_TYPE_EMPTY = 0; int CONTENT_TYPE_ANY = 1; int CONTENT_TYPE_CHILDREN = 2; From dac7b55ecc7d90cc9b70e17618f7a1edf8ec37ad Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 20 Oct 2010 15:52:17 +0200 Subject: [PATCH 21/98] added option to resource inspections to allow resource to be opened inside a try-block in addition to opening it in front of a try-block (fixes IDEA-26256, IDEA-19608 and IDEA-19114) --- .../siyeh/InspectionGadgetsBundle.properties | 1 + .../resources/ChannelResourceInspection.java | 75 ++++++--- .../HibernateResourceInspection.java | 61 +++++-- .../ig/resources/IOResourceInspection.java | 155 ++++++++++-------- .../ig/resources/JDBCResourceInspection.java | 127 ++++++++------ .../ig/resources/JNDIResourceInspection.java | 117 ++++++++----- .../ig/resources/ResourceInspection.java | 53 ++++-- .../resources/SocketResourceInspection.java | 85 +++++++--- .../ChannelResource.html | 4 + .../HibernateResource.html | 4 + .../inspectionDescriptions/IOResource.html | 6 + .../inspectionDescriptions/JDBCResource.html | 4 + .../inspectionDescriptions/JNDIResource.html | 4 + .../SocketResource.html | 4 + 14 files changed, 460 insertions(+), 240 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties index effab0db5cf2..af558e551fd2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/src/com/siyeh/InspectionGadgetsBundle.properties @@ -1784,3 +1784,4 @@ expected.exception.never.thrown.problem.descriptor=Expected #ref ne choose.logger.class=Choose logger class logger.class.names=Logger class names bad.exception.declared.ignore.exceptions.declared.in.tests.option=&Ignore exceptions declared in tests +allow.resource.to.be.opened.inside.a.try.block=Allow resource to be opened inside a try block diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ChannelResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ChannelResourceInspection.java index 8558dd24fc10..2c93d0b96436 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ChannelResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ChannelResourceInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,26 +21,33 @@ import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.ig.ui.CheckBox; import org.jetbrains.annotations.NotNull; -public class ChannelResourceInspection extends ResourceInspection{ +import javax.swing.*; +import java.awt.*; + +public class ChannelResourceInspection extends ResourceInspection { + + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; @Override @NotNull - public String getID(){ + public String getID() { return "ChannelOpenedButNotSafelyClosed"; } @Override @NotNull - public String getDisplayName(){ + public String getDisplayName() { return InspectionGadgetsBundle.message( "channel.opened.not.closed.display.name"); } @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -50,36 +57,58 @@ public class ChannelResourceInspection extends ResourceInspection{ } @Override - public BaseInspectionVisitor buildVisitor(){ + public JComponent createOptionsPanel() { + final JComponent panel = new JPanel(new GridBagLayout()); + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; + } + + @Override + public BaseInspectionVisitor buildVisitor() { return new ChannelResourceVisitor(); } - private static class ChannelResourceVisitor extends BaseInspectionVisitor{ + private class ChannelResourceVisitor extends BaseInspectionVisitor { - @Override public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression){ + @Override + public void visitMethodCallExpression( + @NotNull PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - if(!isChannelFactoryMethod(expression)){ + if (!isChannelFactoryMethod(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; } final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isChannelFactoryClosedInFinally(expression)){ + if (isChannelFactoryClosedInFinally(expression)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - private static boolean isChannelFactoryClosedInFinally( + private boolean isChannelFactoryClosedInFinally( PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); @@ -98,31 +127,31 @@ public class ChannelResourceInspection extends ResourceInspection{ PsiTryStatement tryStatement = PsiTreeUtil.getParentOfType(expression, PsiTryStatement.class, true, PsiMember.class); - if(tryStatement == null){ + if (tryStatement == null) { return false; } - while (!resourceIsClosedInFinally(tryStatement, variable)) { + while (!isResourceClosedInFinally(tryStatement, variable)) { tryStatement = PsiTreeUtil.getParentOfType(tryStatement, - PsiTryStatement.class, true, PsiMember.class); - if(tryStatement == null){ + PsiTryStatement.class, true, PsiMember.class); + if (tryStatement == null) { return false; } } return true; } - private static boolean isChannelFactoryMethod( - PsiMethodCallExpression expression){ + private boolean isChannelFactoryMethod( + PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); - if(!HardcodedMethodConstants.GET_CHANNEL.equals(methodName)) { + if (!HardcodedMethodConstants.GET_CHANNEL.equals(methodName)) { return false; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if(qualifier == null) { + if (qualifier == null) { return false; } return TypeUtils.expressionHasTypeOrSubtype(qualifier, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/HibernateResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/HibernateResourceInspection.java index b5e66653cde0..d650adfafcdf 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/HibernateResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/HibernateResourceInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2008 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,26 +20,33 @@ import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.ig.ui.CheckBox; import org.jetbrains.annotations.NotNull; +import javax.swing.*; +import java.awt.*; + public class HibernateResourceInspection extends ResourceInspection { + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; + @Override @NotNull - public String getID(){ + public String getID() { return "HibernateResourceOpenedButNotSafelyClosed"; } @Override @NotNull - public String getDisplayName(){ + public String getDisplayName() { return InspectionGadgetsBundle.message( "hibernate.resource.opened.not.closed.display.name"); } @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -50,43 +57,65 @@ public class HibernateResourceInspection extends ResourceInspection { } @Override - public BaseInspectionVisitor buildVisitor(){ + public JComponent createOptionsPanel() { + final JComponent panel = new JPanel(new GridBagLayout()); + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; + } + + @Override + public BaseInspectionVisitor buildVisitor() { return new HibernateResourceVisitor(); } - private static class HibernateResourceVisitor extends BaseInspectionVisitor{ + private class HibernateResourceVisitor extends BaseInspectionVisitor { - @Override public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression){ + @Override + public void visitMethodCallExpression( + @NotNull PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - if(!isHibernateFactoryMethod(expression)){ + if (!isHibernateFactoryMethod(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; } final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - private static boolean isHibernateFactoryMethod( - PsiMethodCallExpression expression){ + private boolean isHibernateFactoryMethod( + PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); - if(!HardcodedMethodConstants.OPEN_SESSION.equals(methodName)){ + if (!HardcodedMethodConstants.OPEN_SESSION.equals(methodName)) { return false; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if(qualifier == null){ + if (qualifier == null) { return false; } return TypeUtils.expressionHasTypeOrSubtype(qualifier, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java index d7e89c78fd6b..045686cee646 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java @@ -15,7 +15,9 @@ */ package com.siyeh.ig.resources; -import com.intellij.codeInspection.ui.RemoveAction; +import com.intellij.codeInspection.ui.ListTable; +import com.intellij.codeInspection.ui.ListWrappingTableModel; +import com.intellij.openapi.actionSystem.ActionToolbar; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.WriteExternalException; import com.intellij.psi.*; @@ -24,9 +26,8 @@ import com.intellij.ui.ScrollPaneFactory; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; -import com.intellij.codeInspection.ui.ListTable; -import com.intellij.codeInspection.ui.ListWrappingTableModel; -import com.siyeh.ig.ui.TreeClassChooserAction; +import com.siyeh.ig.ui.CheckBox; +import com.siyeh.ig.ui.UiUtils; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -38,37 +39,45 @@ import java.util.List; public class IOResourceInspection extends ResourceInspection { + private static final String[] IO_TYPES = { + "java.io.InputStream", "java.io.OutputStream", + "java.io.Reader", "java.io.Writer", + "java.io.RandomAccessFile", "java.util.zip.ZipFile"}; + @NonNls @SuppressWarnings({"PublicField"}) public String ignoredTypesString = "java.io.ByteArrayOutputStream" + - ',' + "java.io.ByteArrayInputStream" + - ',' + "java.io.StringBufferInputStream" + - ',' + "java.io.CharArrayWriter" + - ',' + "java.io.CharArrayReader" + - ',' + "java.io.StringWriter" + - ',' + "java.io.StringReader"; + ',' + "java.io.ByteArrayInputStream" + + ',' + "java.io.StringBufferInputStream" + + ',' + "java.io.CharArrayWriter" + + ',' + "java.io.CharArrayReader" + + ',' + "java.io.StringWriter" + + ',' + "java.io.StringReader"; final List ignoredTypes = new ArrayList(); + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; + public IOResourceInspection() { parseString(ignoredTypesString, ignoredTypes); } @Override @NotNull - public String getID(){ + public String getID() { return "IOResourceOpenedButNotSafelyClosed"; } @Override @NotNull - public String getDisplayName(){ + public String getDisplayName() { return InspectionGadgetsBundle.message( "i.o.resource.opened.not.closed.display.name"); } @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -80,36 +89,43 @@ public class IOResourceInspection extends ResourceInspection { @Override public JComponent createOptionsPanel() { final JComponent panel = new JPanel(new GridBagLayout()); - final GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.FIRST_LINE_START; - constraints.gridx = 0; - constraints.gridy = 0; - constraints.gridheight = 2; - constraints.weightx = 1.0; - constraints.weighty = 1.0; - constraints.fill = GridBagConstraints.BOTH; + final ListTable table = new ListTable(new ListWrappingTableModel(ignoredTypes, InspectionGadgetsBundle.message( "ignored.io.resource.types"))); - final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); - panel.add(scrollPane, constraints); - constraints.gridx = 1; - constraints.weightx = 0.0; - constraints.weighty = 0.0; - constraints.gridheight = 1; - constraints.fill = GridBagConstraints.HORIZONTAL; - final JButton addButton = - new JButton(new TreeClassChooserAction(table, + final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); + + final ActionToolbar toolbar = + UiUtils.createAddRemoveTreeClassChooserToolbar(table, InspectionGadgetsBundle.message( - "choose.io.resource.type.to.ignore"), - "java.io.InputStream", "java.io.OutputStream", - "java.io.Reader", "java.io.Writer", - "java.io.RandomAccessFile")); - panel.add(addButton, constraints); + "choose.io.resource.type.to.ignore"), IO_TYPES); + + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(toolbar.getComponent(), constraints); + constraints.gridy = 1; - final JButton removeButton = new JButton(new RemoveAction(table)); - panel.add(removeButton, constraints); + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.BOTH; + panel.add(scrollPane, constraints); + + constraints.gridy = 2; + constraints.weighty = 0.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; } @@ -126,28 +142,28 @@ public class IOResourceInspection extends ResourceInspection { } @Override - public BaseInspectionVisitor buildVisitor(){ + public BaseInspectionVisitor buildVisitor() { return new IOResourceVisitor(); } - private class IOResourceVisitor extends BaseInspectionVisitor{ + private class IOResourceVisitor extends BaseInspectionVisitor { - @Override public void visitNewExpression( - @NotNull PsiNewExpression expression){ + @Override + public void visitNewExpression(@NotNull PsiNewExpression expression) { super.visitNewExpression(expression); - if(!isIOResource(expression)){ + if (!isIOResource(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; - } if (parent instanceof PsiExpressionList){ + } else if (parent instanceof PsiExpressionList) { PsiElement grandParent = parent.getParent(); - if(grandParent instanceof PsiAnonymousClass){ + if (grandParent instanceof PsiAnonymousClass) { grandParent = grandParent.getParent(); } - if(grandParent instanceof PsiNewExpression && - isIOResource((PsiNewExpression) grandParent)){ + if (grandParent instanceof PsiNewExpression && + isIOResource((PsiNewExpression) grandParent)) { return; } } @@ -157,10 +173,10 @@ public class IOResourceInspection extends ResourceInspection { if (containingBlock == null) { return; } - if(isArgumentOfResourceCreation(boundVariable, containingBlock)){ + if (isArgumentOfResourceCreation(boundVariable, containingBlock)) { return; } - if (isSafelyClosed(boundVariable, expression)) { + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } if (isResourceEscapedFromMethod(boundVariable, expression)) { @@ -171,11 +187,9 @@ public class IOResourceInspection extends ResourceInspection { } - public boolean isIOResource(PsiExpression expression){ - return TypeUtils.expressionHasTypeOrSubtype(expression, - "java.io.InputStream", "java.io.Writer", "java.io.Reader", - "java.io.RandomAccessFile", "java.io.OutputStream", "java.util.zip.ZipFile") != null && - !isIgnoredType(expression); + public boolean isIOResource(PsiExpression expression) { + return TypeUtils.expressionHasTypeOrSubtype(expression, IO_TYPES) != + null && !isIgnoredType(expression); } private boolean isIgnoredType(PsiExpression expression) { @@ -183,54 +197,55 @@ public class IOResourceInspection extends ResourceInspection { } private boolean isArgumentOfResourceCreation( - PsiVariable boundVariable, PsiElement scope){ + PsiVariable boundVariable, PsiElement scope) { final UsedAsIOResourceArgumentVisitor visitor = new UsedAsIOResourceArgumentVisitor(boundVariable); scope.accept(visitor); - return visitor.usedAsArgumentToResourceCreation(); + return visitor.isUsedAsArgumentToResourceCreation(); } private class UsedAsIOResourceArgumentVisitor - extends JavaRecursiveElementVisitor{ + extends JavaRecursiveElementVisitor { private boolean usedAsArgToResourceCreation = false; private final PsiVariable ioResource; - private UsedAsIOResourceArgumentVisitor(PsiVariable ioResource){ + private UsedAsIOResourceArgumentVisitor(PsiVariable ioResource) { this.ioResource = ioResource; } - @Override public void visitNewExpression( - @NotNull PsiNewExpression expression){ - if(usedAsArgToResourceCreation){ + @Override + public void visitNewExpression( + @NotNull PsiNewExpression expression) { + if (usedAsArgToResourceCreation) { return; } super.visitNewExpression(expression); - if(!isIOResource(expression)){ + if (!isIOResource(expression)) { return; } final PsiExpressionList argumentList = expression.getArgumentList(); - if(argumentList == null){ + if (argumentList == null) { return; } final PsiExpression[] arguments = argumentList.getExpressions(); - if(arguments.length == 0){ + if (arguments.length == 0) { return; } final PsiExpression argument = arguments[0]; - if(argument == null || - !(argument instanceof PsiReferenceExpression)){ + if (argument == null || + !(argument instanceof PsiReferenceExpression)) { return; } - final PsiElement referent = - ((PsiReference) argument).resolve(); - if(referent == null || !referent.equals(ioResource)){ + final PsiReference reference = (PsiReference) argument; + final PsiElement target = reference.resolve(); + if (target == null || !target.equals(ioResource)) { return; } usedAsArgToResourceCreation = true; } - public boolean usedAsArgumentToResourceCreation(){ + public boolean isUsedAsArgumentToResourceCreation() { return usedAsArgToResourceCreation; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java index c4f4e1f02010..ef4ef65f921d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2008 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,62 +19,70 @@ import com.intellij.psi.*; import com.intellij.util.containers.ContainerUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.ig.ui.CheckBox; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import javax.swing.*; +import java.awt.*; import java.util.HashSet; import java.util.Set; -public class JDBCResourceInspection extends ResourceInspection{ +public class JDBCResourceInspection extends ResourceInspection { private static final String[] creationMethodClassName = - new String[]{ - "java.sql.Driver", - "java.sql.DriverManager", - "javax.sql.DataSource", - "java.sql.Connection", - "java.sql.Connection", - "java.sql.Connection", - "java.sql.Statement", - "java.sql.Statement", - "java.sql.Statement", + { + "java.sql.Driver", + "java.sql.DriverManager", + "javax.sql.DataSource", + "java.sql.Connection", + "java.sql.Connection", + "java.sql.Connection", + "java.sql.Statement", + "java.sql.Statement", + "java.sql.Statement", }; - @NonNls private static final String[] creationMethodName = - new String[]{ - "connect", - "getConnection", - "getConnection", - "createStatement", - "prepareStatement", - "prepareCall", - "executeQuery", - "getResultSet", - "getGeneratedKeys" + @NonNls + private static final String[] creationMethodName = + { + "connect", + "getConnection", + "getConnection", + "createStatement", + "prepareStatement", + "prepareCall", + "executeQuery", + "getResultSet", + "getGeneratedKeys" }; - /** - * @noinspection StaticCollection - */ + @SuppressWarnings({"StaticCollection"}) private static final Set creationMethodNameSet = new HashSet(9); + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; + static { - ContainerUtil.addAll(creationMethodNameSet, creationMethodName); + ContainerUtil.addAll(creationMethodNameSet, creationMethodName); } + @Override @NotNull - public String getID(){ + public String getID() { return "JDBCResourceOpenedButNotSafelyClosed"; } + @Override @NotNull - public String getDisplayName(){ + public String getDisplayName() { return InspectionGadgetsBundle.message( "jdbc.resource.opened.not.closed.display.name"); } + @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -83,60 +91,83 @@ public class JDBCResourceInspection extends ResourceInspection{ "jdbc.resource.opened.not.closed.problem.descriptor", text); } - public BaseInspectionVisitor buildVisitor(){ + @Override + public JComponent createOptionsPanel() { + final JComponent panel = new JPanel(new GridBagLayout()); + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; + } + + @Override + public BaseInspectionVisitor buildVisitor() { return new JDBCResourceVisitor(); } - private static class JDBCResourceVisitor extends BaseInspectionVisitor{ + private class JDBCResourceVisitor extends BaseInspectionVisitor { - @Override public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression){ + @Override + public void visitMethodCallExpression( + @NotNull PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - if(!isJDBCResourceCreation(expression)){ + if (!isJDBCResourceCreation(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; } final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - private static boolean isJDBCResourceCreation( - PsiMethodCallExpression expression){ + private boolean isJDBCResourceCreation( + PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final String name = methodExpression.getReferenceName(); - if(name == null){ + if (name == null) { return false; } - if(!creationMethodNameSet.contains(name)){ + if (!creationMethodNameSet.contains(name)) { return false; } final PsiMethod method = expression.resolveMethod(); - if(method == null){ + if (method == null) { return false; } - for(int i = 0; i < creationMethodName.length; i++){ - if(!name.equals(creationMethodName[i])){ + for (int i = 0; i < creationMethodName.length; i++) { + if (!name.equals(creationMethodName[i])) { continue; } final PsiClass containingClass = method.getContainingClass(); - if(containingClass == null){ + if (containingClass == null) { return false; } final String className = containingClass.getQualifiedName(); - if(className == null){ + if (className == null) { return false; } - if(className.equals(creationMethodClassName[i])){ + if (className.equals(creationMethodClassName[i])) { return true; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JNDIResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JNDIResourceInspection.java index 1d5d3d491780..d79432ab2b52 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JNDIResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JNDIResourceInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2008 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,24 +19,34 @@ import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.ig.ui.CheckBox; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import javax.swing.*; +import java.awt.*; + public class JNDIResourceInspection extends ResourceInspection { + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; + + @Override @NotNull - public String getID(){ + public String getID() { return "JNDIResourceOpenedButNotSafelyClosed"; } + @Override @NotNull - public String getDisplayName(){ + public String getDisplayName() { return InspectionGadgetsBundle.message( "jndi.resource.opened.not.closed.display.name"); } + @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -45,41 +55,46 @@ public class JNDIResourceInspection extends ResourceInspection { "resource.opened.not.closed.problem.descriptor", text); } - public BaseInspectionVisitor buildVisitor(){ + @Override + public JComponent createOptionsPanel() { + final JComponent panel = new JPanel(new GridBagLayout()); + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; + } + + @Override + public BaseInspectionVisitor buildVisitor() { return new JNDIResourceVisitor(); } - private static class JNDIResourceVisitor extends BaseInspectionVisitor{ + private class JNDIResourceVisitor extends BaseInspectionVisitor { - @NonNls private static final String LIST = "list"; - @NonNls private static final String LIST_BINDING = "listBindings"; - @NonNls private static final String GET_ALL = "getAll"; + @NonNls + private static final String LIST = "list"; + @NonNls + private static final String LIST_BINDING = "listBindings"; + @NonNls + private static final String GET_ALL = "getAll"; - @Override public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression){ + @Override + public void visitMethodCallExpression( + @NotNull PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - if(!isJNDIFactoryMethod(expression)){ - return; - } - final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ - return; - } - final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ - return; - } - if(isResourceEscapedFromMethod(boundVariable, expression)){ - return; - } - registerError(expression, expression); - } - - - @Override public void visitNewExpression( - @NotNull PsiNewExpression expression){ - super.visitNewExpression(expression); - if(!isJNDIResource(expression)){ + if (!isJNDIFactoryMethod(expression)) { return; } final PsiElement parent = getExpressionParent(expression); @@ -87,22 +102,44 @@ public class JNDIResourceInspection extends ResourceInspection { return; } final PsiVariable boundVariable = getVariable(parent); - if (isSafelyClosed(boundVariable, expression)) { + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - private static boolean isJNDIResource(PsiNewExpression expression){ - return TypeUtils.expressionHasTypeOrSubtype(expression, - "javax.naming.InitialContext"); + + @Override + public void visitNewExpression( + @NotNull PsiNewExpression expression) { + super.visitNewExpression(expression); + if (!isJNDIResource(expression)) { + return; + } + final PsiElement parent = getExpressionParent(expression); + if (parent instanceof PsiReturnStatement) { + return; + } + final PsiVariable boundVariable = getVariable(parent); + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { + return; + } + if (isResourceEscapedFromMethod(boundVariable, expression)) { + return; + } + registerError(expression, expression); } - private static boolean isJNDIFactoryMethod( - PsiMethodCallExpression expression){ + private boolean isJNDIResource(PsiNewExpression expression) { + return TypeUtils.expressionHasTypeOrSubtype(expression, + "javax.naming.InitialContext"); + } + + private boolean isJNDIFactoryMethod( + PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); final String methodName = methodExpression.getReferenceName(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ResourceInspection.java index cfd7641fd1d5..b5ed6b87fba5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/ResourceInspection.java @@ -59,7 +59,8 @@ public abstract class ResourceInspection extends BaseInspection { } protected static boolean isSafelyClosed(@Nullable PsiVariable variable, - PsiElement context) { + PsiElement context, + boolean insideTryAllowed) { if (variable == null) { return false; } @@ -71,6 +72,23 @@ public abstract class ResourceInspection extends BaseInspection { PsiStatement nextStatement = PsiTreeUtil.getNextSiblingOfType(statement, PsiStatement.class); + if (insideTryAllowed) { + PsiStatement parentStatement = + PsiTreeUtil.getParentOfType(statement, PsiStatement.class); + while (parentStatement != null && + !(parentStatement instanceof PsiTryStatement)) { + parentStatement = + PsiTreeUtil.getParentOfType(statement, + PsiStatement.class); + } + if (parentStatement != null) { + final PsiTryStatement tryStatement = + (PsiTryStatement) parentStatement; + if (isResourceClosedInFinally(tryStatement, variable)) { + return true; + } + } + } while (nextStatement == null) { statement = PsiTreeUtil.getParentOfType(statement, PsiStatement.class, true); @@ -90,10 +108,10 @@ public abstract class ResourceInspection extends BaseInspection { return isResourceClose(nextStatement, variable); } final PsiTryStatement tryStatement = (PsiTryStatement) nextStatement; - return resourceIsClosedInFinally(tryStatement, variable); + return isResourceClosedInFinally(tryStatement, variable); } - protected static boolean resourceIsClosedInFinally( + protected static boolean isResourceClosedInFinally( @NotNull PsiTryStatement tryStatement, @NotNull PsiVariable variable) { final PsiCodeBlock finallyBlock = tryStatement.getFinallyBlock(); @@ -126,16 +144,16 @@ public abstract class ResourceInspection extends BaseInspection { } protected static boolean isResourceEscapedFromMethod( - PsiVariable boundVariable, PsiElement context){ + PsiVariable boundVariable, PsiElement context) { // poor man dataflow final PsiMethod method = PsiTreeUtil.getParentOfType(context, PsiMethod.class, true, PsiMember.class); - if(method == null){ + if (method == null) { return false; } final PsiCodeBlock body = method.getBody(); - if(body == null){ + if (body == null) { return false; } final EscapeVisitor visitor = new EscapeVisitor(boundVariable); @@ -274,40 +292,43 @@ public abstract class ResourceInspection extends BaseInspection { } } - private static class EscapeVisitor extends JavaRecursiveElementVisitor{ + private static class EscapeVisitor extends JavaRecursiveElementVisitor { private final PsiVariable boundVariable; private boolean escaped = false; - public EscapeVisitor(PsiVariable boundVariable){ + public EscapeVisitor(PsiVariable boundVariable) { this.boundVariable = boundVariable; } - @Override public void visitAnonymousClass(PsiAnonymousClass aClass){} + @Override + public void visitAnonymousClass(PsiAnonymousClass aClass) { + } @Override - public void visitElement(PsiElement element){ - if(escaped){ + public void visitElement(PsiElement element) { + if (escaped) { return; } super.visitElement(element); } - @Override public void visitReturnStatement( - PsiReturnStatement statement){ + @Override + public void visitReturnStatement( + PsiReturnStatement statement) { PsiExpression value = statement.getReturnValue(); value = PsiUtil.deparenthesizeExpression(value); - if (value instanceof PsiReferenceExpression){ + if (value instanceof PsiReferenceExpression) { final PsiReferenceExpression referenceExpression = (PsiReferenceExpression) value; final PsiElement target = referenceExpression.resolve(); - if(target == boundVariable){ + if (target != null && target.equals(boundVariable)) { escaped = true; } } } - public boolean isEscaped(){ + public boolean isEscaped() { return escaped; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/SocketResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/SocketResourceInspection.java index 6c475f33b604..273825c1431c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/SocketResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/SocketResourceInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,27 +19,34 @@ import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.ig.ui.CheckBox; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import javax.swing.*; +import java.awt.*; + public class SocketResourceInspection extends ResourceInspection { - @Override - @NotNull - public String getID(){ - return "SocketOpenedButNotSafelyClosed"; - } + @SuppressWarnings({"PublicField"}) + public boolean insideTryAllowed = false; @Override @NotNull - public String getDisplayName(){ + public String getID() { + return "SocketOpenedButNotSafelyClosed"; + } + + @Override + @NotNull + public String getDisplayName() { return InspectionGadgetsBundle.message( "socket.opened.not.closed.display.name"); } @Override @NotNull - public String buildErrorString(Object... infos){ + public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression) infos[0]; final PsiType type = expression.getType(); assert type != null; @@ -49,71 +56,95 @@ public class SocketResourceInspection extends ResourceInspection { } @Override - public BaseInspectionVisitor buildVisitor(){ + public JComponent createOptionsPanel() { + final JComponent panel = new JPanel(new GridBagLayout()); + final CheckBox checkBox = new CheckBox( + InspectionGadgetsBundle.message( + "allow.resource.to.be.opened.inside.a.try.block"), + this, "insideTryAllowed"); + + final GridBagConstraints constraints = new GridBagConstraints(); + constraints.anchor = GridBagConstraints.FIRST_LINE_START; + constraints.gridx = 0; + constraints.gridy = 0; + constraints.insets.left = 4; + constraints.insets.right = 4; + constraints.weightx = 1.0; + constraints.weighty = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; + panel.add(checkBox, constraints); + return panel; + } + + + @Override + public BaseInspectionVisitor buildVisitor() { return new SocketResourceVisitor(); } - private static class SocketResourceVisitor extends BaseInspectionVisitor{ + private class SocketResourceVisitor extends BaseInspectionVisitor { - @Override public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression){ + @Override + public void visitMethodCallExpression( + @NotNull PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); - if(!isSocketFactoryMethod(expression)){ + if (!isSocketFactoryMethod(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; } final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - @Override public void visitNewExpression( - @NotNull PsiNewExpression expression){ + @Override + public void visitNewExpression( + @NotNull PsiNewExpression expression) { super.visitNewExpression(expression); - if(!isSocketResource(expression)){ + if (!isSocketResource(expression)) { return; } final PsiElement parent = getExpressionParent(expression); - if(parent instanceof PsiReturnStatement){ + if (parent instanceof PsiReturnStatement) { return; } final PsiVariable boundVariable = getVariable(parent); - if(isSafelyClosed(boundVariable, expression)){ + if (isSafelyClosed(boundVariable, expression, insideTryAllowed)) { return; } - if(isResourceEscapedFromMethod(boundVariable, expression)){ + if (isResourceEscapedFromMethod(boundVariable, expression)) { return; } registerError(expression, expression); } - private static boolean isSocketResource(PsiNewExpression expression){ + private boolean isSocketResource(PsiNewExpression expression) { return TypeUtils.expressionHasTypeOrSubtype(expression, "java.net.Socket", "java.net.DatagramSocket", "java.net.ServerSocket") != null; } - private static boolean isSocketFactoryMethod( - PsiMethodCallExpression expression){ + private boolean isSocketFactoryMethod( + PsiMethodCallExpression expression) { final PsiReferenceExpression methodExpression = expression.getMethodExpression(); @NonNls final String methodName = methodExpression.getReferenceName(); - if(!"accept".equals(methodName)) { + if (!"accept".equals(methodName)) { return false; } final PsiExpression qualifier = methodExpression.getQualifierExpression(); - if(qualifier == null) { + if (qualifier == null) { return false; } return TypeUtils.expressionHasTypeOrSubtype(qualifier, diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/ChannelResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/ChannelResource.html index 678bc60f37c2..a48dcbaa166f 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/ChannelResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/ChannelResource.html @@ -7,5 +7,9 @@ front of a try block and closed in the corre if an exception is thrown before the resource is closed. Channel resources reported by this inspection include any instances created by calling getChannel() on a file or socket resource. +

+Use the checkbox below to specify if a Channel is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a Channel +in front of a try block. Powered by InspectionGadgets \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/HibernateResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/HibernateResource.html index 216f4dd7f4ec..3178ada063ff 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/HibernateResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/HibernateResource.html @@ -6,5 +6,9 @@ This inspection reports any Hibernate resource which is not opened in a finally block. Such resources may be inadvertently leaked if an exception is thrown before the resource is closed. Hibernate resources reported by this inspection include any instances of org.hibernate.Session. +

+Use the checkbox below to specify if a Hibernate resource is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a resource +in front of a try block. Powered by InspectionGadgets \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/IOResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/IOResource.html index 9f5327ca381e..69dc6ac92b4b 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/IOResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/IOResource.html @@ -11,5 +11,11 @@ by this inspection include any instances of java.io.Inp java.io.Writer and java.io.RandomAccessFile. I/O resources which are wrapped by other I/O resources are not reported, as the wrapped resource will be closed by the wrapping resource. +

+Use the table below to specify which I/O resources should be ignored by this inspection. +Specify I/O resource classes here which do not need to be closed. +Use the checkbox below to specify if a I/O resource is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a resource in front of a try +block. Powered by InspectionGadgets \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/JDBCResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/JDBCResource.html index 8da64b6be2a7..80a24fc9db7e 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/JDBCResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/JDBCResource.html @@ -9,5 +9,9 @@ by this inspection include any instances of java.sql.Co java.sql.PreparedStatement, java.sql.CallableStatement, and java.sql.ResultSet. +

+Use the checkbox below to specify if a JDBC resource is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a resource +in front of a try block. Powered by InspectionGadgets \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/JNDIResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/JNDIResource.html index 351b02541bfd..494cfbbeb25d 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/JNDIResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/JNDIResource.html @@ -7,5 +7,9 @@ block and closed in the corresponding finallyjavax.naming.InitialContext, and javax.naming.NamingEnumeration. +

+Use the checkbox below to specify if a JNDI Resource is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a resource +in front of a try block. Powered by InspectionGadgets \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/SocketResource.html b/plugins/InspectionGadgets/src/inspectionDescriptions/SocketResource.html index 133dcfa6ec3a..d5bdf1bb269e 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/SocketResource.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/SocketResource.html @@ -8,5 +8,9 @@ be inadvertently leaked if an exception is thrown before the resource is closed. by this inspection include any instances of java.net.Socket, java.net.DatagramSocket, and java.net.ServerSocket. +

+Use the checkbox below to specify if a Socket is allowed to be opened inside a try +block. This style is less desirable because it is more verbose than opening a Socket +in front of a try block. Powered by InspectionGadgets \ No newline at end of file From fd44a0d921cfa147c380928f00409ee445ccc3da Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Wed, 20 Oct 2010 17:59:36 +0400 Subject: [PATCH 22/98] Fix: IDEA-59519 (New Grails Intention in .gsp file: convert static string to message_code) --- .../codeInspection/i18n/I18nizeAction.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java index 84aa2ac7fdbd..41f426d9a16b 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nizeAction.java @@ -26,10 +26,13 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; -import com.intellij.psi.*; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiLiteralExpression; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Collection; @@ -92,13 +95,10 @@ public class I18nizeAction extends AnAction { return PlatformDataKeys.EDITOR.getData(e.getDataContext()); } - public void actionPerformed(AnActionEvent e) { - final Editor editor = getEditor(e); - final Project project = editor.getProject(); - final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext()); - if (psiFile == null) return; - final I18nQuickFixHandler handler = getHandler(e); - if (handler == null) return; + public static void doI18nSelectedString(final @NotNull Project project, + final @NotNull Editor editor, + final @NotNull PsiFile psiFile, + final @NotNull I18nQuickFixHandler handler) { try { handler.checkApplicability(psiFile, editor); } @@ -136,4 +136,16 @@ public class I18nizeAction extends AnAction { }); } + public void actionPerformed(AnActionEvent e) { + final Editor editor = getEditor(e); + final Project project = editor.getProject(); + assert project != null; + final PsiFile psiFile = LangDataKeys.PSI_FILE.getData(e.getDataContext()); + if (psiFile == null) return; + final I18nQuickFixHandler handler = getHandler(e); + if (handler == null) return; + + doI18nSelectedString(project, editor, psiFile, handler); + } + } From 1d2378f7ec6baebb8f6520d3a2fd6632bc901892 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 18:01:05 +0400 Subject: [PATCH 23/98] typo in javadoc --- .../ide/util/gotoByName/ContributorsBasedGotoByModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java index 2e609988b096..e9e711223840 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java @@ -136,8 +136,9 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel } /** - * This method allows exetending classes to introduce additional filtering criteria to model - * beyoud pattern and project/non-project files. The default implementation just returns true. + * This method allows extending classes to introduce additional filtering criteria to model + * beyond pattern and project/non-project files. The default implementation just returns true. + * * @param item an item to filter * @return true if the item is acceptable according to additional filtering criteria. */ From 9fdd0698ccebaabe6719ba2051528fee9ce2ca1d Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Wed, 20 Oct 2010 18:14:00 +0400 Subject: [PATCH 24/98] IDEA-59608 The ordering of Run/Debug configurations seems to change randomly --- .../execution/impl/ProjectRunConfigurationManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java index e36fefd13e0f..9f801349cc63 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ProjectRunConfigurationManager.java @@ -127,6 +127,9 @@ public class ProjectRunConfigurationManager implements ProjectComponent, Persist } } } + + // IDEA-60004: configs may never be sorted before write, so call it manually after shared configs read + myManager.getSortedConfigurations(); } public void writeExternal(Element element) throws WriteExternalException { From 9bdc994397a429d1818472dca4069e4f9439c859 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 20 Oct 2010 13:38:11 +0400 Subject: [PATCH 25/98] skip for default project; for non-physical files --- .../changeSignature/ChangeSignatureGestureDetector.java | 4 ++-- platform/platform-resources/src/componentSets/Lang.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java index ee1baf8aef08..91bf92ddbe92 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java @@ -168,7 +168,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme public void addDocListener(Document document) { final PsiFile file = myPsiDocumentManager.getPsiFile(document); - if (file != null && !myListenerMap.containsKey(file)) { + if (file != null && file.isPhysical() && !myListenerMap.containsKey(file)) { final MyDocumentChangeAdapter adapter = new MyDocumentChangeAdapter(); document.addDocumentListener(adapter); myListenerMap.put(file, adapter); @@ -182,7 +182,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme public void removeDocListener(Document document) { final PsiFile file = myPsiDocumentManager.getPsiFile(document); - if (file != null) { + if (file != null && file.isPhysical()) { if (ArrayUtil.find(myFileEditorManager.getOpenFiles(), file.getVirtualFile()) != -1) { return; } diff --git a/platform/platform-resources/src/componentSets/Lang.xml b/platform/platform-resources/src/componentSets/Lang.xml index cac6b3fcd3d2..47b1ae13ef32 100644 --- a/platform/platform-resources/src/componentSets/Lang.xml +++ b/platform/platform-resources/src/componentSets/Lang.xml @@ -197,6 +197,7 @@ com.intellij.refactoring.changeSignature.ChangeSignatureGestureDetector + From 29c22223ca759a3751cefe538fd2882afb2c4ef0 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 20 Oct 2010 17:44:52 +0400 Subject: [PATCH 26/98] cs: show gutter icon instead of box --- .../JavaChangeSignatureHandler.java | 6 +++ .../intention/impl/IntentionListStep.java | 2 +- .../ChangeSignatureDetectorAction.java | 11 +++- .../ChangeSignatureGestureDetector.java | 2 +- .../ChangeSignatureGestureVisitor.java | 54 +++++++++++++++++-- 5 files changed, 68 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java index a1ca04bcbb73..57edcb31b47b 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java @@ -46,6 +46,12 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler { private static void invokeOnElement(Project project, Editor editor, PsiElement element) { if (element instanceof PsiMethod) { + final ChangeSignatureGestureDetector detector = ChangeSignatureGestureDetector.getInstance(project); + final PsiIdentifier nameIdentifier = ((PsiMethod)element).getNameIdentifier(); + if (nameIdentifier != null && detector.isChangeSignatureAvailable(nameIdentifier)) { + detector.changeSignature(element.getContainingFile()); + return; + } invoke((PsiMethod) element, project, editor); } else if (element instanceof PsiClass) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java index 821cef57d228..a87f14160604 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java @@ -321,7 +321,7 @@ class IntentionListStep implements ListPopupStep final IntentionAction action = value.getAction(); - Object iconable = null; + Object iconable = action; //custom icon if (action instanceof QuickFixWrapper) { iconable = ((QuickFixWrapper)action).getFix(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java index a587700673cf..94257a9281b5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java @@ -19,15 +19,19 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Iconable; import com.intellij.psi.PsiFile; +import com.intellij.util.Icons; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; +import javax.swing.*; + /** * User: anna * Date: Sep 6, 2010 */ -public class ChangeSignatureDetectorAction implements IntentionAction { +public class ChangeSignatureDetectorAction implements IntentionAction, Iconable { private static final Logger LOG = Logger.getInstance("#" + ChangeSignatureDetectorAction.class.getName()); @NotNull @@ -56,4 +60,9 @@ public class ChangeSignatureDetectorAction implements IntentionAction { public boolean startInWriteAction() { return false; } + + @Override + public Icon getIcon(int flags) { + return Icons.ADVICE_ICON; + } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java index 91bf92ddbe92..aa408f6ebadf 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java @@ -104,7 +104,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme public void dispose() { myPsiManager.removePsiTreeChangeListener(ChangeSignatureGestureDetector.this); EditorFactory.getInstance().removeEditorFactoryListener(ChangeSignatureGestureDetector.this); - myListenerMap.clear(); + LOG.assertTrue(myListenerMap.isEmpty(), myListenerMap); } }); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java index ca323c924b16..b7bdafb3de77 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java @@ -19,17 +19,22 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.daemon.impl.HighlightInfoType; import com.intellij.codeInsight.daemon.impl.HighlightVisitor; import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder; -import com.intellij.codeInsight.daemon.impl.quickfix.QuickFixAction; import com.intellij.lang.annotation.HighlightSeverity; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.markup.EffectType; +import com.intellij.openapi.editor.markup.GutterIconRenderer; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import com.intellij.util.Icons; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import javax.swing.*; import java.awt.*; /** @@ -42,11 +47,11 @@ public class ChangeSignatureGestureVisitor implements HighlightVisitor { @Override public boolean suitableForFile(PsiFile file) { - return file != null && ApplicationManagerEx.getApplicationEx().isInternal() && LanguageChangeSignatureDetectors.isSuitableForLanguage(file.getLanguage()); + return file != null && LanguageChangeSignatureDetectors.isSuitableForLanguage(file.getLanguage()); } @Override - public void visit(PsiElement element, HighlightInfoHolder holder) { + public void visit(final PsiElement element, HighlightInfoHolder holder) { final ChangeSignatureGestureDetector detector = ChangeSignatureGestureDetector.getInstance(element.getProject()); if (detector.isChangeSignatureAvailable(element)) { final TextRange range = LanguageChangeSignatureDetectors.getHighlightingRange(element); @@ -58,7 +63,8 @@ public class ChangeSignatureGestureVisitor implements HighlightVisitor { HighlightInfoType.INFORMATION, range.getStartOffset(), range.getEndOffset(), SIGNATURE_SHOULD_BE_POSSIBLY_CHANGED, SIGNATURE_SHOULD_BE_POSSIBLY_CHANGED, HighlightSeverity.INFORMATION, false, true, false); - QuickFixAction.registerQuickFixAction(info, new ChangeSignatureDetectorAction()); + final ChangeSignatureDetectorAction action = new ChangeSignatureDetectorAction(); + info.setGutterIconRenderer(new MyGutterIconRenderer(action, element)); holder.add(info); } } @@ -79,5 +85,45 @@ public class ChangeSignatureGestureVisitor implements HighlightVisitor { return 10; } + private static class MyGutterIconRenderer extends GutterIconRenderer { + private final ChangeSignatureDetectorAction myAction; + private final PsiElement myElement; + public MyGutterIconRenderer(ChangeSignatureDetectorAction action, PsiElement element) { + myAction = action; + myElement = element; + } + + @NotNull + @Override + public Icon getIcon() { + return Icons.ADVICE_ICON; + } + + @Override + public AnAction getClickAction() { + return new AnAction() { + @Override + public void actionPerformed(AnActionEvent e) { + myAction.invoke(myElement.getProject(), null, myElement.getContainingFile()); + } + }; + } + + @Override + public String getTooltipText() { + return SIGNATURE_SHOULD_BE_POSSIBLY_CHANGED; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof MyGutterIconRenderer)) return false; + return true; + } + + @Override + public int hashCode() { + return 0; + } + } } From 265cc94620fbac5d9f598af70a33a3edda52d51b Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 20 Oct 2010 18:39:01 +0400 Subject: [PATCH 27/98] cs: do not track another project editors --- .../ChangeSignatureGestureDetector.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java index aa408f6ebadf..ab0c7fa92cdb 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java @@ -20,6 +20,7 @@ import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorBundle; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.actions.EditorActionUtil; @@ -50,11 +51,16 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme private final PsiDocumentManager myPsiDocumentManager; private final PsiManager myPsiManager; private final FileEditorManager myFileEditorManager; + private final Project myProject; - public ChangeSignatureGestureDetector(final PsiDocumentManager psiDocumentManager, final PsiManager psiManager, final FileEditorManager fileEditorManager) { + public ChangeSignatureGestureDetector(final PsiDocumentManager psiDocumentManager, + final PsiManager psiManager, + final FileEditorManager fileEditorManager, + final Project project) { myPsiDocumentManager = psiDocumentManager; myPsiManager = psiManager; myFileEditorManager = fileEditorManager; + myProject = project; } public static ChangeSignatureGestureDetector getInstance(Project project){ @@ -100,7 +106,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme public void projectOpened() { myPsiManager.addPsiTreeChangeListener(this); EditorFactory.getInstance().addEditorFactoryListener(this); - Disposer.register(myPsiManager.getProject(), new Disposable() { + Disposer.register(myProject, new Disposable() { public void dispose() { myPsiManager.removePsiTreeChangeListener(ChangeSignatureGestureDetector.this); EditorFactory.getInstance().removeEditorFactoryListener(ChangeSignatureGestureDetector.this); @@ -163,7 +169,9 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme @Override public void editorCreated(EditorFactoryEvent event) { - addDocListener(event.getEditor().getDocument()); + final Editor editor = event.getEditor(); + if (editor.getProject() != myProject) return; + addDocListener(editor.getDocument()); } public void addDocListener(Document document) { From 00395b0c646ad1ef59fabc6318f2c3b8258fc654 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 20 Oct 2010 18:49:58 +0400 Subject: [PATCH 28/98] IDEA-53116 Git: enabled show history for directories. --- .../git4idea/src/git4idea/history/GitHistoryProvider.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java index ffb214d116f6..1503d5acd310 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java @@ -89,9 +89,6 @@ public class GitHistoryProvider implements VcsHistoryProvider { */ @Nullable public VcsHistorySession createSessionFor(final FilePath filePath) throws VcsException { - if (filePath.isDirectory()) { - return null; - } List revisions = GitHistoryUtils.history(project, filePath); return createSession(filePath, revisions); } @@ -141,6 +138,6 @@ public class GitHistoryProvider implements VcsHistoryProvider { * {@inheritDoc} */ public boolean supportsHistoryForDirectories() { - return false; + return true; } } From 3f7c3a40effb68486f04a39a535cc523f41702f0 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 20 Oct 2010 18:53:31 +0400 Subject: [PATCH 29/98] cs: action name --- .../changeSignature/ChangeSignatureDetectorAction.java | 2 ++ .../changeSignature/ChangeSignatureGestureVisitor.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java index 94257a9281b5..99faade340d9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDetectorAction.java @@ -23,6 +23,7 @@ import com.intellij.openapi.util.Iconable; import com.intellij.psi.PsiFile; import com.intellij.util.Icons; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -33,6 +34,7 @@ import javax.swing.*; */ public class ChangeSignatureDetectorAction implements IntentionAction, Iconable { private static final Logger LOG = Logger.getInstance("#" + ChangeSignatureDetectorAction.class.getName()); + @NonNls public static final String CHANGE_SIGNATURE = "Change signature ..."; @NotNull @Override diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java index b7bdafb3de77..40bfd2fae9d0 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureVisitor.java @@ -112,7 +112,7 @@ public class ChangeSignatureGestureVisitor implements HighlightVisitor { @Override public String getTooltipText() { - return SIGNATURE_SHOULD_BE_POSSIBLY_CHANGED; + return ChangeSignatureDetectorAction.CHANGE_SIGNATURE; } @Override From 31db6781ba929679a47dd49ddd49b61c9c7ec90f Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Wed, 20 Oct 2010 19:41:18 +0400 Subject: [PATCH 30/98] options editor - preselection fix --- .../options/newEditor/OptionsEditor.java | 6 ++- .../options/newEditor/OptionsTree.java | 38 ++++++++++++------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java index a6f1f8b533fc..682e73f64b0e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java @@ -319,7 +319,11 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat checkModified(oldConfigurable); checkModified(configurable); - result.setDone(); + if (myTree.myBuilder.getSelectedElements().size() == 0) { + select(configurable.getClass()).notify(result); + } else { + result.setDone(); + } } }); } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java index 7f6c662dde0a..5b015306d0d5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java @@ -181,21 +181,26 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl myContext.fireSelected(null, OptionsTree.this); } else { - final EditorNode editorNode = myConfigurable2Node.get(configurable); - FilteringTreeStructure.Node editorUiNode = myBuilder.getVisibleNodeFor(editorNode); - if (!myBuilder.getSelectedElements().contains(editorUiNode)) { - myBuilder.select(editorUiNode, new Runnable() { - public void run() { - fireSelected(configurable, callback); + myBuilder.getReady(this).doWhenDone(new Runnable() { + @Override + public void run() { + final EditorNode editorNode = myConfigurable2Node.get(configurable); + FilteringTreeStructure.Node editorUiNode = myBuilder.getVisibleNodeFor(editorNode); + if (!myBuilder.getSelectedElements().contains(editorUiNode)) { + myBuilder.select(editorUiNode, new Runnable() { + public void run() { + fireSelected(configurable, callback); + } + }); + } else { + myBuilder.scrollSelectionToVisible(new Runnable() { + public void run() { + fireSelected(configurable, callback); + } + }, false); } - }); - } else { - myBuilder.scrollSelectionToVisible(new Runnable() { - public void run() { - fireSelected(configurable, callback); - } - }, false); - } + } + }); } } @@ -747,6 +752,11 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl return myContext.isHoldingFilter(); } + @Override + public boolean isToEnsureSelectionOnFocusGained() { + return false; + } + @Override protected ActionCallback refilterNow(Object preferredSelection, boolean adjustSelection) { final List toRestore = new ArrayList(); From 40d845debf2b7655f55d22b66e560e0a21b1fca9 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 18:38:53 +0400 Subject: [PATCH 31/98] language filter for Goto Class and Goto Symbol (IDEA-55779) --- .../intellij/ide/actions/GotoClassAction.java | 9 +- .../intellij/ide/actions/GotoFileAction.java | 266 +++--------------- .../ide/actions/GotoSymbolAction.java | 16 +- .../util/gotoByName/ChooseByNameFilter.java | 232 +++++++++++++++ .../ChooseByNameFilterConfiguration.java} | 55 ++-- .../ChooseByNameLanguageFilter.java | 67 +++++ .../util/gotoByName/FilteringGotoByModel.java | 67 +++++ .../ide/util/gotoByName/GotoClassModel2.java | 9 +- .../GotoClassSymbolConfiguration.java | 41 +++ .../gotoByName/GotoFileConfiguration.java | 50 ++++ .../ide/util/gotoByName/GotoFileModel.java | 33 +-- .../ide/util/gotoByName/GotoSymbolModel2.java | 9 +- .../src/META-INF/LangExtensions.xml | 6 +- 13 files changed, 561 insertions(+), 299 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java rename platform/lang-impl/src/com/intellij/ide/{actions/GotoFileConfiguration.java => util/gotoByName/ChooseByNameFilterConfiguration.java} (57%) create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameLanguageFilter.java create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/FilteringGotoByModel.java create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java create mode 100644 platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java index f1e6fd233bad..6842dec2b59f 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java @@ -18,9 +18,7 @@ package com.intellij.ide.actions; import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.featureStatistics.FeatureUsageTracker; -import com.intellij.ide.util.gotoByName.ChooseByNamePopup; -import com.intellij.ide.util.gotoByName.ChooseByNamePopupComponent; -import com.intellij.ide.util.gotoByName.GotoClassModel2; +import com.intellij.ide.util.gotoByName.*; import com.intellij.navigation.ChooseByNameRegistry; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -48,13 +46,16 @@ public class GotoClassAction extends GotoActionBase implements DumbAware { FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.popup.class"); PsiDocumentManager.getInstance(project).commitAllDocuments(); - final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, new GotoClassModel2(project), getPsiContext(e)); + final GotoClassModel2 model = new GotoClassModel2(project); + final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, model, getPsiContext(e)); + final ChooseByNameFilter filterUI = new ChooseByNameLanguageFilter(popup, model, GotoClassSymbolConfiguration.getInstance(project), project); popup.invoke(new ChooseByNamePopupComponent.Callback() { public void onClose() { if (GotoClassAction.class.equals(myInAction)) { myInAction = null; } + filterUI.close(); } public void elementChosen(Object element) { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java index 2fef0eea8c47..cf88f30a8c31 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java @@ -17,11 +17,9 @@ package com.intellij.ide.actions; import com.intellij.featureStatistics.FeatureUsageTracker; -import com.intellij.ide.util.ElementsChooser; -import com.intellij.ide.util.gotoByName.ChooseByNamePopup; -import com.intellij.ide.util.gotoByName.ChooseByNamePopupComponent; -import com.intellij.ide.util.gotoByName.GotoFileModel; -import com.intellij.openapi.actionSystem.*; +import com.intellij.ide.util.gotoByName.*; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.fileEditor.OpenFileDescriptor; @@ -29,21 +27,11 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.popup.JBPopup; -import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.ui.popup.JBPopupListener; -import com.intellij.openapi.ui.popup.LightweightWindowEvent; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiFile; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.NotNull; import javax.swing.*; -import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -63,7 +51,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware { final Project project = e.getData(PlatformDataKeys.PROJECT); final GotoFileModel gotoFileModel = new GotoFileModel(project); final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, gotoFileModel, getPsiContext(e)); - final FilterUI filterUI = new FilterUI(popup, gotoFileModel, project); + final ChooseByNameFilter filterUI = new GotoFileFilter(popup, gotoFileModel, project); popup.invoke(new ChooseByNamePopupComponent.Callback() { public void onClose() { if (GotoFileAction.class.equals(myInAction)) { @@ -88,227 +76,61 @@ public class GotoFileAction extends GotoActionBase implements DumbAware { }, ModalityState.current(), true); } - /** - * This class contains UI related to filtering functionality. - */ - private static class FilterUI { - /** - * an icon to use - */ - private static final Icon FILTER_ICON = IconLoader.getIcon("/icons/inspector/useFilter.png"); - /** - * a parent popup - */ - final ChooseByNamePopup myParentPopup; - /** - * action toolbar - */ - final ActionToolbar myToolbar; - /** - * a file type chooser, only one instance is used - */ - final ElementsChooser myChooser; - /** - * A panel that contains chooser - */ - final JPanel myChooserPanel; - /** - * a file type popup, the value is non-null if popup is active - */ - JBPopup myPopup; - /** - * a project to use. The project is used for dimension service. - */ - final Project myProject; - - /** - * A constuctor - * - * @param popup a parent popup - * @param gotoFileModel a model for popup - * @param project a context project - */ - FilterUI(final ChooseByNamePopup popup, final GotoFileModel gotoFileModel, final Project project) { - myParentPopup = popup; - DefaultActionGroup actionGroup = new DefaultActionGroup("go.to.file.filter", false); - ToggleAction action = new ToggleAction("Filter", "Filter files by type", FILTER_ICON) { - public boolean isSelected(final AnActionEvent e) { - return myPopup != null; - } - - public void setSelected(final AnActionEvent e, final boolean state) { - if (state) { - createPopup(); - } - else { - close(); - } - } - }; - actionGroup.add(action); - myToolbar = ActionManager.getInstance().createActionToolbar("gotfile.filter", actionGroup, true); - myToolbar.setLayoutPolicy(ActionToolbar.NOWRAP_LAYOUT_POLICY); - myToolbar.updateActionsImmediately(); - myToolbar.getComponent().setFocusable(false); - myToolbar.getComponent().setBorder(null); - myProject = project; - myChooser = createFileTypeChooser(gotoFileModel); - myChooserPanel = createChooserPanel(); - popup.setToolArea(myToolbar.getComponent()); + protected static class GotoFileFilter extends ChooseByNameFilter { + GotoFileFilter(final ChooseByNamePopup popup, GotoFileModel model, final Project project) { + super(popup, model, GotoFileConfiguration.getInstance(project), project); } - /** - * @return a panel with chooser and buttons - */ - private JPanel createChooserPanel() { - JPanel panel = new JPanel(); - panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); - panel.add(myChooser); - JPanel buttons = new JPanel(); - JButton all = new JButton("All"); - all.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent e) { - myChooser.setAllElementsMarked(true); - } - }); - buttons.add(all); - JButton none = new JButton("None"); - none.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent e) { - myChooser.setAllElementsMarked(false); - } - }); - buttons.add(none); - JButton invert = new JButton("Invert"); - invert.addActionListener(new ActionListener() { - public void actionPerformed(final ActionEvent e) { - final int count = myChooser.getElementCount(); - for (int i = 0; i < count; i++) { - FileType type = myChooser.getElementAt(i); - myChooser.setElementMarked(type, !myChooser.isElementMarked(type)); - } - } - }); - buttons.add(invert); - panel.add(buttons); - return panel; - } - - /** - * Create a file type chooser - * - * @param gotoFileModel a model to update - * @return a created file chooser - */ - private ElementsChooser createFileTypeChooser(final GotoFileModel gotoFileModel) { + protected List getAllFilterValues() { List elements = new ArrayList(); ContainerUtil.addAll(elements, FileTypeManager.getInstance().getRegisteredFileTypes()); Collections.sort(elements, FileTypeComparator.INSTANCE); - final ElementsChooser chooser = new ElementsChooser(elements, true) { - @Override - protected String getItemText(@NotNull final FileType value) { - return value.getName(); - } - - @Override - protected Icon getItemIcon(final FileType value) { - return value.getIcon(); - } - }; - chooser.setFocusable(false); - final GotoFileConfiguration config = GotoFileConfiguration.getInstance(myProject); - final int count = chooser.getElementCount(); - for (int i = 0; i < count; i++) { - FileType type = chooser.getElementAt(i); - if (!DumbService.getInstance(myProject).isDumb() && !config.isFileTypeVisible(type)) { - chooser.setElementMarked(type, false); - } - } - updateModel(gotoFileModel, chooser); - chooser.addElementsMarkListener(new ElementsChooser.ElementsMarkListener() { - public void elementMarkChanged(final FileType element, final boolean isMarked) { - config.setFileTypeVisible(element, isMarked); - updateModel(gotoFileModel, chooser); - } - }); - return chooser; + return elements; } - /** - * Update model basing on the chooser state - * - * @param gotoFileModel a model - * @param chooser a file type chooser - */ - private void updateModel(final GotoFileModel gotoFileModel, ElementsChooser chooser) { - final List markedElements = chooser.getMarkedElements(); - gotoFileModel.setFileTypes(markedElements.toArray(new FileType[markedElements.size()])); - myParentPopup.rebuildList(); + protected String textForFilterValue(FileType value) { + return value.getName(); } - - /** - * Create and show popup - */ - private void createPopup() { - if (myPopup != null) { - return; - } - myPopup = JBPopupFactory.getInstance().createComponentPopupBuilder(myChooserPanel, myChooser).setModalContext(false).setFocusable(false) - .setResizable(true).setCancelOnClickOutside(false).setMinSize(new Dimension(200, 200)) - .setDimensionServiceKey(myProject, "GotoFile_FileTypePopup", false).createPopup(); - myPopup.addListener(new JBPopupListener.Adapter() { - public void onClosed(LightweightWindowEvent event) { - myPopup = null; - } - }); - myPopup.showUnderneathOf(myToolbar.getComponent()); + protected Icon iconForFilterValue(FileType value) { + return value.getIcon(); } + } + + /** + * A file type comparator. The comparison rules are applied in the following order. + *
    + *
  1. Unknown file type is greatest.
    2. + *
  2. Text files are less then binary ones.
    3. + *
  3. File type with greater name is greater (case is ignored).
    4. + *
+ */ + static class FileTypeComparator implements Comparator { + /** + * an instance of comparator + */ + static final Comparator INSTANCE = new FileTypeComparator(); /** - * close the file type filter + * {@inheritDoc} */ - public void close() { - if (myPopup != null) { - myPopup.dispose(); + public int compare(final FileType o1, final FileType o2) { + if (o1 == o2) { + return 0; } - } - - /** - * A file type comparator. The comparison rules are applied in the following order. - *
    - *
  1. Unknown file type is greatest.
    2. - *
  2. Text files are less then binary ones.
    3. - *
  3. File type with greater name is greater (case is ignored).
    4. - *
- */ - static class FileTypeComparator implements Comparator { - /** - * an instance of comparator - */ - static final Comparator INSTANCE = new FileTypeComparator(); - - /** - * {@inheritDoc} - */ - public int compare(final FileType o1, final FileType o2) { - if (o1 == o2) { - return 0; - } - if (o1 == FileTypes.UNKNOWN) { - return 1; - } - if (o2 == FileTypes.UNKNOWN) { - return -1; - } - if (o1.isBinary() && !o2.isBinary()) { - return 1; - } - if (!o1.isBinary() && o2.isBinary()) { - return -1; - } - return o1.getName().compareToIgnoreCase(o2.getName()); + if (o1 == FileTypes.UNKNOWN) { + return 1; } + if (o2 == FileTypes.UNKNOWN) { + return -1; + } + if (o1.isBinary() && !o2.isBinary()) { + return 1; + } + if (!o1.isBinary() && o2.isBinary()) { + return -1; + } + return o1.getName().compareToIgnoreCase(o2.getName()); } } } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java index 347da16a37a4..26a68ae23cb3 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java @@ -17,9 +17,7 @@ package com.intellij.ide.actions; import com.intellij.featureStatistics.FeatureUsageTracker; -import com.intellij.ide.util.gotoByName.ChooseByNamePopup; -import com.intellij.ide.util.gotoByName.ChooseByNamePopupComponent; -import com.intellij.ide.util.gotoByName.GotoSymbolModel2; +import com.intellij.ide.util.gotoByName.*; import com.intellij.navigation.NavigationItem; import com.intellij.navigation.ChooseByNameRegistry; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -37,14 +35,18 @@ public class GotoSymbolAction extends GotoActionBase { PsiDocumentManager.getInstance(project).commitAllDocuments(); - final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, new GotoSymbolModel2(project), getPsiContext(e)); + final GotoSymbolModel2 model = new GotoSymbolModel2(project); + final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, model, getPsiContext(e)); + final ChooseByNameFilter filterUI = new ChooseByNameLanguageFilter(popup, model, GotoClassSymbolConfiguration.getInstance(project), + project); popup.invoke(new ChooseByNamePopupComponent.Callback() { - public void onClose () - { - if (GotoSymbolAction.class.equals (myInAction)) { + public void onClose() { + if (GotoSymbolAction.class.equals(myInAction)) { myInAction = null; } + filterUI.close(); } + public void elementChosen(Object element) { ((NavigationItem)element).navigate(true); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java new file mode 100644 index 000000000000..fe5feb4ff8de --- /dev/null +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java @@ -0,0 +1,232 @@ +/* + * Copyright 2000-2010 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 com.intellij.ide.util.gotoByName; + +import com.intellij.ide.util.ElementsChooser; +import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.project.DumbService; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.popup.JBPopup; +import com.intellij.openapi.ui.popup.JBPopupFactory; +import com.intellij.openapi.ui.popup.JBPopupListener; +import com.intellij.openapi.ui.popup.LightweightWindowEvent; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.IconLoader; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * This class contains UI related to filtering functionality. + */ +public abstract class ChooseByNameFilter { + /** + * an icon to use + */ + private static final Icon FILTER_ICON = IconLoader.getIcon("/icons/inspector/useFilter.png"); + /** + * a parent popup + */ + final ChooseByNamePopup myParentPopup; + /** + * action toolbar + */ + final ActionToolbar myToolbar; + /** + * a file type chooser, only one instance is used + */ + final ElementsChooser myChooser; + /** + * A panel that contains chooser + */ + final JPanel myChooserPanel; + /** + * a file type popup, the value is non-null if popup is active + */ + JBPopup myPopup; + /** + * a project to use. The project is used for dimension service. + */ + final Project myProject; + + /** + * A constuctor + * + * @param popup a parent popup + * @param model a model for popup + * @param filterConfiguration storage for selected filter values + * @param project a context project + */ + public ChooseByNameFilter(final ChooseByNamePopup popup, FilteringGotoByModel model, ChooseByNameFilterConfiguration filterConfiguration, + final Project project) { + myParentPopup = popup; + DefaultActionGroup actionGroup = new DefaultActionGroup("go.to.file.filter", false); + ToggleAction action = new ToggleAction("Filter", "Filter files by type", FILTER_ICON) { + public boolean isSelected(final AnActionEvent e) { + return myPopup != null; + } + + public void setSelected(final AnActionEvent e, final boolean state) { + if (state) { + createPopup(); + } + else { + close(); + } + } + }; + actionGroup.add(action); + myToolbar = ActionManager.getInstance().createActionToolbar("gotfile.filter", actionGroup, true); + myToolbar.setLayoutPolicy(ActionToolbar.NOWRAP_LAYOUT_POLICY); + myToolbar.updateActionsImmediately(); + myToolbar.getComponent().setFocusable(false); + myToolbar.getComponent().setBorder(null); + myProject = project; + myChooser = createChooser(model, filterConfiguration); + myChooserPanel = createChooserPanel(); + popup.setToolArea(myToolbar.getComponent()); + } + + /** + * @return a panel with chooser and buttons + */ + private JPanel createChooserPanel() { + JPanel panel = new JPanel(); + panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); + panel.add(myChooser); + JPanel buttons = new JPanel(); + JButton all = new JButton("All"); + all.addActionListener(new ActionListener() { + public void actionPerformed(final ActionEvent e) { + myChooser.setAllElementsMarked(true); + } + }); + buttons.add(all); + JButton none = new JButton("None"); + none.addActionListener(new ActionListener() { + public void actionPerformed(final ActionEvent e) { + myChooser.setAllElementsMarked(false); + } + }); + buttons.add(none); + JButton invert = new JButton("Invert"); + invert.addActionListener(new ActionListener() { + public void actionPerformed(final ActionEvent e) { + final int count = myChooser.getElementCount(); + for (int i = 0; i < count; i++) { + T type = myChooser.getElementAt(i); + myChooser.setElementMarked(type, !myChooser.isElementMarked(type)); + } + } + }); + buttons.add(invert); + panel.add(buttons); + return panel; + } + + /** + * Create a file type chooser + * + * + * @param model a model to update + * @param filterConfiguration + * @return a created file chooser + */ + protected ElementsChooser createChooser(final FilteringGotoByModel model, final ChooseByNameFilterConfiguration filterConfiguration) { + List elements = new ArrayList(getAllFilterValues()); + final ElementsChooser chooser = new ElementsChooser(elements, true) { + @Override + protected String getItemText(@NotNull final T value) { + return textForFilterValue(value); + } + + @Override + protected Icon getItemIcon(final T value) { + return iconForFilterValue(value); + } + }; + chooser.setFocusable(false); + final int count = chooser.getElementCount(); + for (int i = 0; i < count; i++) { + T type = chooser.getElementAt(i); + if (!DumbService.getInstance(myProject).isDumb() && !filterConfiguration.isFileTypeVisible(type)) { + chooser.setElementMarked(type, false); + } + } + updateModel(model, chooser); + chooser.addElementsMarkListener(new ElementsChooser.ElementsMarkListener() { + public void elementMarkChanged(final T element, final boolean isMarked) { + filterConfiguration.setVisible(element, isMarked); + updateModel(model, chooser); + } + }); + return chooser; + + } + + protected abstract String textForFilterValue(T value); + + @Nullable + protected abstract Icon iconForFilterValue(T value); + + protected abstract Collection getAllFilterValues(); + + /** + * Update model basing on the chooser state + * + * @param gotoFileModel a model + * @param chooser a file type chooser + */ + protected void updateModel(final FilteringGotoByModel gotoFileModel, ElementsChooser chooser) { + final List markedElements = chooser.getMarkedElements(); + gotoFileModel.setFilterItems(markedElements); + myParentPopup.rebuildList(); + } + + /** + * Create and show popup + */ + private void createPopup() { + if (myPopup != null) { + return; + } + myPopup = JBPopupFactory.getInstance().createComponentPopupBuilder(myChooserPanel, myChooser).setModalContext(false).setFocusable(false) + .setResizable(true).setCancelOnClickOutside(false).setMinSize(new Dimension(200, 200)) + .setDimensionServiceKey(myProject, "GotoFile_FileTypePopup", false).createPopup(); + myPopup.addListener(new JBPopupListener.Adapter() { + public void onClosed(LightweightWindowEvent event) { + myPopup = null; + } + }); + myPopup.showUnderneathOf(myToolbar.getComponent()); + } + + /** + * close the file type filter + */ + public void close() { + if (myPopup != null) { + Disposer.dispose(myPopup); + } + } +} diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileConfiguration.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilterConfiguration.java similarity index 57% rename from platform/lang-impl/src/com/intellij/ide/actions/GotoFileConfiguration.java rename to platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilterConfiguration.java index 41e17dd377c3..bb5f5ef4f92f 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileConfiguration.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilterConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2010 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. @@ -13,15 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.ide.actions; +package com.intellij.ide.util.gotoByName; import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.State; -import com.intellij.openapi.components.Storage; -import com.intellij.openapi.components.ServiceManager; -import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.project.Project; import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Tag; @@ -29,33 +23,26 @@ import java.util.LinkedHashSet; import java.util.Set; /** - * Configuration for file type filtering popup in "Go to | File" action. - * - * @author Constantine.Plotnikov + * @author yole */ -@State( - name = "GotoFileConfiguration", - storages = {@Storage( - id = "other", - file = "$WORKSPACE_FILE$")}) -public class GotoFileConfiguration implements PersistentStateComponent { +public abstract class ChooseByNameFilterConfiguration implements PersistentStateComponent { /** * state object for the configuration */ - private FileTypes fileTypes = new FileTypes(); + private Items items = new Items(); /** * {@inheritDoc} */ - public FileTypes getState() { - return fileTypes; + public Items getState() { + return items; } /** * {@inheritDoc} */ - public void loadState(final FileTypes state) { - fileTypes = state; + public void loadState(final Items state) { + items = state; } /** @@ -64,39 +51,31 @@ public class GotoFileConfiguration implements PersistentStateComponent { + public ChooseByNameLanguageFilter(final ChooseByNamePopup popup, + FilteringGotoByModel languageFilteringGotoByModel, + ChooseByNameFilterConfiguration languageChooseByNameFilterConfiguration, + final Project project) { + super(popup, languageFilteringGotoByModel, languageChooseByNameFilterConfiguration, project); + } + + @Override + protected String textForFilterValue(Language value) { + return value.getDisplayName(); + } + + @Nullable + @Override + protected Icon iconForFilterValue(Language value) { + final LanguageFileType fileType = value.getAssociatedFileType(); + return fileType != null ? fileType.getIcon() : null; + } + + @Override + protected Collection getAllFilterValues() { + final Collection registeredLanguages = Language.getRegisteredLanguages(); + List accepted = new ArrayList(); + for (Language language : registeredLanguages) { + if (language != Language.ANY && !(language instanceof DependentLanguage)) { + accepted.add(language); + } + } + Collections.sort(accepted, new Comparator() { + @Override + public int compare(Language o1, Language o2) { + return o1.getDisplayName().compareTo(o2.getDisplayName()); + } + }); + return accepted; + } +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FilteringGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FilteringGotoByModel.java new file mode 100644 index 000000000000..a5f6d4ea9df8 --- /dev/null +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/FilteringGotoByModel.java @@ -0,0 +1,67 @@ +/* + * Copyright 2000-2010 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 com.intellij.ide.util.gotoByName; + +import com.intellij.navigation.ChooseByNameContributor; +import com.intellij.navigation.NavigationItem; +import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.Nullable; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +/** + * @author yole + */ +public abstract class FilteringGotoByModel extends ContributorsBasedGotoByModel { + /** current file types */ + private Set myFilterItems; + + protected FilteringGotoByModel(Project project, ChooseByNameContributor[] contributors) { + super(project, contributors); + } + + /** + * Set file types + * @param filterItems a file types to set + */ + public synchronized void setFilterItems(Collection filterItems) { + // get and set method are called from different threads + myFilterItems = new HashSet(filterItems); + } + + /** + * @return get file types + */ + protected synchronized Collection getFilterItems() { + // get and set method are called from different threads + return myFilterItems; + } + + @Override + protected boolean acceptItem(final NavigationItem item) { + T filterValue = filterValueFor(item); + if (filterValue != null) { + final Collection types = getFilterItems(); + return types == null || types.contains(filterValue); + } + return true; + } + + @Nullable + protected abstract T filterValueFor(NavigationItem item); +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java index 90f6d20e5db3..ba00a54753f3 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassModel2.java @@ -17,20 +17,27 @@ package com.intellij.ide.util.gotoByName; import com.intellij.ide.IdeBundle; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.lang.Language; import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.ChooseByNameRegistry; import com.intellij.navigation.GotoClassContributor; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.SystemInfo; +import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class GotoClassModel2 extends ContributorsBasedGotoByModel { +public class GotoClassModel2 extends FilteringGotoByModel { public GotoClassModel2(Project project) { super(project, ChooseByNameRegistry.getInstance().getClassModelContributors()); } + @Override + protected Language filterValueFor(NavigationItem item) { + return item instanceof PsiElement ? ((PsiElement) item).getLanguage() : null; + } + @Nullable public String getPromptText() { return IdeBundle.message("prompt.gotoclass.enter.class.name"); diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java new file mode 100644 index 000000000000..e6ca7cd1e29e --- /dev/null +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoClassSymbolConfiguration.java @@ -0,0 +1,41 @@ +/* + * Copyright 2000-2010 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 com.intellij.ide.util.gotoByName; + +import com.intellij.lang.Language; +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.project.Project; + +/** + * @author yole + */ +@State( + name = "GotoFileConfiguration", + storages = {@Storage( + id = "other", + file = "$WORKSPACE_FILE$")}) +public class GotoClassSymbolConfiguration extends ChooseByNameFilterConfiguration { + public static GotoClassSymbolConfiguration getInstance(Project project) { + return ServiceManager.getService(project, GotoClassSymbolConfiguration.class); + } + + @Override + protected String nameForElement(Language type) { + return type.getID(); + } +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java new file mode 100644 index 000000000000..2e543dc148aa --- /dev/null +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileConfiguration.java @@ -0,0 +1,50 @@ +/* + * Copyright 2000-2009 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 com.intellij.ide.util.gotoByName; + +import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.components.State; +import com.intellij.openapi.components.Storage; +import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.project.Project; + +/** + * Configuration for file type filtering popup in "Go to | File" action. + * + * @author Constantine.Plotnikov + */ +@State( + name = "GotoFileConfiguration", + storages = {@Storage( + id = "other", + file = "$WORKSPACE_FILE$")}) +public class GotoFileConfiguration extends ChooseByNameFilterConfiguration { + /** + * Get configuration instance + * + * @param project a project instance + * @return a configuration instance + */ + public static GotoFileConfiguration getInstance(Project project) { + return ServiceManager.getService(project, GotoFileConfiguration.class); + } + + @Override + protected String nameForElement(FileType type) { + return type.getName(); + } +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java index b0f23436c123..da5e00d7a55d 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileModel.java @@ -31,45 +31,24 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import java.util.Collection; /** * Model for "Go to | File" action */ -public class GotoFileModel extends ContributorsBasedGotoByModel{ +public class GotoFileModel extends FilteringGotoByModel { private final int myMaxSize; - /** current file types */ - private HashSet myFileTypes; public GotoFileModel(Project project) { super(project, Extensions.getExtensions(ChooseByNameContributor.FILE_EP_NAME)); myMaxSize = WindowManagerEx.getInstanceEx().getFrame(project).getSize().width; } - /** - * Set file types - * @param fileTypes a file types to set - */ - public synchronized void setFileTypes(FileType[] fileTypes) { - // get and set method are called from different threads - myFileTypes = new HashSet(Arrays.asList(fileTypes)); - } - - /** - * @return get file types - */ - private synchronized Set getFileTypes() { - // get and set method are called from different threads - return myFileTypes; - } - @Override protected boolean acceptItem(final NavigationItem item) { if (item instanceof PsiFile) { final PsiFile file = (PsiFile)item; - final Set types = getFileTypes(); + final Collection types = getFilterItems(); // if language substitutors are used, PsiFile.getFileType() can be different from // PsiFile.getVirtualFile().getFileType() if (types != null) { @@ -85,6 +64,12 @@ public class GotoFileModel extends ContributorsBasedGotoByModel{ } } + @Nullable + @Override + protected FileType filterValueFor(NavigationItem item) { + return item instanceof PsiFile ? ((PsiFile) item).getFileType() : null; + } + public String getPromptText() { return IdeBundle.message("prompt.gotofile.enter.file.name"); } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java index f7244901207d..1fe4708146f3 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java @@ -16,18 +16,25 @@ package com.intellij.ide.util.gotoByName; import com.intellij.ide.IdeBundle; +import com.intellij.lang.Language; import com.intellij.navigation.ChooseByNameRegistry; +import com.intellij.navigation.NavigationItem; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.SystemInfo; import com.intellij.psi.PsiElement; import com.intellij.psi.presentation.java.SymbolPresentationUtil; import org.jetbrains.annotations.NotNull; -public class GotoSymbolModel2 extends ContributorsBasedGotoByModel { +public class GotoSymbolModel2 extends FilteringGotoByModel { public GotoSymbolModel2(Project project) { super(project, ChooseByNameRegistry.getInstance().getSymbolModelContributors()); } + @Override + protected Language filterValueFor(NavigationItem item) { + return item instanceof PsiElement ? ((PsiElement) item).getLanguage() : null; + } + public String getPromptText() { return IdeBundle.message("prompt.gotosymbol.enter.symbol.name"); } diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index ff5b7a9cd749..2713d389dd7a 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -227,8 +227,10 @@ - + + From 057caf81408997ab635acef883a21aa54ac7df90 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:08:43 +0400 Subject: [PATCH 32/98] expand/collapse all in structure view (IDEA-14063) --- .../newStructureView/StructureViewComponent.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java index 697f617f61a5..3e15f4b0eb3d 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java @@ -19,7 +19,6 @@ package com.intellij.ide.structureView.newStructureView; import com.intellij.ide.CopyPasteDelegator; import com.intellij.ide.DataManager; import com.intellij.ide.PsiCopyPasteManager; -import com.intellij.ide.actions.ContextHelpAction; import com.intellij.ide.structureView.*; import com.intellij.ide.structureView.impl.StructureViewFactoryImpl; import com.intellij.ide.structureView.impl.StructureViewState; @@ -50,6 +49,8 @@ import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TreeSpeedSearch; import com.intellij.ui.treeStructure.Tree; +import com.intellij.ui.treeStructure.actions.CollapseAllAction; +import com.intellij.ui.treeStructure.actions.ExpandAllAction; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; import com.intellij.util.EditSourceOnDoubleClickHandler; @@ -384,14 +385,14 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre result.add(new TreeActionWrapper(filter, this)); } + result.add(new ExpandAllAction(getTree())); + result.add(new CollapseAllAction(getTree())); if (showScrollToFromSourceActions()) { result.addSeparator(); result.add(myAutoScrollToSourceHandler.createToggleAction()); result.add(myAutoScrollFromSourceHandler.createToggleAction()); } - result.addSeparator(); - result.add(new ContextHelpAction(getHelpID())); return result; } @@ -707,7 +708,7 @@ public class StructureViewComponent extends SimpleToolWindowPanel implements Tre public void doUpdate() { assert ApplicationManager.getApplication().isUnitTestMode(); - ((StructureTreeBuilder)myAbstractTreeBuilder).addRootToUpdate(); + myAbstractTreeBuilder.addRootToUpdate(); } //todo [kirillk] dirty hack for discovering invalid psi elements, to delegate it to a proper place after 8.1 From e37a751d2f5928f6407f03352fd02b71d6175a68 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:14:56 +0400 Subject: [PATCH 33/98] show product major version in welcome tip (IDEA-59574) --- .../src/com/intellij/ide/util/TipPanel.java | 12 +----------- .../src/com/intellij/ide/util/TipUIUtil.java | 2 ++ resources-en/src/tips/Welcome.html | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java index 14fce215abec..2e99de9e1a55 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java @@ -183,8 +183,7 @@ public class TipPanel extends JPanel { myTipPaths.add(element.getAttributeValue(ATTRIBUTE_FILE)); } final ProductivityFeaturesProvider[] providers = ApplicationManager.getApplication().getComponents(ProductivityFeaturesProvider.class); - for (int i = 0; i < providers.length; i++) { - ProductivityFeaturesProvider provider = providers[i]; + for (ProductivityFeaturesProvider provider : providers) { final FeatureDescriptor[] featureDescriptors = provider.getFeatureDescriptors(); for (int j = 0; featureDescriptors != null && j < featureDescriptors.length; j++) { FeatureDescriptor featureDescriptor = featureDescriptors[j]; @@ -192,13 +191,4 @@ public class TipPanel extends JPanel { } } } - - public void initComponent() { - - } - - public void disposeComponent() { - - } - } diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java index 04a88241f66b..da9032e072fe 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java @@ -18,6 +18,7 @@ package com.intellij.ide.util; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.KeyboardShortcut; import com.intellij.openapi.actionSystem.Shortcut; +import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.keymap.KeymapUtil; @@ -62,6 +63,7 @@ public class TipUIUtil { StringBuffer text = new StringBuffer(ResourceUtil.loadText(url)); updateShortcuts(text); String replaced = text.toString().replace("&productName;", ApplicationNamesInfo.getInstance().getFullProductName()); + replaced = replaced.replace("&majorVersion;", ApplicationInfo.getInstance().getMajorVersion()); browser.read(new StringReader(replaced), null); final Document document = browser.getDocument(); if (document instanceof HTMLDocument) { diff --git a/resources-en/src/tips/Welcome.html b/resources-en/src/tips/Welcome.html index b0e03b34040c..5e0c440dfa2a 100644 --- a/resources-en/src/tips/Welcome.html +++ b/resources-en/src/tips/Welcome.html @@ -3,7 +3,7 @@
Welcome to IntelliJ - IDEA 9 + IDEA &majorVersion;

You can quickly get familiar with the main features of the IDE by reading these tips. You may try out the features described in the tips while this dialog stays open on the screen. If you close the dialog, you can always get back to it from the Help | Tip of the Day From d229d974bc6de72283b94bdd091931f621729c25 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:18:56 +0400 Subject: [PATCH 34/98] reveal -> show (IDEA-57247) --- .../src/com/intellij/ide/actions/RevealFileAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RevealFileAction.java b/platform/platform-impl/src/com/intellij/ide/actions/RevealFileAction.java index 794838e465a2..a4c7519bd154 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/RevealFileAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/RevealFileAction.java @@ -31,7 +31,7 @@ public class RevealFileAction extends AnAction { if (file != null && file.isInLocalFileSystem()) { if (SystemInfo.isMac) { - e.getPresentation().setText("Reveal in Finder"); + e.getPresentation().setText("Show in Finder"); } else { e.getPresentation().setText("Show in Explorer"); } From eeb8b210367112d632a6db04af80ed814eef0f65 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:35:13 +0400 Subject: [PATCH 35/98] add xpath to community-main dependency --- community-main.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/community-main.iml b/community-main.iml index 4957741c816a..e984246e74c7 100644 --- a/community-main.iml +++ b/community-main.iml @@ -76,6 +76,7 @@ + From c98e9d5f384d0ebe4a448ce3666f89b4884f8fbb Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:37:50 +0400 Subject: [PATCH 36/98] add xpath to CE layout (IDEA-54285) --- build/scripts/layouts.gant | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index aa04a6162433..587e5e8a14a7 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -269,6 +269,17 @@ def layoutFull(String home, String targetDirectory) { } + dir("xpath") { + dir("lib") { + jar("xpath.jar") {noResources("xpath")} + resources("xpath") + + dir("rt") { + jar("xslt-rt.jar") {module("xslt-rt")} + } + } + } + dir("Groovy") { dir("lib") { jar("Groovy.jar") { From 44890f69e81aff674f5ef3d546945b83cbd7f120 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 20 Oct 2010 19:48:54 +0400 Subject: [PATCH 37/98] "do not ask again" option for opening project in new window in platform IDEs (WI-3449) --- .../impl/ProjectNewWindowDoNotAskOption.java | 42 +++++++++++++++++++ .../com/intellij/ide/impl/ProjectUtil.java | 24 +---------- .../PlatformProjectOpenProcessor.java | 16 +++++-- 3 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 platform/platform-impl/src/com/intellij/ide/impl/ProjectNewWindowDoNotAskOption.java diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectNewWindowDoNotAskOption.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectNewWindowDoNotAskOption.java new file mode 100644 index 000000000000..dd0aebc01590 --- /dev/null +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectNewWindowDoNotAskOption.java @@ -0,0 +1,42 @@ +/* + * Copyright 2000-2010 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 com.intellij.ide.impl; + +import com.intellij.CommonBundle; +import com.intellij.ide.GeneralSettings; +import com.intellij.openapi.ui.DialogWrapper; + +public class ProjectNewWindowDoNotAskOption implements DialogWrapper.DoNotAskOption { + public boolean isToBeShown() { + return true; + } + + public void setToBeShown(boolean value, int exitCode) { + GeneralSettings.getInstance().setConfirmOpenNewProject(value || exitCode == 2 ? -1 : exitCode); + } + + public boolean canBeHidden() { + return true; + } + + public boolean shouldSaveOptionsOnCancel() { + return false; + } + + public String getDoNotShowMessage() { + return CommonBundle.message("dialog.options.do.not.ask"); + } +} diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index c7c32794d651..5171776260ef 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -29,7 +29,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ex.ProjectEx; import com.intellij.openapi.project.ex.ProjectManagerEx; -import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Disposer; @@ -156,27 +155,8 @@ public class ProjectUtil { if (settings.getConfirmOpenNewProject() < 0) { exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), - CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), new DialogWrapper.DoNotAskOption() { - public boolean isToBeShown() { - return true; - } - - public void setToBeShown(boolean value, int exitCode) { - settings.setConfirmOpenNewProject(value || exitCode == 2 ? -1 : exitCode); - } - - public boolean canBeHidden() { - return true; - } - - public boolean shouldSaveOptionsOnCancel() { - return false; - } - - public String getDoNotShowMessage() { - return CommonBundle.message("dialog.options.do.not.ask"); - } - }); + CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), + new ProjectNewWindowDoNotAskOption()); } else { exitCode = settings.getConfirmOpenNewProject(); } diff --git a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java index 196fd6b82105..83e9f56b4285 100644 --- a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java +++ b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java @@ -16,7 +16,9 @@ package com.intellij.platform; import com.intellij.CommonBundle; +import com.intellij.ide.GeneralSettings; import com.intellij.ide.IdeBundle; +import com.intellij.ide.impl.ProjectNewWindowDoNotAskOption; import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; @@ -76,9 +78,17 @@ public class PlatformProjectOpenProcessor extends ProjectOpenProcessor { Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); if (!forceOpenInNewFrame && openProjects.length > 0) { - int exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), - new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), - CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon()); + final GeneralSettings settings = GeneralSettings.getInstance(); + int exitCode; + if (settings.getConfirmOpenNewProject() < 0) { + exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), + new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), + CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), + new ProjectNewWindowDoNotAskOption()); + } + else { + exitCode = settings.getConfirmOpenNewProject(); + } if (exitCode == 1) { // "No" option if (!ProjectUtil.closeProject(projectToClose != null ? projectToClose : openProjects[openProjects.length - 1])) return null; } From bda97cb6dbd01e13bc8dfc86bc9e903d4f5b38de Mon Sep 17 00:00:00 2001 From: Yann Cebron Date: Wed, 20 Oct 2010 18:08:51 +0200 Subject: [PATCH 38/98] appearance settings: fix layout for checkbox "disable mnemonics in menu" --- .../platform-impl/src/com/intellij/ide/ui/AppearancePanel.form | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form index 8b17306affa1..2d864aa94279 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearancePanel.form @@ -3,7 +3,7 @@ - + @@ -260,6 +260,7 @@ + From 552cea31504572e1859762b070bcb8821627222e Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 20 Oct 2010 18:40:53 +0400 Subject: [PATCH 39/98] fix lookup memory leaks --- .../CompletionAutoPopupHandler.java | 177 ++++++++++-------- 1 file changed, 100 insertions(+), 77 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java index b64f97136848..1635c1477f0b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java @@ -35,8 +35,10 @@ import com.intellij.openapi.fileEditor.FileEditorManagerEvent; import com.intellij.openapi.fileEditor.FileEditorManagerListener; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Key; import com.intellij.psi.PsiFile; import com.intellij.util.messages.MessageBusConnection; +import org.jetbrains.annotations.Nullable; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -45,9 +47,8 @@ import java.beans.PropertyChangeListener; * @author peter */ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { + private static final Key STATE_KEY = Key.create("AutopopupSTATE_KEY"); public static boolean ourTestingAutopopup = false; - private boolean myAutopopupShown; - private boolean myGuard; @Override public Result beforeCharTyped(char c, @@ -55,13 +56,14 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { Editor editor, PsiFile file, FileType fileType) { - if (myAutopopupShown && LookupManager.getActiveLookup(editor) == null) { - myGuard = true; + final AutoPopupState state = getAutoPopupState(editor); + if (state != null && LookupManager.getActiveLookup(editor) == null) { + state.changeGuard = true; try { EditorModificationUtil.typeInStringAtCaretHonorBlockSelection(editor, String.valueOf(c), true); } finally { - myGuard = false; + state.changeGuard = false; } return Result.STOP; } @@ -78,7 +80,7 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { return Result.CONTINUE; } - if (myAutopopupShown || LookupManager.getActiveLookup(editor) != null) { + if (getAutoPopupState(editor) != null || LookupManager.getActiveLookup(editor) != null) { return Result.CONTINUE; } @@ -98,21 +100,25 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { new CodeCompletionHandlerBase(CompletionType.BASIC, false, false).invoke(project, editor); - myAutopopupShown = true; - trackUserActivity(project, editor); + final AutoPopupState state = new AutoPopupState(project, editor); + editor.putUserData(STATE_KEY, state); final Lookup lookup = LookupManager.getActiveLookup(editor); if (lookup != null) { lookup.addLookupListener(new LookupAdapter() { @Override public void itemSelected(LookupEvent event) { - myAutopopupShown = false; + final AutoPopupState state = getAutoPopupState(editor); + if (state != null) { + state.stopAutoPopup(); + } } @Override public void lookupCanceled(LookupEvent event) { - if (event.isCanceledExplicitly()) { - myAutopopupShown = false; + final AutoPopupState state = getAutoPopupState(editor); + if (event.isCanceledExplicitly() && state != null) { + state.stopAutoPopup(); } } }); @@ -127,82 +133,99 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate { return Result.STOP; } - private void trackUserActivity(Project project, final Editor editor) { - final MessageBusConnection connection = project.getMessageBus().connect(); - connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerAdapter() { - @Override - public void selectionChanged(FileEditorManagerEvent event) { - if (finishAutopopupCompletion(editor, false)) { - connection.disconnect(); - } - } - }); - - editor.addEditorMouseListener(new EditorMouseAdapter() { - @Override - public void mouseClicked(EditorMouseEvent e) { - if (finishAutopopupCompletion(editor, false)) { - editor.removeEditorMouseListener(this); - } - } - }); - - editor.getCaretModel().addCaretListener(new CaretListener() { - @Override - public void caretPositionChanged(CaretEvent e) { - if (finishAutopopupCompletion(editor, false)) { - editor.getCaretModel().removeCaretListener(this); - } - } - }); - - editor.getSelectionModel().addSelectionListener(new SelectionListener() { - @Override - public void selectionChanged(SelectionEvent e) { - if (finishAutopopupCompletion(editor, false)) { - editor.getSelectionModel().removeSelectionListener(this); - } - } - }); - - editor.getDocument().addDocumentListener(new DocumentAdapter() { - @Override - public void documentChanged(DocumentEvent e) { - if (finishAutopopupCompletion(editor, false)) { - editor.getDocument().removeDocumentListener(this); - } - } - }); - - final LookupManager lookupManager = LookupManager.getInstance(project); - lookupManager.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getNewValue() != null && finishAutopopupCompletion(editor, true)) { - lookupManager.removePropertyChangeListener(this); - } - } - }); + @Nullable + private static AutoPopupState getAutoPopupState(Editor editor) { + return editor.getUserData(STATE_KEY); } - private boolean finishAutopopupCompletion(Editor editor, boolean neglectLookup) { - if (!myAutopopupShown) { - return true; //to disconnect all the listeners - } - - if (myGuard) { - return false; + private static void finishAutopopupCompletion(Editor editor, boolean neglectLookup) { + final AutoPopupState state = getAutoPopupState(editor); + if (state == null || state.changeGuard) { + return; } if (!neglectLookup && LookupManager.getActiveLookup(editor) != null) { //the events during visible lookup period are handled separately - return false; + return; } - myAutopopupShown = false; final CompletionProgressIndicator currentCompletion = CompletionServiceImpl.getCompletionService().getCurrentCompletion(); if (currentCompletion != null) { currentCompletion.closeAndFinish(true); } - return true; + state.stopAutoPopup(); + } + + + private static class AutoPopupState { + final Editor editor; + final Project project; + final MessageBusConnection connection; + final EditorMouseAdapter mouseListener; + final CaretListener caretListener; + final DocumentAdapter documentListener; + final PropertyChangeListener lookupListener; + boolean changeGuard = false; + + private AutoPopupState(final Project project, final Editor editor) { + this.editor = editor; + this.project = project; + connection = project.getMessageBus().connect(); + connection.subscribe(FileEditorManagerListener.FILE_EDITOR_MANAGER, new FileEditorManagerAdapter() { + @Override + public void selectionChanged(FileEditorManagerEvent event) { + finishAutopopupCompletion(editor, false); + } + }); + + mouseListener = new EditorMouseAdapter() { + @Override + public void mouseClicked(EditorMouseEvent e) { + finishAutopopupCompletion(editor, false); + } + }; + + caretListener = new CaretListener() { + @Override + public void caretPositionChanged(CaretEvent e) { + finishAutopopupCompletion(editor, false); + } + }; + editor.getSelectionModel().addSelectionListener(new SelectionListener() { + @Override + public void selectionChanged(SelectionEvent e) { + finishAutopopupCompletion(editor, false); + } + }); + documentListener = new DocumentAdapter() { + @Override + public void documentChanged(DocumentEvent e) { + finishAutopopupCompletion(editor, false); + } + }; + lookupListener = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() != null) { + finishAutopopupCompletion(editor, true); + } + } + }; + + editor.addEditorMouseListener(mouseListener); + editor.getCaretModel().addCaretListener(caretListener); + editor.getDocument().addDocumentListener(documentListener); + LookupManager.getInstance(project).addPropertyChangeListener(lookupListener); + } + + void stopAutoPopup() { + connection.disconnect(); + editor.removeEditorMouseListener(mouseListener); + editor.getCaretModel().removeCaretListener(caretListener); + editor.getDocument().removeDocumentListener(documentListener); + LookupManager.getInstance(project).removePropertyChangeListener(lookupListener); + + editor.putUserData(STATE_KEY, null); + } + } } From fb59e6949211e642a2dccec9ecefe98dd3982301 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 20 Oct 2010 20:17:12 +0400 Subject: [PATCH 40/98] fix lookup leakage: don't call 'show' several times --- .../completion/CompletionProgressIndicator.java | 15 ++++++--------- .../codeInsight/lookup/impl/LookupImpl.java | 9 ++++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java index 573549ce4d06..d6405334494a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java @@ -76,7 +76,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement private final LookupImpl myLookup; private final MergingUpdateQueue myQueue; private boolean myDisposed; - private boolean myInitialized; + private boolean myShownLookup; private int myCount; private final Update myUpdate = new Update("update") { public void run() { @@ -124,6 +124,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement myLookup = lookup; myLookup.setArranger(new CompletionLookupArranger(parameters)); + myShownLookup = lookup.isReused(); myLookup.addLookupListener(myLookupListener); myLookup.setCalculating(true); @@ -133,7 +134,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement ApplicationManager.getApplication().assertIsDispatchThread(); registerItself(); - if (!ApplicationManager.getApplication().isUnitTestMode()) { + if (!ApplicationManager.getApplication().isUnitTestMode() && !lookup.isReused()) { scheduleAdvertising(); } @@ -194,7 +195,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement if (isOutdated()) { return; } - if (isAutopopupCompletion() && !myInitialized) { + if (isAutopopupCompletion() && !myShownLookup) { return; } if (!isBackgrounded()) { @@ -307,8 +308,8 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement ApplicationManager.getApplication().assertIsDispatchThread(); if (isOutdated()) return; - if (!myInitialized) { - myInitialized = true; + if (!myShownLookup) { + myShownLookup = true; if (StringUtil.isEmpty(myLookup.getAdvertisementText()) && !isAutopopupCompletion()) { final String text = DefaultCompletionContributor.getDefaultAdvertisementText(myParameters); @@ -536,10 +537,6 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement return aBoolean.booleanValue(); } - public boolean isInitialized() { - return myInitialized; - } - public void restorePrefix() { setMergeCommand(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index ea9adda1263e..eca5358afe30 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -88,6 +88,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { private final ArrayList myListeners = new ArrayList(); + private boolean myShown = false; private boolean myDisposed = false; private boolean myHidden = false; private LookupElement myPreselectedItem = EMPTY_LOOKUP_ITEM; @@ -569,7 +570,9 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { public void show(){ ApplicationManager.getApplication().assertIsDispatchThread(); - assert !myDisposed; + LOG.assertTrue(!myDisposed); + LOG.assertTrue(!myShown); + myShown = true; myEditor.getDocument().addDocumentListener(new DocumentAdapter() { public void documentChanged(DocumentEvent e) { @@ -973,6 +976,10 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { return myArranger; } + public boolean isReused() { + return myReused; + } + public void markReused() { myReused = true; myModel.clearItems(); From 45d7427b9140b9ad0354e69853bde3fbbfbb960f Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Tue, 19 Oct 2010 21:43:05 +0400 Subject: [PATCH 41/98] added manage.py path to django configuration (PY-1990) --- platform/util/src/com/intellij/openapi/util/io/FileUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index c6c1220ae681..75f136d73339 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -672,18 +672,22 @@ public class FileUtil { return candidate; } + @NotNull public static String toSystemDependentName(@NonNls @NotNull String aFileName) { return aFileName.replace('/', File.separatorChar).replace('\\', File.separatorChar); } + @NotNull public static String toSystemIndependentName(@NonNls @NotNull String aFileName) { return aFileName.replace('\\', '/'); } + @NotNull public static String nameToCompare(@NonNls @NotNull String name) { return (SystemInfo.isFileSystemCaseSensitive ? name : name.toLowerCase()).replace('\\', '/'); } + @NotNull public static String unquote(String urlString) { urlString = urlString.replace('/', File.separatorChar); return URLUtil.unescapePercentSequences(urlString); From 7eeef5748051c9d7fab03b5ee93f488468ddaec9 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 20 Oct 2010 22:35:59 +0400 Subject: [PATCH 42/98] lookup sorting now happens in the completion thread don't call Lookup.show several times: a correct way --- .../completion/CompletionLookupArranger.java | 7 +- .../CompletionProgressIndicator.java | 4 +- .../codeInsight/lookup/LookupArranger.java | 11 ++- .../codeInsight/lookup/impl/LookupImpl.java | 46 +++++------ .../codeInsight/lookup/impl/LookupModel.java | 79 +++++++++++++------ .../intellij/util/containers/SortedList.java | 77 +++++++++++------- 6 files changed, 136 insertions(+), 88 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java index 355f14a22bbf..80fc1cd5d096 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArranger.java @@ -30,7 +30,6 @@ import com.intellij.psi.statistics.StatisticsManager; import gnu.trove.THashMap; import gnu.trove.TObjectHashingStrategy; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -48,13 +47,13 @@ public class CompletionLookupArranger extends LookupArranger { } @Override - public void sortItems(List items) { - Collections.sort(items, new Comparator() { + public Comparator getItemComparator() { + return new Comparator() { public int compare(LookupElement o1, LookupElement o2) { //noinspection unchecked return getSortingWeight(o1).compareTo(getSortingWeight(o2)); } - }); + }; } public void itemSelected(LookupElement item, final Lookup lookup) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java index d6405334494a..c67416c58dda 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java @@ -124,7 +124,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement myLookup = lookup; myLookup.setArranger(new CompletionLookupArranger(parameters)); - myShownLookup = lookup.isReused(); + myShownLookup = lookup.isShown(); myLookup.addLookupListener(myLookupListener); myLookup.setCalculating(true); @@ -134,7 +134,7 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement ApplicationManager.getApplication().assertIsDispatchThread(); registerItself(); - if (!ApplicationManager.getApplication().isUnitTestMode() && !lookup.isReused()) { + if (!ApplicationManager.getApplication().isUnitTestMode() && !lookup.isShown()) { scheduleAdvertising(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupArranger.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupArranger.java index 55a03d437329..03578fca1dec 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupArranger.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupArranger.java @@ -16,6 +16,9 @@ package com.intellij.codeInsight.lookup; +import org.jetbrains.annotations.Nullable; + +import java.util.Comparator; import java.util.List; /** @@ -28,9 +31,6 @@ public abstract class LookupArranger { return 0; } - @Override - public void sortItems(List items) { - } }; public abstract Comparable getRelevance(LookupElement element); @@ -42,5 +42,8 @@ public abstract class LookupArranger { return 0; } - public abstract void sortItems(List items); + @Nullable + public Comparator getItemComparator() { + return null; //don't sort + } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index eca5358afe30..520d65ad1511 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -33,6 +33,7 @@ import com.intellij.openapi.editor.*; import com.intellij.openapi.editor.event.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; @@ -104,7 +105,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { private static final int LOOKUP_HEIGHT = Integer.getInteger("idea.lookup.height", 11).intValue(); private boolean myReused; private boolean myChangeGuard; - private LookupModel myModel = new LookupModel(this); + private LookupModel myModel = new LookupModel(); public LookupImpl(Project project, Editor editor, @NotNull LookupArranger arranger){ super(new JPanel(new BorderLayout())); @@ -144,6 +145,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { public void setArranger(LookupArranger arranger) { myArranger = arranger; + myModel.setArranger(arranger); } public boolean isFocused() { @@ -266,29 +268,15 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { if (!ApplicationManager.getApplication().isUnitTestMode()) { ApplicationManager.getApplication().assertIsDispatchThread(); } - final List items = myModel.getSortedItems(); - SortedMap> itemsMap = new TreeMap>(); - int minPrefixLength = items.isEmpty() ? 0 : Integer.MAX_VALUE; - for (final LookupElement item : items) { - minPrefixLength = Math.min(item.getPrefixMatcher().getPrefix().length(), minPrefixLength); - - final Comparable relevance = myArranger.getRelevance(item); - List list = itemsMap.get(relevance); - if (list == null) { - itemsMap.put(relevance, list = new ArrayList()); - } - list.add(item); - } if (myReused) { myModel.collectGarbage(); myReused = false; } - if (myMinPrefixLength != minPrefixLength) { - myLookupStartMarker = null; - } - myMinPrefixLength = minPrefixLength; + final Pair,List>> snapshot = myModel.getModelSnapshot(); + final List items = snapshot.first; + checkMinPrefixLengthChanges(items); LookupElement oldSelected = mySelectionTouched ? (LookupElement)myList.getSelectedValue() : null; String oldInvariant = mySelectionInvariant; @@ -303,7 +291,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { Set firstItems = new THashSet(); hasExactPrefixes = addExactPrefixItems(model, firstItems, items); - addMostRelevantItems(model, firstItems, itemsMap.values()); + addMostRelevantItems(model, firstItems, snapshot.second); hasPreselectedItem = addPreselectedItem(model, firstItems, preselectedItem); myPreferredItemsCount = firstItems.size(); @@ -335,6 +323,18 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { } } + private void checkMinPrefixLengthChanges(List items) { + int minPrefixLength = items.isEmpty() ? 0 : Integer.MAX_VALUE; + for (final LookupElement item : items) { + minPrefixLength = Math.min(item.getPrefixMatcher().getPrefix().length(), minPrefixLength); + } + + if (myMinPrefixLength != minPrefixLength) { + myLookupStartMarker = null; + } + myMinPrefixLength = minPrefixLength; + } + private void restoreSelection(@Nullable LookupElement oldSelected, boolean choosePreselectedItem, @Nullable String oldInvariant) { if (oldSelected != null) { if (oldSelected.isValid() && ListScrollingUtil.selectItem(myList, oldSelected)) { @@ -568,6 +568,10 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { } } + public boolean isShown() { + return myShown; + } + public void show(){ ApplicationManager.getApplication().assertIsDispatchThread(); LOG.assertTrue(!myDisposed); @@ -976,10 +980,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { return myArranger; } - public boolean isReused() { - return myReused; - } - public void markReused() { myReused = true; myModel.clearItems(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java index c51a6ef90403..438179e37a0c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java @@ -15,13 +15,17 @@ */ package com.intellij.codeInsight.lookup.impl; +import com.intellij.codeInsight.lookup.LookupArranger; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementAction; import com.intellij.codeInsight.lookup.LookupElementPresentation; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Pair; +import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.SortedList; import gnu.trove.THashMap; import gnu.trove.TObjectHashingStrategy; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import java.util.*; @@ -30,16 +34,20 @@ import java.util.*; * @author peter */ public class LookupModel { + private static final Comparator COMMUNISM = new Comparator() { + @SuppressWarnings({"ComparatorMethodParameterNotUsed"}) + @Override + public int compare(LookupElement o1, LookupElement o2) { + return 0; + } + }; private final Object lock = new Object(); @SuppressWarnings({"unchecked"}) private final Map> myItemActions = new THashMap>(TObjectHashingStrategy.IDENTITY); @SuppressWarnings({"unchecked"}) private final Map myItemPresentations = new THashMap(TObjectHashingStrategy.IDENTITY); private final List myItems = new ArrayList(); - @Nullable private List mySortedItems; - private final LookupImpl myLookup; - - public LookupModel(LookupImpl lookup) { - myLookup = lookup; - } + private SortedList mySortedItems; + private TreeMap> myRelevanceGroups; + private LookupArranger myArranger; @TestOnly public List getItems() { @@ -49,14 +57,22 @@ public class LookupModel { public void clearItems() { synchronized (lock) { myItems.clear(); - mySortedItems = null; + mySortedItems.clear(); + myRelevanceGroups.clear(); } } public void addItem(LookupElement item) { synchronized (lock) { myItems.add(item); - mySortedItems = null; + mySortedItems.add(item); + + final Comparable relevance = myArranger.getRelevance(item); + SortedList group = myRelevanceGroups.get(relevance); + if (group == null) { + myRelevanceGroups.put(relevance, group = new SortedList(mySortedItems.getComparator())); + } + group.add(item); } } @@ -87,19 +103,19 @@ public class LookupModel { } } - @NotNull - public List getSortedItems() { + public Pair, List>> getModelSnapshot() { synchronized (lock) { - List sortedItems = mySortedItems; - if (sortedItems == null) { - myLookup.getArranger().sortItems(sortedItems = new ArrayList(myItems)); - mySortedItems = sortedItems; - } - return sortedItems; + final List sorted = new ArrayList(mySortedItems); + final List> relevanceGroups = ContainerUtil.map(myRelevanceGroups.values(), new Function, List>() { + @Override + public List fun(SortedList lookupElements) { + return new ArrayList(lookupElements); + } + }); + return Pair.create(sorted, relevanceGroups); } } - public void collectGarbage() { synchronized (lock) { myItemActions.keySet().retainAll(myItems); @@ -107,16 +123,29 @@ public class LookupModel { } } - void retainMatchingItems(String newPrefix) { + void retainMatchingItems(final String newPrefix) { synchronized (lock) { - for (Iterator iterator = myItems.iterator(); iterator.hasNext();) { - LookupElement item = iterator.next(); - if (!item.setPrefixMatcher(item.getPrefixMatcher().cloneWithPrefix(newPrefix))) { - iterator.remove(); - mySortedItems = null; + final List newItems = ContainerUtil.findAll(myItems, new Condition() { + @Override + public boolean value(LookupElement item) { + return item.isValid() && item.setPrefixMatcher(item.getPrefixMatcher().cloneWithPrefix(newPrefix)); } + }); + + clearItems(); + for (LookupElement newItem : newItems) { + addItem(newItem); } } } + public void setArranger(final LookupArranger arranger) { + synchronized (lock) { + myArranger = arranger; + + final Comparator comparator = arranger.getItemComparator(); + mySortedItems = new SortedList(comparator == null ? COMMUNISM : comparator); + myRelevanceGroups = new TreeMap>(); + } + } } diff --git a/platform/util/src/com/intellij/util/containers/SortedList.java b/platform/util/src/com/intellij/util/containers/SortedList.java index f5233320daed..49bc76998949 100644 --- a/platform/util/src/com/intellij/util/containers/SortedList.java +++ b/platform/util/src/com/intellij/util/containers/SortedList.java @@ -21,74 +21,91 @@ import java.util.*; * @author peter */ public class SortedList extends AbstractList{ + private final SortedMap> myMap; private final Comparator myComparator; - private boolean mySorted; - private final List myDelegate = new ArrayList(); + private List myDelegate = null; public SortedList(final Comparator comparator) { myComparator = comparator; + myMap = new TreeMap>(comparator); + } + + public Comparator getComparator() { + return myComparator; } @Override public void add(final int index, final T element) { - mySorted = false; - myDelegate.add(index, element); + _addToMap(element); + } + + private void _addToMap(T element) { + List group = myMap.get(element); + if (group == null) { + myMap.put(element, group = new ArrayList()); + } + group.add(element); + myDelegate = null; + } + + @Override + public boolean add(T t) { + _addToMap(t); + return true; } @Override public T remove(final int index) { - return myDelegate.remove(index); + final T value = get(index); + remove(value); + return value; } @Override - public boolean remove(Object o) { - ensureSorted(); - final int i = Collections.binarySearch(myDelegate, (T)o, myComparator); - if (i >= 0) { - myDelegate.remove(i); - return true; + public boolean remove(Object value) { + final List group = myMap.remove(value); + if (group == null) return false; + + group.remove(value); + if (!group.isEmpty()) { + myMap.put(group.get(0), group); } - return false; + myDelegate = null; + return true; } public T get(final int index) { - ensureSorted(); + ensureLinearized(); return myDelegate.get(index); } - private void ensureSorted() { - if (!mySorted) { - sort(myDelegate); - mySorted = true; + private List ensureLinearized() { + if (myDelegate == null) { + myDelegate = ContainerUtil.concat(myMap.values()); } - } - - public void markDirty() { - mySorted = false; - } - - protected void sort(List delegate) { - Collections.sort(myDelegate, myComparator); + return myDelegate; } @Override public void clear() { - myDelegate.clear(); + myMap.clear(); + myDelegate = null; } @Override public Iterator iterator() { - ensureSorted(); - return super.iterator(); + ensureLinearized(); + return myDelegate.iterator(); } @Override public ListIterator listIterator() { - ensureSorted(); - return super.listIterator(); + ensureLinearized(); + return myDelegate.listIterator(); } public int size() { + ensureLinearized(); return myDelegate.size(); } } From 8d23d424ab8d27a195f8c873433e966f9943df1d Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Wed, 20 Oct 2010 22:59:24 +0400 Subject: [PATCH 43/98] faster lookup reuse & common prefix insertion --- .../intellij/codeInsight/lookup/impl/LookupModel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java index 438179e37a0c..ff29cb6a6d12 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupModel.java @@ -25,6 +25,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.SortedList; import gnu.trove.THashMap; +import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.TestOnly; @@ -118,8 +119,9 @@ public class LookupModel { public void collectGarbage() { synchronized (lock) { - myItemActions.keySet().retainAll(myItems); - myItemPresentations.keySet().retainAll(myItems); + Set itemSet = new THashSet(myItems, TObjectHashingStrategy.IDENTITY); + myItemActions.keySet().retainAll(itemSet); + myItemPresentations.keySet().retainAll(itemSet); } } @@ -132,6 +134,10 @@ public class LookupModel { } }); + if (newItems.size() == myItems.size()) { + return; + } + clearItems(); for (LookupElement newItem : newItems) { addItem(newItem); From 14453760968665b551291f0a026074a6ed34b971 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 21 Oct 2010 09:49:21 +0400 Subject: [PATCH 44/98] IDEA-60000: disable GWT background compilation --- .../src/com/intellij/compiler/impl/CompileDriver.java | 2 +- .../com/intellij/compiler/impl/GenericCompilerRunner.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 352d23205fdc..8c5555390be7 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -736,7 +736,7 @@ public class CompileDriver { boolean didSomething = false; final CompilerManager compilerManager = CompilerManager.getInstance(myProject); - GenericCompilerRunner runner = new GenericCompilerRunner(context, compilerManager, isRebuild, onlyCheckStatus); + GenericCompilerRunner runner = new GenericCompilerRunner(context, myCompilerFilter, compilerManager, isRebuild, onlyCheckStatus); try { didSomething |= generateSources(compilerManager, context, forceCompile, onlyCheckStatus); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java index 8b7a773bc0b6..341f8a7eef1a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/GenericCompilerRunner.java @@ -52,11 +52,15 @@ public class GenericCompilerRunner { private final GenericCompiler[] myCompilers; private final Project myProject; - public GenericCompilerRunner(CompileContext context, CompilerManager compilerManager, boolean forceCompile, boolean onlyCheckStatus) { + public GenericCompilerRunner(CompileContext context, + CompilerFilter compilerFilter, + CompilerManager compilerManager, + boolean forceCompile, + boolean onlyCheckStatus) { myContext = context; myForceCompile = forceCompile; myOnlyCheckStatus = onlyCheckStatus; - myCompilers = compilerManager.getCompilers(GenericCompiler.class); + myCompilers = compilerManager.getCompilers(GenericCompiler.class, compilerFilter); myProject = myContext.getProject(); } From c87bc3512c36c942a9ab359cc0db1a402d4ad75a Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 19 Oct 2010 12:24:31 +0400 Subject: [PATCH 45/98] unused properties --- .../src/messages/LangBundle.properties | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/platform-resources-en/src/messages/LangBundle.properties b/platform/platform-resources-en/src/messages/LangBundle.properties index 38787b93e3d9..4ab0eca3d279 100644 --- a/platform/platform-resources-en/src/messages/LangBundle.properties +++ b/platform/platform-resources-en/src/messages/LangBundle.properties @@ -30,8 +30,7 @@ unexpected.eof=Unexpected end of file completion.no.suggestions=No suggestions completion.quick.javadoc.ad=Did you know that Quick Documentation View ({0}) works in completion lookups as well? completion.quick.implementations.ad=Did you know that Quick Definition View ({0}) works in completion lookups as well? -completion.replace.ad=Choosing item with {0} will overwrite the rest of identifier after caret -completion.dot.etc.ad=Dot, semicolon and some other keys will also close this lookup and be inserted into editor +completion.dot.etc.ad=Dot, semicolon and some other keys will also close this lookup and be inserted into editor completion.smart.enter.ad=Use {0} to syntactically correct your code after completing (balance parentheses etc.) xml.terms.tag=tag @@ -41,7 +40,6 @@ xml.terms.attribute=attribute xml.terms.attribute.value=attribute value xml.terms.variable=variable error.cannot.resolve=Cannot resolve -error.cannot.resolve.infix=or dialog.template.data.language.caption=\ Template data languages are the underlying languages in template files like those of FreeMarker/Velocity frameworks.
\ To change template data language settings IntelliJ IDEA uses for a file, directory, or an entire project,
\ @@ -53,4 +51,4 @@ template.data.language.configurable=Template Data Languages template.data.language.configurable.tree.table.title=Template data language template.data.language.override.warning.text=There are template data languages specified for the subdirectories. Override them? template.data.language.override.warning.title=Override Subdirectory Template Data Languages -quickfix.change.template.data.language.text=Change {0} template data language to... \ No newline at end of file +quickfix.change.template.data.language.text=Change {0} template data language to... From 7f34352a3ad5aa56126dfda0d2bd6274fc541194 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 19 Oct 2010 14:50:07 +0400 Subject: [PATCH 46/98] commit injected fragment editor changes near the borders to the host document --- .../plugins/intelliLang/inject/quickedit/QuickEditAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java index 04ba4406530b..1b14caf3978a 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java @@ -263,10 +263,10 @@ public class QuickEditAction implements IntentionAction, LowPriorityAction { } boolean first = true; for (Pair markers : myMarkers.values()) { - if (first) { + //if (first) { markers.first.setGreedyToLeft(true); markers.second.setGreedyToLeft(true); - } + //} markers.first.setGreedyToRight(true); markers.second.setGreedyToRight(true); first = false; From 5c53841e65b26db12e64bbdf70de052d24607256 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Oct 2010 12:29:43 +0400 Subject: [PATCH 47/98] performance --- .../codeInsight/daemon/impl/LocalInspectionsPass.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index 15b8a6573c24..c03b49d64748 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -269,15 +269,16 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass List> init) { boolean result = JobUtil.invokeConcurrentlyUnderMyProgress(init, new Processor>() { @Override - public boolean process(Trinity i) { - LocalInspectionTool tool = i.first; + public boolean process(Trinity trinity) { + LocalInspectionTool tool = trinity.first; indicator.checkCanceled(); ApplicationManager.getApplication().assertReadAccessAllowed(); - ProblemsHolder holder = i.second; - PsiElementVisitor elementVisitor = i.third; - for (PsiElement element : elements) { + ProblemsHolder holder = trinity.second; + PsiElementVisitor elementVisitor = trinity.third; + for (int i = 0, elementsSize = elements.size(); i < elementsSize; i++) { + PsiElement element = elements.get(i); indicator.checkCanceled(); element.accept(elementVisitor); } From 6d6906a8290926f04e81cb5c7b125b72be8d4864 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Oct 2010 16:24:49 +0400 Subject: [PATCH 48/98] psidocument manager should ignore documents from alien project (esp. in tests) --- .../src/com/intellij/psi/impl/PsiDocumentManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java index 9a091aa904c2..50eff63789a8 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/PsiDocumentManagerImpl.java @@ -523,6 +523,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec final FileViewProvider viewProvider = getCachedViewProvider(document); if (viewProvider == null) return; if (viewProvider.getVirtualFile().getFileType().isBinary()) return; + if (viewProvider.getManager() != myPsiManager) return; final List files = viewProvider.getAllFiles(); boolean commitNecessary = false; @@ -536,7 +537,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec } textBlock.documentChanged(event); - assert file instanceof PsiFileImpl : event + "; file="+file+"; allFiles="+files+"; viewProvider="+viewProvider; + assert file instanceof PsiFileImpl || "mock.file".equals(file.getName()) && ApplicationManager.getApplication().isUnitTestMode() : event + "; file="+file+"; allFiles="+files+"; viewProvider="+viewProvider; myUncommittedDocuments.add(document); commitNecessary = true; } @@ -568,6 +569,7 @@ public class PsiDocumentManagerImpl extends PsiDocumentManager implements Projec } char[] fileText = psiFile.textToCharArray(); + @SuppressWarnings({"NonConstantStringShouldBeStringBuffer"}) @NonNls String error = "File '" + psiFile.getName() + "' text mismatch after reparse. " + "File length=" + fileText.length + "; Doc length=" + documentLength + "\n"; int i = 0; From 1f698ab71cda695c6a93b50fb4c07e3def255142 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 21 Oct 2010 10:20:56 +0400 Subject: [PATCH 49/98] highlighters can stick in the editor --- .../daemon/impl/GeneralHighlightingPass.java | 21 +-- .../daemon/impl/UpdateHighlightersUtil.java | 169 ++++++------------ 2 files changed, 63 insertions(+), 127 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java index 2e4014642037..66794598e707 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java @@ -128,7 +128,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP MarkupModel model = myDocument.getMarkupModel(myProject); UpdateHighlightersUtil.cleanFileLevelHighlights(myProject, Pass.UPDATE_ALL,myFile); final EditorColorsScheme colorsScheme = getColorsScheme(); - UpdateHighlightersUtil.setHighlightersInRange(range, myHighlights, colorsScheme, (MarkupModelEx)model, Pass.UPDATE_ALL, myDocument, myProject); + UpdateHighlightersUtil.setHighlightersInRange(myProject, myDocument, range, colorsScheme, myHighlights, (MarkupModelEx)model, Pass.UPDATE_ALL); } }; @@ -192,16 +192,8 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP public void run() { if (!addInjectedPsiHighlights(injectedInside, progress, Collections.synchronizedSet(result))) throw new ProcessCanceledException(); - // set editor's color scheme - //final EditorColorsScheme colorsScheme = getColorsScheme(); - //if (colorsScheme != null) { - // for (HighlightInfo info : result) { - // info.setCustomColorScheme(colorsScheme); - // } - //} - if (!outside.isEmpty() || !injectedOutside.isEmpty()) { - if (!inside.isEmpty()) { // do not apply when there were no elements to highlight + if (!inside.isEmpty() || !injectedInside.isEmpty()) { // do not apply when there were no elements to highlight // clear infos found in visible area to avoid applying them twice final List toApply = new ArrayList(result.size()); for (HighlightInfo info : result) { @@ -219,18 +211,19 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP UIUtil.invokeLaterIfNeeded(new Runnable() { @Override public void run() { - if (progress.isCanceled()) return; + if (myProject.isDisposed()) return; MarkupModel markupModel = myDocument.getMarkupModel(myProject); ProperTextRange range = myPriorityRange.intersection(new TextRange(myStartOffset, myEndOffset)); final EditorColorsScheme colorsScheme = getColorsScheme(); - UpdateHighlightersUtil.setHighlightersInRange(range, toApply, colorsScheme, (MarkupModelEx)markupModel, Pass.UPDATE_ALL, myDocument, myProject); + UpdateHighlightersUtil.setHighlightersInRange(myProject, myDocument, range, colorsScheme, toApply, + (MarkupModelEx)markupModel, Pass.UPDATE_ALL); } }); UIUtil.invokeLaterIfNeeded(new Runnable() { @Override public void run() { - if (progress.isCanceled() || myEditor == null) return; + if (myProject.isDisposed() || myEditor == null) return; new ShowAutoImportPass(myProject, myFile, myEditor).applyInformationToEditor(); } }); @@ -268,7 +261,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP } */ - UpdateHighlightersUtil.setHighlightersToEditorOutsideRange(myProject, myDocument, toApply, getColorsScheme(), + UpdateHighlightersUtil.setHighlightersOutsideRange(myProject, myDocument, toApply, getColorsScheme(), myStartOffset, myEndOffset, myPriorityRange, Pass.UPDATE_ALL); } }; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java index fdbec9a8b6d5..41705b151739 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java @@ -115,26 +115,6 @@ public class UpdateHighlightersUtil { } } - public static void setHighlightersToEditor(@NotNull Project project, - @NotNull Document document, - int startOffset, - int endOffset, - @NotNull Collection highlights, - @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - int group) { - setHighlightersToEditor(project, document, Collections.singletonMap(new TextRange(startOffset, endOffset), highlights), colorsScheme, group); - } - - @Deprecated - public static void setHighlightersToEditor(Project project, - Document document, - int startOffset, - int endOffset, - Collection highlights, int group) { - setHighlightersToEditor(project, document, startOffset, endOffset, highlights, null, group); - - } - static boolean hasInfo(Collection infos, int start, int end, String desc) { if (infos == null) return false; for (HighlightInfo info : infos) { @@ -177,13 +157,13 @@ public class UpdateHighlightersUtil { } static void addHighlighterToEditorIncrementally(@NotNull Project project, - @NotNull Document document, - @NotNull PsiFile file, - int startOffset, - int endOffset, - @NotNull final HighlightInfo info, + @NotNull Document document, + @NotNull PsiFile file, + int startOffset, + int endOffset, + @NotNull final HighlightInfo info, @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - final int group) { + final int group) { ApplicationManager.getApplication().assertIsDispatchThread(); if (info.isFileLevelAnnotation || info.getGutterIconRenderer() != null) return; @@ -204,100 +184,68 @@ public class UpdateHighlightersUtil { createOrReuseHighlighterFor(info, colorsScheme, document, group, file, (MarkupModelEx)markup, null, null, SeverityRegistrar.getInstance(project)); - DaemonCodeAnalyzerImpl.addHighlight(markup, project, info); clearWhiteSpaceOptimizationFlag(document); assertMarkupConsistent(markup, project); } - @Deprecated - static void setHighlightersToEditor(@NotNull final Project project, - @NotNull final Document document, - @NotNull final Map> infos, - final int group) { - // For backward compatibility with TeamCity plugin, duplicates searcher. - setHighlightersToEditor(project, document, infos, null, group); - } - - static void setHighlightersToEditor(@NotNull Project project, - @NotNull Document document, - @NotNull Map> infos, - @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - final int group) { + public static void setHighlightersToEditor(@NotNull Project project, + @NotNull Document document, + int startOffset, + int endOffset, + @NotNull Collection highlights, + @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used + int group) { + TextRange range = new TextRange(startOffset, endOffset); ApplicationManager.getApplication().assertIsDispatchThread(); PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); cleanFileLevelHighlights(project, group, psiFile); - final List ranges = new ArrayList(infos.keySet()); - Collections.sort(ranges, BY_START_OFFSET); - //merge intersecting - for (int i = 1; i < ranges.size(); i++) { - TextRange range = ranges.get(i); - TextRange prev = ranges.get(i-1); - if (prev.intersects(range)) { - ranges.remove(i); - TextRange union = prev.union(range); - - Collection collection = infos.get(prev); - collection.addAll(infos.get(range)); - infos.remove(prev); - infos.remove(range); - infos.put(union, collection); - ranges.set(i - 1, union); - i--; - } - } - MarkupModel markup = document.getMarkupModel(project); assertMarkupConsistent(markup, project); - for (Map.Entry> entry : infos.entrySet()) { - TextRange range = entry.getKey(); - Collection highlights = entry.getValue(); - setHighlightersInRange(range, highlights, colorsScheme, (MarkupModelEx)markup, group, document, project); - } + setHighlightersInRange(project, document, range, colorsScheme, highlights, (MarkupModelEx)markup, group); + } + + @Deprecated //for teamcity + public static void setHighlightersToEditor(@NotNull Project project, + @NotNull Document document, + int startOffset, + int endOffset, + @NotNull Collection highlights, + int group) { + setHighlightersToEditor(project, document, startOffset, endOffset, highlights, null, group); } // set highlights inside startOffset,endOffset but outside range - static void setHighlightersToEditorOutsideRange(@NotNull Project project, - @NotNull Document document, - @NotNull Collection infos, + static void setHighlightersOutsideRange(@NotNull final Project project, + @NotNull final Document document, + @NotNull Collection infos, @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - int startOffset, int endOffset, - @NotNull ProperTextRange range, - final int group) { + int startOffset, int endOffset, + @NotNull final ProperTextRange range, + final int group) { ApplicationManager.getApplication().assertIsDispatchThread(); - PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); + final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); cleanFileLevelHighlights(project, group, psiFile); - MarkupModel markup = document.getMarkupModel(project); + final MarkupModel markup = document.getMarkupModel(project); assertMarkupConsistent(markup, project); - setHighlightersOutsideRange(startOffset, endOffset, range, infos, colorsScheme, (MarkupModelEx)markup, group, document, project); - } - - static void setHighlightersInRange(final TextRange range, - Collection highlightsCo, - @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - final MarkupModelEx markup, - final int group, - final Document document, - final Project project) { - final List highlights = new ArrayList(highlightsCo); + final List highlights = new ArrayList(infos); final SeverityRegistrar severityRegistrar = SeverityRegistrar.getInstance(project); final HighlightersRecycler infosToRemove = new HighlightersRecycler(); - DaemonCodeAnalyzerImpl.processHighlights(document, project, null, range.getStartOffset(), range.getEndOffset(), new Processor() { + DaemonCodeAnalyzerImpl.processHighlights(document, project, null, startOffset, endOffset, new Processor() { @Override public boolean process(HighlightInfo info) { if (info.group == group) { RangeHighlighter highlighter = info.highlighter; - int endOffset = highlighter.getEndOffset(); - int startOffset = highlighter.getStartOffset(); - boolean willBeRemoved = endOffset == document.getTextLength() && range.getEndOffset() == document.getTextLength() - || range.contains(startOffset) - || range.containsRange(startOffset, endOffset); + int hiStart = highlighter.getStartOffset(); + int hiEnd = highlighter.getEndOffset(); + boolean willBeRemoved = hiEnd == document.getTextLength() && range.getEndOffset() == document.getTextLength() + || !range.containsRange(hiStart, hiEnd); if (willBeRemoved) { infosToRemove.recycleHighlighter(highlighter); info.highlighter = null; @@ -309,7 +257,6 @@ public class UpdateHighlightersUtil { Collections.sort(highlights, BY_START_OFFSET_NODUPS); final Map ranges2markersCache = new THashMap(10); - final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); final boolean[] changed = {false}; RangeMarkerTree.sweep(new RangeMarkerTree.Generator(){ @Override @@ -330,10 +277,8 @@ public class UpdateHighlightersUtil { if (isWarningCoveredByError(info, overlappingIntervals, severityRegistrar)) { return true; } - if (info.getStartOffset() >= range.getStartOffset() && info.getEndOffset() <= range.getEndOffset()) { - createOrReuseHighlighterFor(info, colorsScheme, document, group, psiFile, markup, infosToRemove, - ranges2markersCache, - severityRegistrar); + if (info.getStartOffset() < range.getStartOffset() || info.getEndOffset() > range.getEndOffset()) { + createOrReuseHighlighterFor(info, colorsScheme, document, group, psiFile, (MarkupModelEx)markup, infosToRemove, ranges2markersCache, severityRegistrar); changed[0] = true; } return true; @@ -350,27 +295,27 @@ public class UpdateHighlightersUtil { assertMarkupConsistent(markup, project); } - private static void setHighlightersOutsideRange(final int startOffset, final int endOffset, final TextRange range, - Collection highlightsCo, - @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used - final MarkupModelEx markup, - final int group, - final Document document, - final Project project) { + static void setHighlightersInRange(@NotNull final Project project, + @NotNull final Document document, + @NotNull final TextRange range, + @Nullable final EditorColorsScheme colorsScheme, // if null global scheme will be used + @NotNull Collection highlightsCo, + @NotNull final MarkupModelEx markup, + final int group) { + ApplicationManager.getApplication().assertIsDispatchThread(); final List highlights = new ArrayList(highlightsCo); final SeverityRegistrar severityRegistrar = SeverityRegistrar.getInstance(project); final HighlightersRecycler infosToRemove = new HighlightersRecycler(); - DaemonCodeAnalyzerImpl.processHighlights(document, project, null, startOffset, endOffset, new Processor() { + DaemonCodeAnalyzerImpl.processHighlights(document, project, null, range.getStartOffset(), range.getEndOffset(), new Processor() { @Override public boolean process(HighlightInfo info) { if (info.group == group) { RangeHighlighter highlighter = info.highlighter; - int endOffset = highlighter.getEndOffset(); - int startOffset = highlighter.getStartOffset(); - boolean willBeRemoved = endOffset == document.getTextLength() && range.getEndOffset() != document.getTextLength() - || !range.contains(startOffset) - && !range.containsRange(startOffset, endOffset); + int hiEnd = highlighter.getEndOffset(); + int hiStart = highlighter.getStartOffset(); + boolean willBeRemoved = hiEnd == document.getTextLength() && range.getEndOffset() == document.getTextLength() + || range.intersects(hiStart, hiEnd); if (willBeRemoved) { infosToRemove.recycleHighlighter(highlighter); info.highlighter = null; @@ -403,10 +348,8 @@ public class UpdateHighlightersUtil { if (isWarningCoveredByError(info, overlappingIntervals, severityRegistrar)) { return true; } - if (info.getStartOffset() < range.getStartOffset() || info.getEndOffset() > range.getEndOffset()) { - createOrReuseHighlighterFor(info, colorsScheme, document, group, psiFile, markup, infosToRemove, - ranges2markersCache, - severityRegistrar); + if (info.getStartOffset() >= range.getStartOffset() && info.getEndOffset() <= range.getEndOffset()) { + createOrReuseHighlighterFor(info, colorsScheme, document, group, psiFile, markup, infosToRemove, ranges2markersCache, severityRegistrar); changed[0] = true; } return true; From 9fbf3bdbd64d427ed316de8c7cce44fd6fcd2e58 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Thu, 21 Oct 2010 09:52:39 +0400 Subject: [PATCH 50/98] cache ClassContextFilter --- .../plugins/groovy/dsl/toplevel/ClassContextFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/toplevel/ClassContextFilter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/toplevel/ClassContextFilter.java index af3d2f6d6138..9c67f2d0e1f1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/toplevel/ClassContextFilter.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/toplevel/ClassContextFilter.java @@ -10,7 +10,7 @@ import com.intellij.psi.PsiClassType; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiType; import com.intellij.util.ProcessingContext; -import com.intellij.util.containers.hash.HashMap; +import com.intellij.util.containers.ConcurrentHashMap; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.dsl.GroovyClassDescriptor; import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil; @@ -76,11 +76,11 @@ public class ClassContextFilter implements ContextFilter { private static PsiType getCachedType(String typeText, PsiFile context) { Map map = context.getUserData(CACHED_TYPES); if (map == null) { - map = new HashMap(); + map = new ConcurrentHashMap(); context.putUserData(CACHED_TYPES, map); } PsiType type = map.get(typeText); - if (type == null) { + if (type == null || !type.isValid()) { type = JavaPsiFacade.getElementFactory(context.getProject()).createTypeFromText(typeText, context); map.put(typeText, type); } From 3b874f911ea0d03b5f4663a7f7b87be451e93ed2 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Thu, 21 Oct 2010 12:22:18 +0400 Subject: [PATCH 51/98] use mock groovy1.7 in LightGroovyTestCase --- .../plugins/groovy/LightGroovyTestCase.java | 12 ++++++------ .../groovy/lang/findUsages/FindUsagesTest.java | 2 +- .../groovy/lang/resolve/TypeInferenceTest.java | 2 +- .../inference/rawTypeInReturnExpression/A.groovy | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java index dd8de05b8b32..ef0f5332af28 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java @@ -16,19 +16,19 @@ package org.jetbrains.plugins.groovy; -import com.intellij.openapi.roots.ContentEntry; -import com.intellij.testFramework.LightProjectDescriptor; -import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.module.Module; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; +import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.JarFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.testFramework.LightProjectDescriptor; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.util.TestUtils; @@ -52,7 +52,7 @@ public abstract class LightGroovyTestCase extends LightCodeInsightFixtureTestCas public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { final Library.ModifiableModel modifiableModel = model.getModuleLibraryTable().createLibrary("GROOVY").getModifiableModel(); final VirtualFile groovyJar = - JarFileSystem.getInstance().refreshAndFindFileByPath(TestUtils.getMockJdkHome() + "/jre/lib/groovy-1.0.jar!/"); + JarFileSystem.getInstance().refreshAndFindFileByPath(TestUtils.getMockGroovy1_7LibraryName()+"!/"); modifiableModel.addRoot(groovyJar, OrderRootType.CLASSES); modifiableModel.commit(); } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.java index ed398d693eb6..27d59683200a 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/findUsages/FindUsagesTest.java @@ -190,7 +190,7 @@ public class FindUsagesTest extends LightGroovyTestCase { } public void testGDKSuperMethodSearch() throws Exception { - doSuperMethodTest("Object"); + doSuperMethodTest("T"); } public void testGDKSuperMethodForMapSearch() throws Exception { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java index 76f913c140d0..114a6b5dc10d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.java @@ -121,7 +121,7 @@ public class TypeInferenceTest extends GroovyResolveTestCase { public void testArrayLikeAccessWithIntSequence() { final GrReferenceExpression ref = (GrReferenceExpression)configureByFile("arrayLikeAccessWithIntSequence/A.groovy").getElement(); - assertEquals("java.util.List", ref.getType().getCanonicalText()); + assertEquals("java.util.List", ref.getType().getCanonicalText()); } public void testArrayAccess() { diff --git a/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy b/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy index c650108e22e7..1b5bc55a4e51 100644 --- a/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy +++ b/plugins/groovy/testdata/resolve/inference/rawTypeInReturnExpression/A.groovy @@ -1,14 +1,14 @@ class MissingInferenceTest { - Map>> factoryMethod() { [:]} + Map>> factoryMethod() { new HashMap()} def myMethod() { - Map>> dataTyped = [:] - def dataInferred = new HashMap>>() + Map>> dataTyped = new HashMap() + def dataInferred = new HashMap>>() def dataNotInferred = factoryMethod() - println dataTyped ['foo'][5][2].time() - println dataInferred ['foo'][5][2].time() - println dataNotInferred['foo'][5][2].time() // no completion, highlighted as dynamic + println dataTyped ['foo'][5][2].charAt(2) + println dataInferred ['foo'][5][2].charAt(2) + println dataNotInferred['foo'][5][2].charAt(2) // no completion, highlighted as dynamic } } From a7f03e44137ff6288d5ef5a031c3b6520206bea0 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 20 Oct 2010 17:07:25 +0400 Subject: [PATCH 52/98] Maven: timeout in the test increased --- .../org/jetbrains/idea/maven/facade/MavenFacadeManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/facade/MavenFacadeManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/facade/MavenFacadeManagerTest.java index ebc7f3bc2967..a1e0c61b9401 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/facade/MavenFacadeManagerTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/facade/MavenFacadeManagerTest.java @@ -45,7 +45,7 @@ public class MavenFacadeManagerTest extends MavenTestCase { }); try { - result.get(5, TimeUnit.SECONDS); + result.get(10, TimeUnit.SECONDS); } catch (InterruptedException e) { throw new RuntimeException(e); From 47194b9be0082c25bc6236b2b2bf729395014fa3 Mon Sep 17 00:00:00 2001 From: "Rustam.Vishnyakov" Date: Thu, 21 Oct 2010 12:41:05 +0400 Subject: [PATCH 53/98] JavaScript library type support --- .../LangScriptingContextProvider.java | 3 + .../ui/ScriptingLibrariesPanel.java | 20 +++-- .../ui/ScriptingLibraryTableModel.java | 70 +++++++++------ .../ui/TypedLibraryTableWrapper.java | 90 +++++++++++++++++++ 4 files changed, 149 insertions(+), 34 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/TypedLibraryTableWrapper.java diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextProvider.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextProvider.java index 1233012bf2ef..2368c0646a2f 100644 --- a/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/LangScriptingContextProvider.java @@ -18,6 +18,7 @@ package com.intellij.ide.scriptingContext; import com.intellij.lang.Language; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; +import com.intellij.openapi.roots.libraries.LibraryType; import org.jetbrains.annotations.NotNull; /** @@ -31,6 +32,8 @@ public abstract class LangScriptingContextProvider { @NotNull public abstract Language getLanguage(); + public abstract LibraryType getLibraryType(); + public abstract boolean acceptsExtension(String fileExt); @NotNull diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibrariesPanel.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibrariesPanel.java index ab50911de9e5..c2082143650b 100644 --- a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibrariesPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibrariesPanel.java @@ -16,6 +16,7 @@ package com.intellij.ide.scriptingContext.ui; import com.intellij.ide.scriptingContext.LangScriptingContextProvider; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; @@ -44,7 +45,7 @@ public class ScriptingLibrariesPanel { public ScriptingLibrariesPanel(LangScriptingContextProvider provider, Project project, LibraryTable libTable) { myProvider = provider; - myLibTableModel = new ScriptingLibraryTableModel(libTable); + myLibTableModel = new ScriptingLibraryTableModel(libTable, provider.getLibraryType()); myLibraryTable.setModel(myLibTableModel); myAddLibraryButton.addActionListener(new ActionListener(){ @Override @@ -56,7 +57,7 @@ public class ScriptingLibrariesPanel { @Override public void actionPerformed(ActionEvent e) { if (mySelectedLibName != null) { - myLibTableModel.removeLibrary(mySelectedLibName); + removeLibrary(mySelectedLibName); } } }); @@ -85,11 +86,20 @@ public class ScriptingLibrariesPanel { return myTopPanel; } + private void removeLibrary(final String libName) { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + myLibTableModel.removeLibrary(libName); + } + }); + } + private void addLibrary() { EditLibraryDialog editLibDialog = new EditLibraryDialog("New Library", myProvider, myProject); editLibDialog.show(); if (editLibDialog.isOK()) { - myLibTableModel.createLibrary(editLibDialog.getLibName(), editLibDialog.getFiles()); + myLibTableModel.createLibrary(editLibDialog.getLibName(), myProvider.getLibraryType(), editLibDialog.getFiles()); } } @@ -121,8 +131,8 @@ public class ScriptingLibrariesPanel { EditLibraryDialog editLibDialog = new EditLibraryDialog("Edit Library", myProvider, myProject, lib); editLibDialog.show(); if (editLibDialog.isOK()) { - myLibTableModel.removeLibrary(lib.getName()); - myLibTableModel.createLibrary(editLibDialog.getLibName(), editLibDialog.getFiles()); + removeLibrary(lib.getName()); + myLibTableModel.createLibrary(editLibDialog.getLibName(), myProvider.getLibraryType(), editLibDialog.getFiles()); } } } diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibraryTableModel.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibraryTableModel.java index 524b664586fe..ca61faa6a216 100644 --- a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibraryTableModel.java +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/ScriptingLibraryTableModel.java @@ -15,9 +15,12 @@ */ package com.intellij.ide.scriptingContext.ui; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.roots.OrderRootType; +import com.intellij.openapi.roots.impl.libraries.LibraryTableBase; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.libraries.LibraryType; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.Nullable; @@ -31,26 +34,29 @@ public class ScriptingLibraryTableModel extends AbstractTableModel { private static final int LIB_NAME_COL = 0; - private LibraryTable myLibTable; - private LibraryTable.ModifiableModel myLibTableModel; - private boolean myTableChanged; + //private LibraryTable myLibTable; + private TypedLibraryTableWrapper myTableWrapper; + private LibraryTableBase.ModifiableModelEx myLibTableModel; + private LibraryType myLibraryType; - public ScriptingLibraryTableModel(LibraryTable libTable) { - myLibTable = libTable; - myLibTableModel = libTable.getModifiableModel(); - myTableChanged = false; + public ScriptingLibraryTableModel(LibraryTable libTable, LibraryType libraryType) { + LibraryTable.ModifiableModel model = libTable.getModifiableModel(); + if (model instanceof LibraryTableBase.ModifiableModelEx) { + myTableWrapper = new TypedLibraryTableWrapper(libTable, libraryType); + myLibTableModel = (LibraryTableBase.ModifiableModelEx)model; + myLibraryType = libraryType; + } } public void resetTable(LibraryTable libTable) { - myLibTable = libTable; - myTableChanged = false; + myTableWrapper = new TypedLibraryTableWrapper(libTable, myLibraryType); fireTableDataChanged(); } @Override public int getRowCount() { - if (myLibTable != null) { - return myLibTable.getLibraries().length; + if (myTableWrapper != null) { + return myTableWrapper.getLibCount(); } return 0; } @@ -62,8 +68,10 @@ public class ScriptingLibraryTableModel extends AbstractTableModel { @Override public Object getValueAt(int rowIndex, int columnIndex) { + Library lib = myTableWrapper.getLibraryAt(rowIndex); + assert lib != null; if (columnIndex == LIB_NAME_COL) { - return myLibTable.getLibraries()[rowIndex].getName(); + return lib.getName(); } return "?"; } @@ -76,44 +84,48 @@ public class ScriptingLibraryTableModel extends AbstractTableModel { return "?"; } - public void createLibrary(String name, VirtualFile[] files) { - Library lib = myLibTable.createLibrary(name); - Library.ModifiableModel libModel = lib.getModifiableModel(); - for (VirtualFile file : files) { - libModel.addRoot(file, OrderRootType.CLASSES); - } - libModel.commit(); - myLibTableModel.commit(); - fireLibTableChanged(); + public void createLibrary(final String name, final LibraryType libType, final VirtualFile[] files) { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + Library lib = myLibTableModel.createLibrary(name, libType); + Library.ModifiableModel libModel = lib.getModifiableModel(); + for (VirtualFile file : files) { + libModel.addRoot(file, OrderRootType.CLASSES); + } + libModel.commit(); + myLibTableModel.commit(); + fireLibTableChanged(); + } + }); } @Nullable public Library getLibrary(String name) { - return myLibTable == null ? null : myLibTable.getLibraryByName(name); + return myTableWrapper == null ? null : myTableWrapper.getLibraryByName(name); } public void removeLibrary(String name) { - Library libToRemove = myLibTable.getLibraryByName(name); + Library libToRemove = myTableWrapper.getLibraryByName(name); if (libToRemove != null) { - myLibTable.removeLibrary(libToRemove); + myTableWrapper.removeLibrary(libToRemove); fireLibTableChanged(); } } public void fireLibTableChanged() { - myTableChanged = true; + myTableWrapper.update(); fireTableDataChanged(); } @Nullable public String getLibNameAt(int row) { - Library[] libs = myLibTable.getLibraries(); - if (row < 0 || row > libs.length - 1) return null; - return libs[row].getName(); + Library lib = myTableWrapper.getLibraryAt(row); + return lib != null ? lib.getName() : null; } public boolean isChanged() { - return myTableChanged; + return myTableWrapper.isUpdated(); } } diff --git a/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/TypedLibraryTableWrapper.java b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/TypedLibraryTableWrapper.java new file mode 100644 index 000000000000..94976a97856e --- /dev/null +++ b/platform/lang-impl/src/com/intellij/ide/scriptingContext/ui/TypedLibraryTableWrapper.java @@ -0,0 +1,90 @@ +/* + * Copyright 2000-2010 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 com.intellij.ide.scriptingContext.ui; + +import com.intellij.openapi.roots.impl.libraries.LibraryEx; +import com.intellij.openapi.roots.libraries.Library; +import com.intellij.openapi.roots.libraries.LibraryTable; +import com.intellij.openapi.roots.libraries.LibraryType; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Rustam Vishnyakov + */ +public class TypedLibraryTableWrapper { + + private LibraryTable myLibraryTable; + private LibraryType myLibraryType; + private Library[] myLibs; + private boolean myIsUpdated; + + public TypedLibraryTableWrapper(LibraryTable libraryTable, LibraryType libraryType) { + myLibraryTable = libraryTable; + myLibraryType = libraryType; + myLibs = getLibraries(); + myIsUpdated = false; + } + + private Library[] getLibraries() { + List libs = new ArrayList(); + for (Library library : myLibraryTable.getLibraries()) { + if (library instanceof LibraryEx) { + LibraryType libraryType = ((LibraryEx)library).getType(); + if (libraryType != null && libraryType.equals(myLibraryType)) { + libs.add(library); + } + } + } + return libs.toArray(new Library[libs.size()]); + } + + public void update() { + myLibs = getLibraries(); + myIsUpdated = true; + } + + public int getLibCount() { + return myLibs.length; + } + + @Nullable + public Library getLibraryAt(int index) { + if (index >= 0 && index < myLibs.length) { + return myLibs[index]; + } + return null; + } + + @Nullable + public Library getLibraryByName(String name) { + Library library = myLibraryTable.getLibraryByName(name); + if (library instanceof LibraryEx && ((LibraryEx)library).getType().equals(myLibraryType)) { + return library; + } + return null; + } + + public void removeLibrary(Library libToRemove) { + myLibraryTable.removeLibrary(libToRemove); + } + + public boolean isUpdated() { + return myIsUpdated; + } +} From 5ca5995d3c45ee33ed57d4e4da447d6b8084fb2e Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 21 Oct 2010 13:35:44 +0400 Subject: [PATCH 54/98] fix "double compilation" case --- .../com/intellij/compiler/impl/CompileDriver.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 8c5555390be7..e75f0e7a3803 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -963,6 +963,7 @@ public class CompileDriver { final DumbService dumbService = DumbService.getInstance(myProject); try { + final Set processedModules = new HashSet(); VirtualFile[] snapshot = null; final Map, Collection> chunkMap = new HashMap, Collection>(); int total = 0; @@ -1054,7 +1055,16 @@ public class CompileDriver { filesToRecompile.addAll(compiledWithErrors); dependentFiles = CacheUtils.findDependentFiles(context, compiledWithSuccess, dependencyFilter); - + if (!processedModules.isEmpty()) { + for (Iterator it = dependentFiles.iterator(); it.hasNext();) { + final VirtualFile next = it.next(); + final Module module = context.getModuleByFile(next); + if (module != null && processedModules.contains(module)) { + it.remove(); + } + } + } + if (ourDebugMode) { if (!dependentFiles.isEmpty()) { for (VirtualFile dependentFile : dependentFiles) { @@ -1102,7 +1112,7 @@ public class CompileDriver { indicator.setText(CompilerBundle.message("progress.saving.caches")); cache.resetState(); - + processedModules.addAll(currentChunk.getNodes()); indicator.popState(); } } From c17c79f56a44f1c7a24f93c4537944511c2fc48c Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Oct 2010 14:12:26 +0400 Subject: [PATCH 55/98] Git: better notifications if git failed to start. Added GitExecutableValidator - a project service able to check if git is valid and display notification. Notification provides a link to the Settings to fix git path there. Use the validator when failing GitBranchConfigurations detection. Check if git is valid on plugin activate. --- plugins/git4idea/src/META-INF/plugin.xml | 4 + plugins/git4idea/src/git4idea/GitVcs.java | 3 + .../branches/GitBranchConfigurations.java | 7 +- .../config/GitExecutableValidator.java | 93 +++++++++++++++++++ .../src/git4idea/i18n/GitBundle.properties | 4 + .../git4idea/src/git4idea/ui/GitUIUtil.java | 22 +++++ 6 files changed, 130 insertions(+), 3 deletions(-) create mode 100644 plugins/git4idea/src/git4idea/config/GitExecutableValidator.java diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml index 978e99d85bbb..3c92960dc36c 100644 --- a/plugins/git4idea/src/META-INF/plugin.xml +++ b/plugins/git4idea/src/META-INF/plugin.xml @@ -101,6 +101,9 @@ + @@ -113,6 +116,7 @@ + diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java index 5e2d107c71f9..2e0a49f8f505 100644 --- a/plugins/git4idea/src/git4idea/GitVcs.java +++ b/plugins/git4idea/src/git4idea/GitVcs.java @@ -54,6 +54,7 @@ import git4idea.checkin.GitCommitAndPushExecutor; import git4idea.checkout.branches.GitBranchConfigurations; import git4idea.commands.GitCommand; import git4idea.commands.GitSimpleHandler; +import git4idea.config.GitExecutableValidator; import git4idea.config.GitVcsConfigurable; import git4idea.config.GitVcsSettings; import git4idea.config.GitVersion; @@ -83,6 +84,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * Git VCS implementation */ public class GitVcs extends AbstractVcs { + public static final String NOTIFICATION_GROUP_ID = "Git"; /** * the logger */ @@ -501,6 +503,7 @@ public class GitVcs extends AbstractVcs { @Override protected void activate() { isActivated = true; + GitExecutableValidator.getInstance(myProject).checkExecutableAndNotifyIfNeeded(); if (!myProject.isDefault() && myRootTracker == null) { myRootTracker = new GitRootTracker(this, myProject, myRootListeners.getMulticaster()); } diff --git a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java index 23048b1a0739..1c6ff2091935 100644 --- a/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java +++ b/plugins/git4idea/src/git4idea/checkout/branches/GitBranchConfigurations.java @@ -22,6 +22,7 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; @@ -266,9 +267,9 @@ public class GitBranchConfigurations implements PersistentStateComponentFix it. \ No newline at end of file diff --git a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java b/plugins/git4idea/src/git4idea/ui/GitUIUtil.java index b12a98295cd5..3fea717099a0 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java +++ b/plugins/git4idea/src/git4idea/ui/GitUIUtil.java @@ -15,6 +15,11 @@ */ package git4idea.ui; +import com.intellij.notification.Notification; +import com.intellij.notification.NotificationListener; +import com.intellij.notification.NotificationType; +import com.intellij.notification.Notifications; +import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vcs.AbstractVcsHelper; @@ -24,12 +29,15 @@ import git4idea.GitBranch; import git4idea.GitRemote; import git4idea.GitVcs; import git4idea.config.GitConfigUtil; +import git4idea.config.GitExecutableValidator; +import git4idea.config.GitVcsConfigurable; import git4idea.i18n.GitBundle; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import javax.swing.event.HyperlinkEvent; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -402,4 +410,18 @@ public class GitUIUtil { checked.addActionListener(l); l.actionPerformed(null); } + + /** + * Handles a low-level Git execution exception. + * Checks that Git executable is valid. If it is not, then shows proper notification with an option to fix the path to Git. + * If it's valid, then we don't know what could happen and just display the general error notification. + */ + public static void checkGitExecutableAndShowNotification(final Project project, VcsException e) { + if (GitExecutableValidator.getInstance(project).isGitExecutableValid()) { + Notification notification = new Notification(GitVcs.NOTIFICATION_GROUP_ID, GitBundle.getString("general.error"), e.getLocalizedMessage(), NotificationType.ERROR); + Notifications.Bus.notify(notification, project); + } else { + GitExecutableValidator.getInstance(project).showExecutableNotConfiguredNotification(); + } + } } From bd948eb6360a5602003d6c96e577a9714af9377d Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 14:38:02 +0400 Subject: [PATCH 56/98] IDEA-60149 start AndroidMavenResourceCompiler on Make if local resources are changed --- .../AndroidMavenResourcesCompiler.java | 24 ++++++++++++++++++- .../compiler/ResourcesValidityState.java | 10 ++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidMavenResourcesCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidMavenResourcesCompiler.java index 8c5f26045974..38b7f9dfeeba 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidMavenResourcesCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidMavenResourcesCompiler.java @@ -19,13 +19,16 @@ import com.intellij.compiler.impl.CompilerUtil; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.*; +import com.intellij.openapi.compiler.ex.CompileContextEx; import com.intellij.openapi.module.Module; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.android.compiler.tools.AndroidMavenExecutor; import org.jetbrains.android.dom.manifest.Manifest; import org.jetbrains.android.facet.AndroidFacet; +import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.android.maven.AndroidMavenProvider; import org.jetbrains.android.maven.AndroidMavenUtil; import org.jetbrains.android.util.AndroidUtils; @@ -70,12 +73,20 @@ public class AndroidMavenResourcesCompiler implements SourceGeneratingCompiler { } }; GenerationItem[] generationItems = computation.compute(); + List generatedVFiles = new ArrayList(); for (GenerationItem item : generationItems) { File generatedFile = ((MyGenerationItem)item).myGeneratedFile; if (generatedFile != null) { CompilerUtil.refreshIOFile(generatedFile); + VirtualFile generatedVFile = LocalFileSystem.getInstance().findFileByIoFile(generatedFile); + if (generatedVFile != null) { + generatedVFiles.add(generatedVFile); + } } } + if (context instanceof CompileContextEx) { + ((CompileContextEx)context).markGenerated(generatedVFiles); + } return generationItems; } return EMPTY_GENERATION_ITEM_ARRAY; @@ -147,10 +158,11 @@ public class AndroidMavenResourcesCompiler implements SourceGeneratingCompiler { } } - private static class MyValidityState implements ValidityState { + private static class MyValidityState extends ResourcesValidityState { private final long[] myMavenArtifactsTimespamps; private MyValidityState(Module module) { + super(module); AndroidMavenProvider mavenProvider = AndroidMavenUtil.getMavenProvider(); assert mavenProvider != null; List files = mavenProvider.getMavenDependencyArtifactFiles(module); @@ -160,7 +172,13 @@ public class AndroidMavenResourcesCompiler implements SourceGeneratingCompiler { } } + @Override + protected VirtualFile getResourcesDir(Module module, AndroidFacet facet) { + return AndroidRootUtil.getResourceDir(module); + } + public MyValidityState(DataInput is) throws IOException { + super(is); int c = is.readInt(); myMavenArtifactsTimespamps = new long[c]; for (int i = 0; i < c; i++) { @@ -170,6 +188,9 @@ public class AndroidMavenResourcesCompiler implements SourceGeneratingCompiler { @Override public boolean equalsTo(ValidityState otherState) { + if (!super.equalsTo(otherState)) { + return false; + } if (!(otherState instanceof MyValidityState)) { return false; } @@ -178,6 +199,7 @@ public class AndroidMavenResourcesCompiler implements SourceGeneratingCompiler { @Override public void save(DataOutput out) throws IOException { + super.save(out); out.writeInt(myMavenArtifactsTimespamps.length); for (long timespamp : myMavenArtifactsTimespamps) { out.writeLong(timespamp); diff --git a/plugins/android/src/org/jetbrains/android/compiler/ResourcesValidityState.java b/plugins/android/src/org/jetbrains/android/compiler/ResourcesValidityState.java index 74d48b0f2c25..9b3d734d3385 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/ResourcesValidityState.java +++ b/plugins/android/src/org/jetbrains/android/compiler/ResourcesValidityState.java @@ -23,6 +23,7 @@ import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.android.sdk.AndroidPlatform; import org.jetbrains.android.util.AndroidUtils; +import org.jetbrains.annotations.Nullable; import java.io.DataInput; import java.io.DataOutput; @@ -52,7 +53,7 @@ public class ResourcesValidityState implements ValidityState { if (manifestFile != null) { myResourceTimestamps.put(manifestFile.getPath(), manifestFile.getTimeStamp()); } - VirtualFile resourcesDir = AndroidAptCompiler.getResourceDirForApkCompiler(module, facet); + VirtualFile resourcesDir = getResourcesDir(module, facet); if (resourcesDir != null) { collectFiles(resourcesDir); } @@ -61,7 +62,7 @@ public class ResourcesValidityState implements ValidityState { if (depManifest != null) { myResourceTimestamps.put(depManifest.getPath(), depManifest.getTimeStamp()); } - VirtualFile depResDir = AndroidAptCompiler.getResourceDirForApkCompiler(depFacet.getModule(), depFacet); + VirtualFile depResDir = getResourcesDir(depFacet.getModule(), depFacet); if (depResDir != null) { collectFiles(depResDir); } @@ -72,6 +73,11 @@ public class ResourcesValidityState implements ValidityState { } } + @Nullable + protected VirtualFile getResourcesDir(Module module, AndroidFacet facet) { + return AndroidAptCompiler.getResourceDirForApkCompiler(module, facet); + } + private void collectFiles(VirtualFile resourcesDir) { for (VirtualFile child : resourcesDir.getChildren()) { if (child.isDirectory()) { From 2c9831a0f80e81898aeef79cf543fe8c2e2c7eb8 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 14:38:38 +0400 Subject: [PATCH 57/98] IDEA-60150 do not set some android configuration options to default values when reimporting --- .../android/maven/AndroidFacetImporter.java | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java index b25e0379d24d..2840807970a0 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java @@ -72,7 +72,28 @@ public class AndroidFacetImporter extends FacetImporter Date: Thu, 21 Oct 2010 14:56:40 +0400 Subject: [PATCH 58/98] test editor manager correctly closes editors --- .../com/intellij/testFramework/TestEditorManagerImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java b/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java index 08b08f3f4d08..ac2911842344 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java @@ -44,6 +44,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -148,12 +149,14 @@ import java.util.Map; @Override public void closeAllFiles() { final EditorFactory editorFactory = EditorFactory.getInstance(); - for (Editor editor : myVirtualFile2Editor.values()) { + Iterator it = myVirtualFile2Editor.values().iterator(); + while (it.hasNext()) { + Editor editor = it.next(); + it.remove(); if (editor != null && !editor.isDisposed()){ editorFactory.releaseEditor(editor); } } - myVirtualFile2Editor.clear(); } public Editor openTextEditorEnsureNoFocus(@NotNull OpenFileDescriptor descriptor) { @@ -278,6 +281,7 @@ import java.util.Map; @Override public void projectClosed() { + closeAllFiles(); } @Override From d7263cbf4532fe47fd05844b9e65725a2bdec421 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 15:20:26 +0400 Subject: [PATCH 59/98] IDEA-60155 maven-specific default values in Android facet settings --- .../android/facet/AndroidFacetEditorTab.java | 11 ++++++- .../android/maven/AndroidFacetImporter.java | 23 +------------ .../android/maven/AndroidMavenProvider.java | 3 ++ .../maven/AndroidMavenProviderImpl.java | 33 +++++++++++++++++++ 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java index 9a7538944e0e..b8b69ad35f72 100644 --- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java +++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.java @@ -44,6 +44,7 @@ import gnu.trove.TIntHashSet; import org.jetbrains.android.compiler.AndroidAptCompiler; import org.jetbrains.android.compiler.AndroidCompileUtil; import org.jetbrains.android.compiler.AndroidIdlCompiler; +import org.jetbrains.android.maven.AndroidMavenProvider; import org.jetbrains.android.maven.AndroidMavenUtil; import org.jetbrains.android.sdk.AndroidPlatform; import org.jetbrains.android.sdk.AndroidPlatformChooser; @@ -147,7 +148,15 @@ public class AndroidFacetEditorTab extends FacetEditorTab { myResetPathsButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - resetOptions(new AndroidFacetConfiguration()); + AndroidFacetConfiguration configuration = new AndroidFacetConfiguration(); + Module module = myContext.getModule(); + if (AndroidMavenUtil.isMavenizedModule(module)) { + AndroidMavenProvider mavenProvider = AndroidMavenUtil.getMavenProvider(); + if (mavenProvider != null) { + mavenProvider.setPathsToDefault(module, configuration); + } + } + resetOptions(configuration); } }); diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java index 2840807970a0..7913b6f4f779 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java @@ -16,7 +16,6 @@ package org.jetbrains.android.maven; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.SdkConstants; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.libraries.Library; @@ -73,27 +72,7 @@ public class AndroidFacetImporter extends FacetImporter getMavenDependencyArtifactFiles(@NotNull Module module); + + void setPathsToDefault(@NotNull Module module, AndroidFacetConfiguration facetConfiguration); } diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java index ff3ebddd5e30..edc0165178d4 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java @@ -15,7 +15,11 @@ */ package org.jetbrains.android.maven; +import com.android.sdklib.SdkConstants; import com.intellij.openapi.module.Module; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VfsUtil; +import org.jetbrains.android.facet.AndroidFacetConfiguration; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.model.MavenArtifact; import org.jetbrains.idea.maven.project.MavenProject; @@ -31,6 +35,27 @@ import java.util.List; */ public class AndroidMavenProviderImpl implements AndroidMavenProvider { + public static void setPathsToDefault(MavenProject mavenProject, Module module, AndroidFacetConfiguration configuration) { + String moduleDirPath = FileUtil.toSystemIndependentName(new File(module.getModuleFilePath()).getParent()); + if (moduleDirPath != null) { + String genSources = FileUtil.toSystemIndependentName(mavenProject.getGeneratedSourcesDirectory(false)); + + if (VfsUtil.isAncestor(new File(moduleDirPath), new File(genSources), true)) { + String genRelativePath = FileUtil.getRelativePath(moduleDirPath, genSources, '/'); + if (genRelativePath != null) { + configuration.GEN_FOLDER_RELATIVE_PATH_APT = '/' + genRelativePath + "/r"; + configuration.GEN_FOLDER_RELATIVE_PATH_AIDL = '/' + genRelativePath + "/aidl"; + + configuration.USE_CUSTOM_APK_RESOURCE_FOLDER = true; + configuration.CUSTOM_APK_RESOURCE_FOLDER = '/' + genRelativePath + "/combined-resources/" + SdkConstants.FD_RES; + } + } + + configuration.COPY_RESOURCES_FROM_ARTIFACTS = true; + configuration.ENABLE_AAPT_COMPILER = false; + } + } + @Override public boolean isMavenizedModule(@NotNull Module module) { MavenProjectsManager mavenProjectsManager = MavenProjectsManager.getInstance(module.getProject()); @@ -50,4 +75,12 @@ public class AndroidMavenProviderImpl implements AndroidMavenProvider { } return result; } + + @Override + public void setPathsToDefault(@NotNull Module module, AndroidFacetConfiguration facetConfiguration) { + MavenProject mavenProject = MavenProjectsManager.getInstance(module.getProject()).findProject(module); + if (mavenProject != null) { + setPathsToDefault(mavenProject, module, facetConfiguration); + } + } } From 707f42ae1796a98f8551fedb08254381b12c8ddc Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 15:37:20 +0400 Subject: [PATCH 60/98] IDEA-60085 clean up, fix packaging of native libs --- .../android/compiler/AndroidPackagingCompiler.java | 2 +- .../android/compiler/tools/AndroidApkBuilder.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java index 2101e2ee65e2..f9a6c90a29cd 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java @@ -323,7 +323,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler { ArrayList nativeLibs = new ArrayList(); for (VirtualFile nativeLibFolder : nativeLibFolders) { for (VirtualFile child : nativeLibFolder.getChildren()) { - AndroidApkBuilder.collectNativeLibraries(nativeLibFolder, child, nativeLibs); + AndroidApkBuilder.collectNativeLibraries(child, nativeLibs); } } for (VirtualFile nativeLib : nativeLibs) { diff --git a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java index 6386895577b8..9f9b8145a864 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java +++ b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java @@ -213,11 +213,11 @@ public class AndroidApkBuilder { private static void writeNativeLibraries(SignedJarBuilder builder, VirtualFile nativeLibsFolder, VirtualFile child) throws IOException { ArrayList list = new ArrayList(); - collectNativeLibraries(nativeLibsFolder, child, list); - String relativePath = VfsUtil.getRelativePath(child, nativeLibsFolder, File.separatorChar); - String libsDirPathInApk = FileUtil.toSystemIndependentName(SdkConstants.FD_APK_NATIVE_LIBS + File.separator + relativePath); + collectNativeLibraries(child, list); for (VirtualFile file : list) { - builder.writeFile(toIoFile(file), libsDirPathInApk); + String relativePath = VfsUtil.getRelativePath(file, nativeLibsFolder, File.separatorChar); + String path = FileUtil.toSystemIndependentName(SdkConstants.FD_APK_NATIVE_LIBS + File.separator + relativePath); + builder.writeFile(toIoFile(file), path); } } @@ -228,7 +228,7 @@ public class AndroidApkBuilder { return result; } - public static void collectNativeLibraries(@NotNull VirtualFile libsDir, @NotNull VirtualFile file, @NotNull List result) { + public static void collectNativeLibraries(@NotNull VirtualFile file, @NotNull List result) { if (!file.isDirectory()) { String ext = file.getExtension(); if (AndroidUtils.EXT_NATIVE_LIB.equalsIgnoreCase(ext)) { @@ -237,7 +237,7 @@ public class AndroidApkBuilder { } else if (JavaResourceFilter.checkFolderForPackaging(file.getName())) { for (VirtualFile child : file.getChildren()) { - collectNativeLibraries(libsDir, child, result); + collectNativeLibraries(child, result); } } } From 1a6e12b31c85e864f1602e085b09c58503ff51be Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Thu, 21 Oct 2010 15:49:40 +0400 Subject: [PATCH 61/98] IDEA-58288 Throwable at com.intellij.openapi.diagnostic.Logger.assertTrue --- .../openapi/options/SchemesManagerImpl.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java index 1df82f9e8eb0..4d928f5e2d4f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java @@ -24,10 +24,7 @@ import com.intellij.openapi.components.impl.stores.StorageUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.DocumentRunnable; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.InvalidDataException; -import com.intellij.openapi.util.JDOMUtil; -import com.intellij.openapi.util.WriteExternalException; +import com.intellij.openapi.util.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringHash; import com.intellij.openapi.util.text.StringUtil; @@ -330,16 +327,27 @@ public class SchemesManagerImpl() { + @Override + public VirtualFile compute() { + VirtualFile file = myVFSBaseDir.findChild(fileName); + try { + if (file == null) file = myVFSBaseDir.createChildData(SchemesManagerImpl.this, fileName); + if (!Arrays.equals(file.contentsToByteArray(), text)) { + file.setBinaryContent(text); + } + } + catch (IOException e) { + ex[0] = e; + } - } - if (!Arrays.equals(file.contentsToByteArray(), text)) { - file.setBinaryContent(text); - } + return file; + } + }); - return file; + if (ex[0] != null) throw ex[0]; + return _file; } private String checkFileNameIsFree(final String subpath, final String schemeName) { From 086a0ecf424daac6b874ae0dedf20586e6584cfb Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Oct 2010 15:55:43 +0400 Subject: [PATCH 62/98] Git: storing path to git in the application settings instead of project settings. IDEA-59824 Also couldn't help removing stub javadocs for private fields. --- plugins/git4idea/src/git4idea/GitVcs.java | 24 +-- .../src/git4idea/commands/GitHandler.java | 146 ++++++------------ .../config/GitVcsApplicationSettings.java | 14 +- .../src/git4idea/config/GitVcsPanel.form | 2 +- .../src/git4idea/config/GitVcsPanel.java | 76 +++------ .../src/git4idea/config/GitVcsSettings.java | 95 ++---------- .../src/git4idea/vfs/GitIgnoreTracker.java | 2 +- 7 files changed, 103 insertions(+), 256 deletions(-) diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java index 2e0a49f8f505..70761bcdd287 100644 --- a/plugins/git4idea/src/git4idea/GitVcs.java +++ b/plugins/git4idea/src/git4idea/GitVcs.java @@ -54,10 +54,7 @@ import git4idea.checkin.GitCommitAndPushExecutor; import git4idea.checkout.branches.GitBranchConfigurations; import git4idea.commands.GitCommand; import git4idea.commands.GitSimpleHandler; -import git4idea.config.GitExecutableValidator; -import git4idea.config.GitVcsConfigurable; -import git4idea.config.GitVcsSettings; -import git4idea.config.GitVersion; +import git4idea.config.*; import git4idea.diff.GitDiffProvider; import git4idea.diff.GitTreeDiffProvider; import git4idea.history.GitHistoryProvider; @@ -132,7 +129,7 @@ public class GitVcs extends AbstractVcs { /** * project vcs settings */ - private final GitVcsSettings mySettings; + private final GitVcsApplicationSettings myAppSettings; /** * configuration support */ @@ -213,6 +210,7 @@ public class GitVcs extends AbstractVcs { * If true, the vcs was activated */ private boolean isActivated; + private final GitVcsSettings myProjectSettings; public static GitVcs getInstance(@NotNull Project project) { @@ -227,10 +225,12 @@ public class GitVcs extends AbstractVcs { @NotNull final GitDiffProvider gitDiffProvider, @NotNull final GitHistoryProvider gitHistoryProvider, @NotNull final GitRollbackEnvironment gitRollbackEnvironment, - @NotNull final GitVcsSettings gitSettings) { + @NotNull final GitVcsApplicationSettings gitSettings, + @NotNull final GitVcsSettings gitProjectSettings) { super(project, NAME); myVcsManager = gitVcsManager; - mySettings = gitSettings; + myAppSettings = gitSettings; + myProjectSettings = gitProjectSettings; myChangeProvider = gitChangeProvider; myCheckinEnvironment = gitCheckinEnvironment; myAnnotationProvider = gitAnnotationProvider; @@ -238,8 +238,8 @@ public class GitVcs extends AbstractVcs { myHistoryProvider = gitHistoryProvider; myRollbackEnvironment = gitRollbackEnvironment; myRevSelector = new GitRevisionSelector(); - myConfigurable = new GitVcsConfigurable(mySettings, myProject); - myUpdateEnvironment = new GitUpdateEnvironment(myProject, this, mySettings); + myConfigurable = new GitVcsConfigurable(myProjectSettings, myProject); + myUpdateEnvironment = new GitUpdateEnvironment(myProject, this, myProjectSettings); myMergeProvider = new GitMergeProvider(myProject); myReverseMergeProvider = new GitMergeProvider(myProject, true); myCommittedChangeListProvider = new GitCommittedChangeListProvider(myProject); @@ -606,8 +606,8 @@ public class GitVcs extends AbstractVcs { * @return vcs settings for the current project */ @NotNull - public GitVcsSettings getSettings() { - return mySettings; + public GitVcsApplicationSettings getAppSettings() { + return myAppSettings; } /** @@ -624,7 +624,7 @@ public class GitVcs extends AbstractVcs { * Check version and report problem */ public void checkVersion() { - final String executable = mySettings.getGitExecutable(); + final String executable = myAppSettings.getPathToGit(); synchronized (myCheckingVersion) { if (myVersion != null && myVersionCheckExcecutable.equals(executable)) { return; diff --git a/plugins/git4idea/src/git4idea/commands/GitHandler.java b/plugins/git4idea/src/git4idea/commands/GitHandler.java index bed5e5d12974..9e39a986c89b 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitHandler.java @@ -27,6 +27,7 @@ import com.intellij.util.EventDispatcher; import com.intellij.util.Processor; import git4idea.GitUtil; import git4idea.GitVcs; +import git4idea.config.GitVcsApplicationSettings; import git4idea.config.GitVcsSettings; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -42,104 +43,50 @@ import java.util.*; * A handler for git commands */ public abstract class GitHandler { - /** - * Error codes that are ignored for the handler - */ - private final HashSet myIgnoredErrorCodes = new HashSet(); - /** - * Error list - */ - private final List myErrors = Collections.synchronizedList(new LinkedList()); - /** - * the logger - */ - private static final Logger log = Logger.getInstance(GitHandler.class.getName()); - /** - * a command line - */ - final GeneralCommandLine myCommandLine; - /** - * process - */ - @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) Process myProcess; - /** - * If true, the standard output is not copied to version control console - */ - private boolean myStdoutSuppressed; - /** - * If true, the standard error is not copied to version control console - */ - private boolean myStderrSuppressed; - /** - * the context project (might be a default project) - */ - final Project myProject; - /** - * The descriptor for the command to be executed - */ - protected final GitCommand myCommand; - /** - * the working directory - */ - private final File myWorkingDirectory; - /** - * the flag indicating that environment has been cleaned up, by default is true because there is nothing to clean - */ - private boolean myEnvironmentCleanedUp = true; - /** - * the handler number - */ - private int myHandlerNo; - /** - * The processor for stdin - */ - private Processor myInputProcessor; - /** - * if true process might be cancelled - */ - // note that access is safe because it accessed in unsynchronized block only after process is started, and it does not change after that - @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private boolean myIsCancellable = true; - /** - * exit code or null if exit code is not yet available - */ - private Integer myExitCode; - /** - * Character set to use for IO - */ - @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) @NonNls private Charset myCharset = Charset.forName("UTF-8"); - /** - * No ssh flag - */ - @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private boolean myNoSSHFlag = false; - /** - * listeners - */ - private final EventDispatcher myListeners = EventDispatcher.create(GitHandlerListener.class); - /** - * if true, the command execution is not logged in version control view - */ - @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) private boolean mySilent; - /** - * The vcs object - */ + protected final Project myProject; + protected final GitCommand myCommand; + + private final HashSet myIgnoredErrorCodes = new HashSet(); // Error codes that are ignored for the handler + private final List myErrors = Collections.synchronizedList(new LinkedList()); + private static final Logger log = Logger.getInstance(GitHandler.class.getName()); + final GeneralCommandLine myCommandLine; + @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) + Process myProcess; + + private boolean myStdoutSuppressed; // If true, the standard output is not copied to version control console + private boolean myStderrSuppressed; // If true, the standard error is not copied to version control console + private final File myWorkingDirectory; + + private boolean myEnvironmentCleanedUp = true; // the flag indicating that environment has been cleaned up, by default is true because there is nothing to clean + private int myHandlerNo; + private Processor myInputProcessor; // The processor for stdin + + // if true process might be cancelled + // note that access is safe because it accessed in unsynchronized block only after process is started, and it does not change after that + @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) + private boolean myIsCancellable = true; + + private Integer myExitCode; // exit code or null if exit code is not yet available + + @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) + @NonNls + private Charset myCharset = Charset.forName("UTF-8"); // Character set to use for IO + + @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) + private boolean myNoSSHFlag = false; + + private final EventDispatcher myListeners = EventDispatcher.create(GitHandlerListener.class); + @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) + private boolean mySilent; // if true, the command execution is not logged in version control view + protected final GitVcs myVcs; - /** - * The environment - */ private final Map myEnv; - /** - * The settings object - */ - private GitVcsSettings mySettings; - /** - * Suspend action used by {@link #suspendWriteLock()} - */ - private Runnable mySuspendAction; - /** - * Resume action used by {@link #resumeWriteLock()} - */ - private Runnable myResumeAction; + private GitVcsApplicationSettings myAppSettings; + private GitVcsSettings myProjectSettings; + + private Runnable mySuspendAction; // Suspend action used by {@link #suspendWriteLock()} + private Runnable myResumeAction; // Resume action used by {@link #resumeWriteLock()} /** @@ -152,7 +99,8 @@ public abstract class GitHandler { protected GitHandler(@NotNull Project project, @NotNull File directory, @NotNull GitCommand command) { myProject = project; myCommand = command; - mySettings = GitVcsSettings.getInstance(project); + myAppSettings = GitVcsApplicationSettings.getInstance(); + myProjectSettings = GitVcsSettings.getInstance(myProject); myEnv = new HashMap(System.getenv()); if (!myEnv.containsKey("HOME")) { String home = System.getProperty("user.home"); @@ -166,8 +114,8 @@ public abstract class GitHandler { } myWorkingDirectory = directory; myCommandLine = new GeneralCommandLine(); - if (mySettings != null) { - myCommandLine.setExePath(mySettings.getGitExecutable()); + if (myAppSettings != null) { + myCommandLine.setExePath(myAppSettings.getPathToGit()); } myCommandLine.setWorkingDirectory(myWorkingDirectory); if (command.name().length() > 0) { @@ -422,7 +370,7 @@ public abstract class GitHandler { if (log.isDebugEnabled()) { log.debug("running git: " + myCommandLine.getCommandLineString() + " in " + myWorkingDirectory); } - if (!myNoSSHFlag && mySettings.isIdeaSsh()) { + if (!myNoSSHFlag && myProjectSettings.isIdeaSsh()) { GitSSHService ssh = GitSSHIdeaService.getInstance(); myEnv.put(GitSSHHandler.GIT_SSH_ENV, ssh.getScriptPath().getPath()); myHandlerNo = ssh.registerHandler(new GitSSHGUIHandler(myProject)); diff --git a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java index 6935852252b9..964589350565 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java @@ -16,6 +16,7 @@ package git4idea.config; import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.SystemInfo; @@ -54,6 +55,10 @@ public class GitVcsApplicationSettings implements PersistentStateComponent

- + diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java index 6bf864833fa6..7e7d39b854e8 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java @@ -34,58 +34,19 @@ import java.awt.event.ActionListener; * Git VCS configuration panel */ public class GitVcsPanel { - /** - * Test git executable button - */ - private JButton myTestButton; - /** - * The root panel - */ - private JComponent myPanel; - /** - * The git path field - */ + private JButton myTestButton; // Test git executable + private JComponent myRootPanel; private TextFieldWithBrowseButton myGitField; - /** - * Type of SSH executable to use - */ - private JComboBox mySSHExecutableComboBox; - /** - * The conversion policy - */ - private JComboBox myConvertTextFilesComboBox; - /** - * The confirmation checkbox - */ - private JCheckBox myAskBeforeConversionsCheckBox; - /** - * The if selected, the branches widget is enabled in the status bar - */ - private JCheckBox myEnableBranchesWidgetCheckBox; - /** - * The project - */ + private JComboBox mySSHExecutableComboBox; // Type of SSH executable to use + private JComboBox myConvertTextFilesComboBox; // The conversion policy + private JCheckBox myAskBeforeConversionsCheckBox; // The confirmation checkbox + private JCheckBox myEnableBranchesWidgetCheckBox; // if selected, the branches widget is enabled in the status bar private final Project myProject; - /** - * The settings component - */ - private final GitVcsSettings mySettings; - /** - * IDEA ssh value - */ - private static final String IDEA_SSH = - ApplicationNamesInfo.getInstance().getProductName() + " " + GitBundle.getString("git.vcs.config.ssh.mode.idea"); - /** - * Native SSH value - */ - private static final String NATIVE_SSH = GitBundle.getString("git.vcs.config.ssh.mode.native"); - /** - * IDEA ssh value - */ + private final GitVcsApplicationSettings myAppSettings; + private final GitVcsSettings myProjectSettings; + private static final String IDEA_SSH = ApplicationNamesInfo.getInstance().getProductName() + " " + GitBundle.getString("git.vcs.config.ssh.mode.idea"); // IDEA ssh value + private static final String NATIVE_SSH = GitBundle.getString("git.vcs.config.ssh.mode.native"); // Native SSH value private static final String CRLF_CONVERT_TO_PROJECT = GitBundle.getString("git.vcs.config.convert.project"); - /** - * Native SSH value - */ private static final String CRLF_DO_NOT_CONVERT = GitBundle.getString("git.vcs.config.convert.do.not.convert"); /** @@ -94,14 +55,15 @@ public class GitVcsPanel { * @param project the context project */ public GitVcsPanel(@NotNull Project project) { - mySettings = GitVcsSettings.getInstance(project); + myAppSettings = GitVcsApplicationSettings.getInstance(); + myProjectSettings = GitVcsSettings.getInstance(project); myProject = project; mySSHExecutableComboBox.addItem(IDEA_SSH); mySSHExecutableComboBox.addItem(NATIVE_SSH); mySSHExecutableComboBox.setSelectedItem(GitVcsSettings.isDefaultIdeaSsh() ? IDEA_SSH : NATIVE_SSH); mySSHExecutableComboBox .setToolTipText(GitBundle.message("git.vcs.config.ssh.mode.tooltip", ApplicationNamesInfo.getInstance().getFullProductName())); - myAskBeforeConversionsCheckBox.setSelected(mySettings.askBeforeLineSeparatorConversion()); + myAskBeforeConversionsCheckBox.setSelected(myProjectSettings.askBeforeLineSeparatorConversion()); myTestButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { testConnection(); @@ -119,8 +81,8 @@ public class GitVcsPanel { * Test availability of the connection */ private void testConnection() { - if (mySettings != null) { - mySettings.setGitExecutable(myGitField.getText()); + if (myAppSettings != null) { + myAppSettings.setPathToGit(myGitField.getText()); } final String s; try { @@ -143,7 +105,7 @@ public class GitVcsPanel { * @return the configuration panel */ public JComponent getPanel() { - return myPanel; + return myRootPanel; } /** @@ -152,7 +114,7 @@ public class GitVcsPanel { * @param settings the settings to load */ public void load(@NotNull GitVcsSettings settings) { - myGitField.setText(settings.getGitExecutable()); + myGitField.setText(settings.getAppSettings().getPathToGit()); mySSHExecutableComboBox.setSelectedItem(settings.isIdeaSsh() ? IDEA_SSH : NATIVE_SSH); myAskBeforeConversionsCheckBox.setSelected(settings.askBeforeLineSeparatorConversion()); myConvertTextFilesComboBox.setSelectedItem(crlfPolicyItem(settings)); @@ -187,7 +149,7 @@ public class GitVcsPanel { * @param settings the settings to load */ public boolean isModified(@NotNull GitVcsSettings settings) { - return !settings.getGitExecutable().equals(myGitField.getText()) || + return !settings.getAppSettings().getPathToGit().equals(myGitField.getText()) || (settings.isIdeaSsh() != IDEA_SSH.equals(mySSHExecutableComboBox.getSelectedItem())) || !crlfPolicyItem(settings).equals(myConvertTextFilesComboBox.getSelectedItem()) || settings.askBeforeLineSeparatorConversion() != myAskBeforeConversionsCheckBox.isSelected() || @@ -200,7 +162,7 @@ public class GitVcsPanel { * @param settings the settings object */ public void save(@NotNull GitVcsSettings settings) { - settings.setGitExecutable(myGitField.getText()); + settings.getAppSettings().setPathToGit(myGitField.getText()); settings.setIdeaSsh(IDEA_SSH.equals(mySSHExecutableComboBox.getSelectedItem())); Object policyItem = myConvertTextFilesComboBox.getSelectedItem(); GitVcsSettings.ConversionPolicy conversionPolicy; diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index 1675509780f9..fa472c399aa7 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -36,63 +36,26 @@ import java.util.List; id = "ws", file = "$WORKSPACE_FILE$")}) public class GitVcsSettings implements PersistentStateComponent { - /** - * Default SSH policy - */ - private static final SshExecutable DEFAULT_SSH = SshExecutable.IDEA_SSH; - /** - * The git application settings - */ - private final GitVcsApplicationSettings myAppSettings; - /** - * The default executable for GIT - */ - private String myGitExecutable; - /** - * The previously entered authors of the commit (up to {@value #PREVIOUS_COMMIT_AUTHORS_LIMIT}) - */ - private List myCommitAuthors = new ArrayList(); - /** - * Limit for previous commit authors - */ - public static final int PREVIOUS_COMMIT_AUTHORS_LIMIT = 16; - /** - * Checkout includes tags - */ - private boolean myCheckoutIncludesTags = false; - /** - * IDEA SSH should be used instead of native SSH. - */ - private SshExecutable mySshExecutable = DEFAULT_SSH; - /** - * The policy that specifies how files are saved before update or rebase - */ - private UpdateChangesPolicy myUpdateChangesPolicy = UpdateChangesPolicy.STASH; - /** - * The type of update operation to perform - */ - private UpdateType myUpdateType = UpdateType.BRANCH_DEFAULT; - /** - * The crlf conversion policy - */ - private ConversionPolicy myLineSeparatorsConversion = ConversionPolicy.PROJECT_LINE_SEPARATORS; - /** - * If true, the dialog is shown with conversion options - */ - private boolean myAskBeforeLineSeparatorConversion = true; - /** - * The policy used in push active branches dialog - */ - private UpdateChangesPolicy myPushActiveBranchesRebaseSavePolicy = UpdateChangesPolicy.STASH; - /** - * The constructor - * - * @param appSettings the application settings instance - */ + public static final int PREVIOUS_COMMIT_AUTHORS_LIMIT = 16; // Limit for previous commit authors + private static final SshExecutable DEFAULT_SSH = SshExecutable.IDEA_SSH; // Default SSH policy + + private final GitVcsApplicationSettings myAppSettings; + private final List myCommitAuthors = new ArrayList(); // The previously entered authors of the commit (up to {@value #PREVIOUS_COMMIT_AUTHORS_LIMIT}) + private boolean myCheckoutIncludesTags = false; + private SshExecutable mySshExecutable = DEFAULT_SSH; // IDEA SSH should be used instead of native SSH. + private UpdateChangesPolicy myUpdateChangesPolicy = UpdateChangesPolicy.STASH; // The policy that specifies how files are saved before update or rebase + private UpdateType myUpdateType = UpdateType.BRANCH_DEFAULT; // The type of update operation to perform + private ConversionPolicy myLineSeparatorsConversion = ConversionPolicy.PROJECT_LINE_SEPARATORS; // The crlf conversion policy + private boolean myAskBeforeLineSeparatorConversion = true; // If true, the dialog is shown with conversion options + private UpdateChangesPolicy myPushActiveBranchesRebaseSavePolicy = UpdateChangesPolicy.STASH; // The policy used in push active branches dialog + public GitVcsSettings(GitVcsApplicationSettings appSettings) { myAppSettings = appSettings; - myGitExecutable = myAppSettings.defaultGit(); + } + + public GitVcsApplicationSettings getAppSettings() { + return myAppSettings; } /** @@ -177,24 +140,6 @@ public class GitVcsSettings implements PersistentStateComponent Date: Thu, 21 Oct 2010 16:13:21 +0400 Subject: [PATCH 63/98] cidr: failing tests fixed --- .../src/com/intellij/testFramework/TestEditorManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java b/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java index ac2911842344..378fa1898df7 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/TestEditorManagerImpl.java @@ -290,10 +290,9 @@ import java.util.Map; @Override public void closeFile(@NotNull VirtualFile file) { - Editor editor = myVirtualFile2Editor.get(file); + Editor editor = myVirtualFile2Editor.remove(file); if (editor != null){ EditorFactory.getInstance().releaseEditor(editor); - myVirtualFile2Editor.remove(file); } if (file == myActiveFile) myActiveFile = null; } From 6f69cb05d14a8b4d78faa94f33da1f784a383af0 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 21 Oct 2010 13:01:06 +0400 Subject: [PATCH 64/98] do not suggest 1-names when inplace rename is performed --- .../codeStyle/JavaCodeStyleManagerImpl.java | 12 +++++++++- .../rename/JavaNameSuggestionProvider.java | 2 +- .../psi/codeStyle/JavaCodeStyleManager.java | 23 +++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java index 73db68d9c3d5..d2c94200f5c5 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java @@ -931,10 +931,20 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager { } @NotNull - public SuggestedNameInfo suggestUniqueVariableName(@NotNull final SuggestedNameInfo baseNameInfo, PsiElement place, boolean lookForward) { + public SuggestedNameInfo suggestUniqueVariableName(@NotNull final SuggestedNameInfo baseNameInfo, + PsiElement place, + boolean ignorePlaceName, + boolean lookForward) { final String[] names = baseNameInfo.names; final LinkedHashSet uniqueNames = new LinkedHashSet(names.length); for (String name : names) { + if (ignorePlaceName && place instanceof PsiNamedElement) { + final String placeName = ((PsiNamedElement)place).getName(); + if (Comparing.strEqual(placeName, name)) { + uniqueNames.add(name); + continue; + } + } uniqueNames.add(suggestUniqueVariableName(name, place, lookForward)); } diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java index 8b472d7ee4f7..b04911d0d26c 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java @@ -38,7 +38,7 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider { String initialName = UsageViewUtil.getShortName(element); SuggestedNameInfo info = suggestNamesForElement(element); if (info != null) { - info = JavaCodeStyleManager.getInstance(element.getProject()).suggestUniqueVariableName(info, element, true); + info = JavaCodeStyleManager.getInstance(element.getProject()).suggestUniqueVariableName(info, element, true, true); } String parameterName = null; diff --git a/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java b/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java index 7d4122eef3ca..712e64f30ebd 100644 --- a/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java +++ b/java/openapi/src/com/intellij/psi/codeStyle/JavaCodeStyleManager.java @@ -148,7 +148,26 @@ public abstract class JavaCodeStyleManager { * @param lookForward if true, the existing variables are searched in both directions; if false - only backward * @return the generated unique name, */ - @NotNull public abstract SuggestedNameInfo suggestUniqueVariableName(@NotNull SuggestedNameInfo baseNameInfo, PsiElement place, boolean lookForward); + @NotNull + public SuggestedNameInfo suggestUniqueVariableName(@NotNull SuggestedNameInfo baseNameInfo, + PsiElement place, + boolean lookForward) { + return suggestUniqueVariableName(baseNameInfo, place, false, lookForward); + } + + /** + * Suggests a unique name for the variable used at the specified location. + * + * + * @param baseNameInfo the base name info for the variable. + * @param place the location where the variable will be used. + * @param ignorePlaceName if true and place is PsiNamedElement, place.getName() would be still treated as unique name + * @param lookForward if true, the existing variables are searched in both directions; if false - only backward @return the generated unique name, + */ + @NotNull public abstract SuggestedNameInfo suggestUniqueVariableName(@NotNull SuggestedNameInfo baseNameInfo, + PsiElement place, + boolean ignorePlaceName, + boolean lookForward); /** * Replaces all references to Java classes in the contents of the specified element, @@ -172,4 +191,4 @@ public abstract class JavaCodeStyleManager { @Nullable public abstract Collection findRedundantImports(PsiJavaFile file); -} \ No newline at end of file +} From f8039c78d769173940b6f30a5395267309c12405 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 21 Oct 2010 16:18:25 +0400 Subject: [PATCH 65/98] pass name suggestions to inplace rename if not default --- .../IntroduceVariableBase.java | 3 +- .../IntroduceVariableDialog.java | 6 +--- .../inplace/VariableInplaceRenameHandler.java | 11 +------ .../inplace/VariableInplaceRenamer.java | 33 ++++++++++++------- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index b1fdfebdcc98..2bd2bb57b300 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -462,6 +462,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme final IntroduceVariableSettings settings = getSettings(project, editor, expr, occurrences, typeSelectorManager, inFinalContext, hasWriteAccess, validator, choice); if (!settings.isOK()) return; + final SuggestedNameInfo suggestedName = getSuggestedName(typeSelectorManager.getDefaultType(), expr); final Runnable runnable = introduce(project, expr, editor, anchorStatement, tempContainer, occurrences, anchorStatementIfAll, settings, variable); CommandProcessor.getInstance().executeCommand( @@ -473,7 +474,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme PsiVariable elementToRename = variable.get().getElement(); if (elementToRename != null) { editor.getCaretModel().moveToOffset(elementToRename.getTextOffset()); - new VariableInplaceRenamer(elementToRename, editor).performInplaceRename(false); + new VariableInplaceRenamer(elementToRename, editor).performInplaceRename(false, new LinkedHashSet(Arrays.asList(suggestedName.names))); } } } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java index d281d4a9c073..9ce3d058fb46 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java @@ -170,11 +170,7 @@ class IntroduceVariableDialog extends DialogWrapper implements IntroduceVariable myNameSuggestionsManager = new NameSuggestionsManager(myTypeSelector, myNameField, new NameSuggestionsGenerator() { public SuggestedNameInfo getSuggestedNameInfo(PsiType type) { - final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(myProject); - final SuggestedNameInfo nameInfo = codeStyleManager.suggestVariableName(VariableKind.LOCAL_VARIABLE, null, myExpression, type); - final String[] strings = JavaCompletionUtil.completeVariableNameForRefactoring(codeStyleManager, type, VariableKind.LOCAL_VARIABLE, nameInfo); - final SuggestedNameInfo.Delegate delegate = new SuggestedNameInfo.Delegate(strings, nameInfo); - return codeStyleManager.suggestUniqueVariableName(delegate, myExpression, true); + return IntroduceVariableBase.getSuggestedName(type, myExpression); } }); myNameSuggestionsManager.setLabelsFor(type, namePrompt); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java index 5250c26ab0ba..638a5afeef84 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java @@ -97,17 +97,8 @@ public class VariableInplaceRenameHandler implements RenameHandler { @Nullable public VariableInplaceRenamer doRename(final PsiElement elementToRename, final Editor editor, final DataContext dataContext) { - return doRename(elementToRename, editor, dataContext, true); - } - - @Nullable - public VariableInplaceRenamer doRename(final PsiElement elementToRename, - final Editor editor, - final DataContext dataContext, - boolean processTextOccurrences) { - VariableInplaceRenamer renamer = createRenamer(elementToRename, editor); - boolean startedRename = renamer == null ? false : renamer.performInplaceRename(processTextOccurrences); + boolean startedRename = renamer == null ? false : renamer.performInplaceRename(); if (!startedRename) { try { diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java index 77202526d40c..da7a487eddb9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java @@ -94,10 +94,10 @@ public class VariableInplaceRenamer { } public boolean performInplaceRename() { - return performInplaceRename(true); + return performInplaceRename(true, null); } - public boolean performInplaceRename(boolean processTextOccurrences) { + public boolean performInplaceRename(boolean processTextOccurrences, LinkedHashSet nameSuggestions) { if (InjectedLanguageUtil.isInInjectedLanguagePrefixSuffix(myElementToRename)) { return false; } @@ -170,9 +170,9 @@ public class VariableInplaceRenamer { PsiElement selectedElement = getSelectedInEditorElement(nameIdentifier, refs, offset); if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, myElementToRename)) return true; - if (nameIdentifier != null) addVariable(nameIdentifier, selectedElement, builder); + if (nameIdentifier != null) addVariable(nameIdentifier, selectedElement, builder, nameSuggestions); for (PsiReference ref : refs) { - addVariable(ref, selectedElement, builder, offset); + addVariable(ref, selectedElement, builder, offset, nameSuggestions); } final PsiElement scope1 = scope; @@ -391,10 +391,14 @@ public class VariableInplaceRenamer { return range.getStartOffset() <= offset && offset <= range.getEndOffset(); } - private void addVariable(final PsiReference reference, final PsiElement selectedElement, final TemplateBuilderImpl builder, int offset) { + private void addVariable(final PsiReference reference, + final PsiElement selectedElement, + final TemplateBuilderImpl builder, + int offset, + final LinkedHashSet names) { if (reference.getElement() == selectedElement && contains(reference.getRangeInElement().shiftRight(selectedElement.getTextRange().getStartOffset()), offset)) { - Expression expression = new MyExpression(myElementToRename.getName()); + Expression expression = new MyExpression(myElementToRename.getName(), names); builder.replaceElement(reference, PRIMARY_VARIABLE_NAME, expression, true); } else { @@ -402,9 +406,12 @@ public class VariableInplaceRenamer { } } - private void addVariable(final PsiElement element, final PsiElement selectedElement, final TemplateBuilderImpl builder) { + private void addVariable(final PsiElement element, + final PsiElement selectedElement, + final TemplateBuilderImpl builder, + final LinkedHashSet names) { if (element == selectedElement) { - Expression expression = new MyExpression(myElementToRename.getName()); + Expression expression = new MyExpression(myElementToRename.getName(), names); builder.replaceElement(element, PRIMARY_VARIABLE_NAME, expression, true); } else { @@ -416,11 +423,13 @@ public class VariableInplaceRenamer { private final String myName; private final LookupElement[] myLookupItems; - private MyExpression(String name) { + private MyExpression(String name, LinkedHashSet names) { myName = name; - Set names = new HashSet(); - for(NameSuggestionProvider provider: Extensions.getExtensions(NameSuggestionProvider.EP_NAME)) { - provider.getSuggestedNames(myElementToRename, myElementToRename, names); + if (names == null) { + names = new LinkedHashSet(); + for(NameSuggestionProvider provider: Extensions.getExtensions(NameSuggestionProvider.EP_NAME)) { + provider.getSuggestedNames(myElementToRename, myElementToRename, names); + } } myLookupItems = new LookupElement[names.size()]; final Iterator iterator = names.iterator(); From 2fd23c27150f321acd3ab54a4134753e7166fc88 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 21 Oct 2010 14:25:23 +0200 Subject: [PATCH 66/98] IDEA-60135 fix quickfix of "Scope of variable is too broad" inspection --- .../src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java index 47c3be83a4e5..8db0b611e829 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java @@ -115,9 +115,9 @@ public class TooBroadScopeInspection extends BaseInspection ProblemDescriptor descriptor) throws IncorrectOperationException { - final PsiElement variableIdentifier = - descriptor.getPsiElement(); - if (!(variableIdentifier instanceof PsiVariable)) { + final PsiElement variableIdentifier = descriptor.getPsiElement(); + if (!(variableIdentifier instanceof PsiIdentifier)) + { return; } final PsiVariable variable = From 6b4711fd163180a5021ed8c123525bb5eb9ce0d7 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 21 Oct 2010 16:25:05 +0400 Subject: [PATCH 67/98] IDEA-60125 False positive: static field is unused IDEA-58929 flex: fields, variables, functions occasionally marked as unused (while they're actually used) --- .../src/com/intellij/codeInspection/LocalInspectionTool.java | 2 +- .../codeInsight/daemon/impl/LocalInspectionsPass.java | 2 +- .../codeInspection/ex/LocalInspectionToolWrapper.java | 2 +- .../offlineViewer/OfflineProblemDescriptorNode.java | 2 +- .../InspectionGadgets/src/com/siyeh/ig/BaseInspection.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java index e8d6aff54b8a..e52fb9304a1f 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java +++ b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java @@ -146,5 +146,5 @@ public abstract class LocalInspectionTool extends InspectionProfileEntry { public void inspectionStarted(LocalInspectionToolSession session) {} - public void inspectionFinished(LocalInspectionToolSession session) {} + public void inspectionFinished(LocalInspectionToolSession session, ProblemsHolder problemsHolder) {} } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java index c03b49d64748..0e94a219fc36 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java @@ -285,7 +285,7 @@ public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass advanceProgress(1); - tool.inspectionFinished(session); + tool.inspectionFinished(session, holder); if (holder.hasResults()) { appendDescriptors(myFile, holder.getResults(), tool); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/LocalInspectionToolWrapper.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/LocalInspectionToolWrapper.java index 0f9633076d0b..25729c1dbcff 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/LocalInspectionToolWrapper.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/LocalInspectionToolWrapper.java @@ -73,7 +73,7 @@ public final class LocalInspectionToolWrapper extends DescriptorProviderInspecti } }); - myTool.inspectionFinished(session); + myTool.inspectionFinished(session, holder); addProblemDescriptors(holder.getResults(), filterSuppressed); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java index 0e287686e611..0c3ff80f0d6b 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineProblemDescriptorNode.java @@ -85,7 +85,7 @@ public class OfflineProblemDescriptorNode extends ProblemDescriptionNode { for (PsiElement el : elementsInRange) { el.accept(visitor); } - localInspectionTool.inspectionFinished(session); + localInspectionTool.inspectionFinished(session, holder); if (holder.hasResults()) { final List list = holder.getResults(); final int idx = offlineProblemDescriptor.getProblemIndex(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java index bcff227fce3f..b1060aa2d2df 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/BaseInspection.java @@ -260,8 +260,8 @@ public abstract class BaseInspection extends BaseJavaLocalInspectionTool { } @Override - public void inspectionFinished(LocalInspectionToolSession session) { - super.inspectionFinished(session); + public void inspectionFinished(LocalInspectionToolSession session, ProblemsHolder problemsHolder) { + super.inspectionFinished(session, problemsHolder); if (InspectionGadgetsPlugin.TELEMETRY_ENABLED) { if (timeStamp < 0) { System.out.println("finish reported without corresponding start"); From 8a78a53c37e9dcac364f6c45df0a07797a806611 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 16:37:54 +0400 Subject: [PATCH 68/98] IDEA-59888 menu option to regenerate R.java in Android project --- .../messages/AndroidBundle.properties | 4 +- plugins/android/src/META-INF/plugin.xml | 4 + .../AndroidRegenerateRJavaFileAction.java | 122 ++++++++++++++++++ .../android/compiler/AndroidAptCompiler.java | 3 +- 4 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 plugins/android/src/org/jetbrains/android/actions/AndroidRegenerateRJavaFileAction.java diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties index 86048f0fe326..add62b866e3b 100644 --- a/plugins/android/resources/messages/AndroidBundle.properties +++ b/plugins/android/resources/messages/AndroidBundle.properties @@ -202,4 +202,6 @@ android.inspections.group.name=Android android.inspections.dom.name=Android Resources Validation android.inspections.unknown.attribute.name=Unknown Android XML attribute android.inspections.unknown.attribute.message=Unknown attribute {0} -android.facet.settings.generate.unsigned.apk=Generate unsigned APK \ No newline at end of file +android.facet.settings.generate.unsigned.apk=Generate unsigned APK +android.compile.messages.generating.r.java=Generating R.java... +android.actions.regenerate.r.java.file.title=Force regenerate R.java file \ No newline at end of file diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml index 23c1eb056f64..45f9cc538b7a 100644 --- a/plugins/android/src/META-INF/plugin.xml +++ b/plugins/android/src/META-INF/plugin.xml @@ -53,6 +53,10 @@ + + + + JUnit diff --git a/plugins/android/src/org/jetbrains/android/actions/AndroidRegenerateRJavaFileAction.java b/plugins/android/src/org/jetbrains/android/actions/AndroidRegenerateRJavaFileAction.java new file mode 100644 index 000000000000..bdc149876b41 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/actions/AndroidRegenerateRJavaFileAction.java @@ -0,0 +1,122 @@ +/* + * Copyright 2000-2010 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.android.actions; + +import com.intellij.facet.ProjectFacetManager; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DataKeys; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.module.Module; +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 org.jetbrains.android.compiler.AndroidAptCompiler; +import org.jetbrains.android.compiler.AndroidCompileUtil; +import org.jetbrains.android.facet.AndroidFacet; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.android.util.AndroidUtils; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidRegenerateRJavaFileAction extends AnAction { + public AndroidRegenerateRJavaFileAction() { + super(AndroidBundle.message("android.actions.regenerate.r.java.file.title"), null, AndroidUtils.ANDROID_ICON); + } + + @Override + public void update(AnActionEvent e) { + final Module module = e.getData(DataKeys.MODULE); + final Project project = e.getData(DataKeys.PROJECT); + e.getPresentation().setEnabled(isAvailable(module, project)); + } + + private static boolean isAvailable(Module module, Project project) { + if (module != null) { + AndroidFacet facet = AndroidFacet.getInstance(module); + if (facet != null) { + return AndroidAptCompiler.isToCompileModule(module, facet.getConfiguration()); + } + } + else if (project != null) { + List facets = ProjectFacetManager.getInstance(project).getFacets(AndroidFacet.ID); + for (AndroidFacet facet : facets) { + if (AndroidAptCompiler.isToCompileModule(facet.getModule(), facet.getConfiguration())) { + return true; + } + } + } + return false; + } + + @Override + public void actionPerformed(AnActionEvent e) { + final Module module = e.getData(DataKeys.MODULE); + final Project project = e.getData(DataKeys.PROJECT); + ApplicationManager.getApplication().saveAll(); + ProgressManager.getInstance().run( + new Task.Backgroundable(project, AndroidBundle.message("android.compile.messages.generating.r.java"), true) { + @Override + public void run(@NotNull ProgressIndicator indicator) { + doRun(indicator, module, project); + } + }); + } + + private static void doRun(ProgressIndicator indicator, Module module, Project project) { + if (module != null) { + if (indicator.isCanceled()) { + return; + } + AndroidCompileUtil.generate(module, new AndroidAptCompiler(), false); + return; + } + assert project != null; + List facets = ProjectFacetManager.getInstance(project).getFacets(AndroidFacet.ID); + List modulesToProcess = new ArrayList(); + for (AndroidFacet facet : facets) { + if (indicator.isCanceled()) { + return; + } + module = facet.getModule(); + if (AndroidAptCompiler.isToCompileModule(module, facet.getConfiguration())) { + modulesToProcess.add(module); + } + } + if (modulesToProcess.size() == 0) { + return; + } + if (modulesToProcess.size() == 1) { + AndroidCompileUtil.generate(modulesToProcess.get(0), new AndroidAptCompiler(), false); + return; + } + double step = 1.0 / modulesToProcess.size(); + double progress = 0.0; + indicator.setText(AndroidBundle.message("android.compile.messages.generating.r.java")); + indicator.setFraction(progress); + for (int i = 0, n = modulesToProcess.size(); i < n; i++) { + AndroidCompileUtil.generate(modulesToProcess.get(i), new AndroidAptCompiler(), false); + progress = i < n - 1 ? progress + step : 1.0; + indicator.setFraction(progress); + } + } +} diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java index bbf642a1bff8..34f689051ec4 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidAptCompiler.java @@ -34,6 +34,7 @@ import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.facet.AndroidFacetConfiguration; import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.android.maven.AndroidMavenUtil; +import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -73,7 +74,7 @@ public class AndroidAptCompiler implements SourceGeneratingCompiler { public GenerationItem[] generate(final CompileContext context, final GenerationItem[] items, VirtualFile outputRootDirectory) { if (items != null && items.length > 0) { - context.getProgressIndicator().setText("Generating " + AndroidUtils.R_JAVA_FILENAME + "..."); + context.getProgressIndicator().setText(AndroidBundle.message("android.compile.messages.generating.r.java")); Computable computation = new Computable() { public GenerationItem[] compute() { if (context.getProject().isDisposed()) { From 5d70c36270215519b077c521a88b3c9494501886 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 21 Oct 2010 16:50:35 +0400 Subject: [PATCH 69/98] do not break Python plugin for a while --- .../com/intellij/codeInspection/LocalInspectionTool.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java index e52fb9304a1f..37136fe71c9c 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java +++ b/platform/lang-api/src/com/intellij/codeInspection/LocalInspectionTool.java @@ -146,5 +146,10 @@ public abstract class LocalInspectionTool extends InspectionProfileEntry { public void inspectionStarted(LocalInspectionToolSession session) {} - public void inspectionFinished(LocalInspectionToolSession session, ProblemsHolder problemsHolder) {} + public void inspectionFinished(LocalInspectionToolSession session, ProblemsHolder problemsHolder) { + inspectionFinished(session); + } + + @Deprecated() + public void inspectionFinished(LocalInspectionToolSession session) {} } From b5598a56429950d1b27e6fe414f79aead49122ca Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Thu, 21 Oct 2010 17:11:07 +0400 Subject: [PATCH 70/98] [mac] fix select for file --- .../intellij/ui/mac/MacFileChooserDialogImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java index 2ca398b2b819..ccbc19fc5197 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java @@ -108,10 +108,18 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog { invoke(chooser, "setDelegate:", self); + Object directory = null; + Object file = null; final String toSelectPath = toSelect.intValue() == 0 ? null : Foundation.toStringViaUTF8(toSelect); final VirtualFile toSelectFile = toSelectPath == null ? null : LocalFileSystem.getInstance().findFileByPath(toSelectPath); - final ID directory = toSelectFile == null ? null : toSelectFile.isDirectory() ? toSelect : null; - final ID file = toSelectFile == null ? null : !toSelectFile.isDirectory() ? toSelect : null; + if (toSelectFile != null) { + if (toSelectFile.isDirectory()) { + directory = toSelect; + } else { + directory = Foundation.cfString(toSelectFile.getParent().getPath()); + file = Foundation.cfString(toSelectFile.getName()); + } + } if (mySheetCallback != null) { final Window activeWindow = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow(); From 755d3395c31f6fcd07d6198065cfb97ee9bde0b9 Mon Sep 17 00:00:00 2001 From: "Rustam.Vishnyakov" Date: Thu, 21 Oct 2010 16:47:33 +0400 Subject: [PATCH 71/98] Download javascript library intention: resolving development (non-minified) version --- .../libraries/scripting/ScriptingIndexableSetContributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java index 12c134d07083..9dee15633338 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/scripting/ScriptingIndexableSetContributor.java @@ -48,7 +48,7 @@ public abstract class ScriptingIndexableSetContributor extends IndexableSetContr LibraryTable libTable = manager.getLibraryTable(true); if (libTable != null) { for (Library lib : libTable.getLibraries()) { - for (VirtualFile libFile : lib.getFiles(OrderRootType.CLASSES)) { + for (VirtualFile libFile : lib.getFiles(OrderRootType.SOURCES)) { libFile.putUserData(getIndexKey(), ""); libFiles.add(libFile); } From 28ff122c3817716fe00770fc2951443f16790018 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 21 Oct 2010 17:29:24 +0400 Subject: [PATCH 72/98] PLAIN OLD TRACE TO FIND WHY SPELLCHECKER FAILS TO CONSIDER xmxmxm as CORRECT WORD! --- .../spellchecker/inspections/SpellCheckingInspection.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java index f6a75cb6e492..e808b0a1211c 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/inspections/SpellCheckingInspection.java @@ -160,6 +160,8 @@ public class SpellCheckingInspection extends LocalInspectionTool { }; } + private static final boolean magicEvaluator = ApplicationManager.getApplication().isUnitTestMode(); + /** * Splits element text in tokens according to spell checker strategy of given language * @param element Psi element @@ -170,6 +172,11 @@ public class SpellCheckingInspection extends LocalInspectionTool { public static Token[] tokenize(@NotNull final PsiElement element, @NotNull final Language language) { final SpellcheckingStrategy factoryByLanguage = getFactoryByLanguage(language); final Tokenizer tokenizer = factoryByLanguage.getTokenizer(element); + String magicWord; + if (magicEvaluator && element.getText().indexOf(magicWord = "xmxmxm") != -1) { + System.out.println("~~~~~~"+tokenizer); + System.out.println(SpellCheckerManager.getInstance(element.getProject()).getUserDictionary().contains(magicWord)); + } return tokenizer.tokenize(element); } From f1ad980c4d662a18aad0675ead625268802728a9 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 17:31:14 +0400 Subject: [PATCH 73/98] clean up --- .../android/maven/AndroidFacetImporter.java | 70 +++++++++---------- .../maven/AndroidMavenProviderImpl.java | 24 +++---- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java index 7913b6f4f779..fce124738c9c 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidFacetImporter.java @@ -138,51 +138,49 @@ public class AndroidFacetImporter extends FacetImporter dirs = new ArrayList(); - for (Object child : resourceOverlayDirectories.getChildren()) { - String dir = ((Element)child).getTextTrim(); - if (dir != null && dir.length() > 0) { - String relativePath = getRelativePath(moduleDirPath, makePath(project, dir)); - if (relativePath != null && relativePath.length() > 0) { - dirs.add('/' + relativePath); - } + Element resourceOverlayDirectories = getConfig(project, "resourceOverlayDirectories"); + if (resourceOverlayDirectories != null) { + List dirs = new ArrayList(); + for (Object child : resourceOverlayDirectories.getChildren()) { + String dir = ((Element)child).getTextTrim(); + if (dir != null && dir.length() > 0) { + String relativePath = getRelativePath(moduleDirPath, makePath(project, dir)); + if (relativePath != null && relativePath.length() > 0) { + dirs.add('/' + relativePath); } } - if (dirs.size() > 0) { - configuration.RES_OVERLAY_FOLDERS = ArrayUtil.toStringArray(dirs); - } } - else { - String resOverlayFolderRelPath = getPathFromConfig(project, moduleDirPath, "resourceOverlayDirectory"); - if (resOverlayFolderRelPath != null) { - configuration.RES_OVERLAY_FOLDERS = new String[]{'/' + resOverlayFolderRelPath}; - } + if (dirs.size() > 0) { + configuration.RES_OVERLAY_FOLDERS = ArrayUtil.toStringArray(dirs); } + } + else { + String resOverlayFolderRelPath = getPathFromConfig(project, moduleDirPath, "resourceOverlayDirectory"); + if (resOverlayFolderRelPath != null) { + configuration.RES_OVERLAY_FOLDERS = new String[]{'/' + resOverlayFolderRelPath}; + } + } - String assetsFolderRelPath = getPathFromConfig(project, moduleDirPath, "assetsDirectory"); - if (assetsFolderRelPath != null) { - configuration.ASSETS_FOLDER_RELATIVE_PATH = '/' + assetsFolderRelPath; - } + String assetsFolderRelPath = getPathFromConfig(project, moduleDirPath, "assetsDirectory"); + if (assetsFolderRelPath != null) { + configuration.ASSETS_FOLDER_RELATIVE_PATH = '/' + assetsFolderRelPath; + } - String manifestFileRelPath = getPathFromConfig(project, moduleDirPath, "androidManifestFile"); - if (manifestFileRelPath != null) { - configuration.MANIFEST_FILE_RELATIVE_PATH = '/' + manifestFileRelPath; - } + String manifestFileRelPath = getPathFromConfig(project, moduleDirPath, "androidManifestFile"); + if (manifestFileRelPath != null) { + configuration.MANIFEST_FILE_RELATIVE_PATH = '/' + manifestFileRelPath; + } - String nativeLibsFolderRelPath = getPathFromConfig(project, moduleDirPath, "nativeLibrariesDirectory"); - if (nativeLibsFolderRelPath != null) { - configuration.LIBS_FOLDER_RELATIVE_PATH = '/' + nativeLibsFolderRelPath; - } + String nativeLibsFolderRelPath = getPathFromConfig(project, moduleDirPath, "nativeLibrariesDirectory"); + if (nativeLibsFolderRelPath != null) { + configuration.LIBS_FOLDER_RELATIVE_PATH = '/' + nativeLibsFolderRelPath; } } diff --git a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java index edc0165178d4..7af72f7490eb 100644 --- a/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java +++ b/plugins/android/src/org/jetbrains/android/maven/AndroidMavenProviderImpl.java @@ -37,23 +37,21 @@ public class AndroidMavenProviderImpl implements AndroidMavenProvider { public static void setPathsToDefault(MavenProject mavenProject, Module module, AndroidFacetConfiguration configuration) { String moduleDirPath = FileUtil.toSystemIndependentName(new File(module.getModuleFilePath()).getParent()); - if (moduleDirPath != null) { - String genSources = FileUtil.toSystemIndependentName(mavenProject.getGeneratedSourcesDirectory(false)); + String genSources = FileUtil.toSystemIndependentName(mavenProject.getGeneratedSourcesDirectory(false)); - if (VfsUtil.isAncestor(new File(moduleDirPath), new File(genSources), true)) { - String genRelativePath = FileUtil.getRelativePath(moduleDirPath, genSources, '/'); - if (genRelativePath != null) { - configuration.GEN_FOLDER_RELATIVE_PATH_APT = '/' + genRelativePath + "/r"; - configuration.GEN_FOLDER_RELATIVE_PATH_AIDL = '/' + genRelativePath + "/aidl"; + if (VfsUtil.isAncestor(new File(moduleDirPath), new File(genSources), true)) { + String genRelativePath = FileUtil.getRelativePath(moduleDirPath, genSources, '/'); + if (genRelativePath != null) { + configuration.GEN_FOLDER_RELATIVE_PATH_APT = '/' + genRelativePath + "/r"; + configuration.GEN_FOLDER_RELATIVE_PATH_AIDL = '/' + genRelativePath + "/aidl"; - configuration.USE_CUSTOM_APK_RESOURCE_FOLDER = true; - configuration.CUSTOM_APK_RESOURCE_FOLDER = '/' + genRelativePath + "/combined-resources/" + SdkConstants.FD_RES; - } + configuration.USE_CUSTOM_APK_RESOURCE_FOLDER = true; + configuration.CUSTOM_APK_RESOURCE_FOLDER = '/' + genRelativePath + "/combined-resources/" + SdkConstants.FD_RES; } - - configuration.COPY_RESOURCES_FROM_ARTIFACTS = true; - configuration.ENABLE_AAPT_COMPILER = false; } + + configuration.COPY_RESOURCES_FROM_ARTIFACTS = true; + configuration.ENABLE_AAPT_COMPILER = false; } @Override From 3b3ee02e26a8eb7e98f0b6b2b623438ae6841e6f Mon Sep 17 00:00:00 2001 From: Gregory Shrago Date: Thu, 21 Oct 2010 17:35:19 +0400 Subject: [PATCH 74/98] fix SQLException handling --- .../util/src/com/intellij/execution/rmi/RemoteObject.java | 4 ---- .../org/jetbrains/idea/maven/facade/MavenRemoteObject.java | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/util/src/com/intellij/execution/rmi/RemoteObject.java b/platform/util/src/com/intellij/execution/rmi/RemoteObject.java index 65ea38844586..76f34961a86a 100644 --- a/platform/util/src/com/intellij/execution/rmi/RemoteObject.java +++ b/platform/util/src/com/intellij/execution/rmi/RemoteObject.java @@ -113,8 +113,4 @@ public class RemoteObject implements Remote, Unreferenced { return false; } - public RuntimeException rethrowException(Throwable e) { - Throwable wrap = wrapException(e); - throw wrap instanceof RuntimeException ? (RuntimeException)wrap : new RuntimeException(wrap); - } } diff --git a/plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenRemoteObject.java b/plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenRemoteObject.java index 59ff9eb3c0f0..d6e66e4782ba 100644 --- a/plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenRemoteObject.java +++ b/plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenRemoteObject.java @@ -22,4 +22,9 @@ public class MavenRemoteObject extends RemoteObject{ protected boolean isKnownException(Throwable ex) { return ex.getClass().getName().startsWith(MavenRemoteObject.class.getPackage().getName()); } + + public RuntimeException rethrowException(Throwable e) { + Throwable wrap = wrapException(e); + throw wrap instanceof RuntimeException ? (RuntimeException)wrap : new RuntimeException(wrap); + } } From d687a41d5f47f8134bdecdc8957bfb547a781e36 Mon Sep 17 00:00:00 2001 From: Alexey Pegov Date: Thu, 21 Oct 2010 17:50:56 +0400 Subject: [PATCH 75/98] [mac] treat packages as directories in native file chooser --- .../src/com/intellij/ui/mac/MacFileChooserDialogImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java index ccbc19fc5197..f847483e1e7b 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java @@ -97,6 +97,8 @@ public class MacFileChooserDialogImpl implements MacFileChooserDialog { invoke(chooser, "setCanChooseFiles:", myChooserDescriptor.isChooseFiles()); invoke(chooser, "setCanChooseDirectories:", myChooserDescriptor.isChooseFolders()); invoke(chooser, "setAllowsMultipleSelection:", myChooserDescriptor.isChooseMultiple()); + invoke(chooser, "setTreatsFilePackagesAsDirectories:", myChooserDescriptor.isChooseFolders()); + //invoke(chooser, "setCanCreateDirectories:", true); if (Foundation.isClassRespondsToSelector(Foundation.getClass("NSOpenPanel"), Foundation.createSelector("_setIncludeNewFolderButton:"))) { invoke(chooser, "_setIncludeNewFolderButton:", true); } From c6496ded940bbcdc389bb49782ef16e4302df089 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Oct 2010 17:55:33 +0400 Subject: [PATCH 76/98] Git error handling: 1. Check GitExecutableValidator in GitChangeProvider and GitHistoryProvider. 2. Stop "loading history" indicator if process failed to start in GitHistoryUtils. Allows to have several attempts - had to restart IDEA to reinvoke history before that. --- .../git4idea/changes/GitChangeProvider.java | 30 ++++++++------- .../config/GitExecutableValidator.java | 37 ++++++++++++++++--- .../git4idea/history/GitHistoryProvider.java | 23 +++++++++--- .../src/git4idea/history/GitHistoryUtils.java | 1 + 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java b/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java index 6108dbdf5ca6..bc248770abc2 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java @@ -26,6 +26,7 @@ import git4idea.GitContentRevision; import git4idea.GitRevisionNumber; import git4idea.GitUtil; import git4idea.GitVcs; +import git4idea.config.GitExecutableValidator; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -63,20 +64,23 @@ public class GitChangeProvider implements ChangeProvider { } Collection roots = GitUtil.gitRootsForPaths(affected); - final MyNonChangedHolder holder = new MyNonChangedHolder(myProject, dirtyScope.getDirtyFilesNoExpand(), addGate); - - for (VirtualFile root : roots) { - ChangeCollector c = new ChangeCollector(myProject, dirtyScope, root); - final Collection changes = c.changes(); - holder.changed(changes); - for (Change file : changes) { - builder.processChange(file, GitVcs.getKey()); + try { + final MyNonChangedHolder holder = new MyNonChangedHolder(myProject, dirtyScope.getDirtyFilesNoExpand(), addGate); + for (VirtualFile root : roots) { + ChangeCollector c = new ChangeCollector(myProject, dirtyScope, root); + final Collection changes = c.changes(); + holder.changed(changes); + for (Change file : changes) { + builder.processChange(file, GitVcs.getKey()); + } + for (VirtualFile f : c.unversioned()) { + builder.processUnversionedFile(f); + holder.unversioned(f); + } + holder.feedBuilder(builder); } - for (VirtualFile f : c.unversioned()) { - builder.processUnversionedFile(f); - holder.unversioned(f); - } - holder.feedBuilder(builder); + } catch (VcsException e) {// most probably the error happened because git is not configured + GitExecutableValidator.getInstance(myProject).showNotificationOrThrow(e); } } diff --git a/plugins/git4idea/src/git4idea/config/GitExecutableValidator.java b/plugins/git4idea/src/git4idea/config/GitExecutableValidator.java index 88715ceb5a1e..a60afbb92fe1 100644 --- a/plugins/git4idea/src/git4idea/config/GitExecutableValidator.java +++ b/plugins/git4idea/src/git4idea/config/GitExecutableValidator.java @@ -19,11 +19,14 @@ import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vcs.VcsException; +import com.intellij.ui.GuiUtils; +import com.intellij.util.ui.UIUtil; import git4idea.GitVcs; import git4idea.i18n.GitBundle; import org.jetbrains.annotations.NotNull; @@ -65,10 +68,7 @@ public class GitExecutableValidator { * Expires the notification if user fixes the path to Git from the opened Settings dialog. */ public void showExecutableNotConfiguredNotification() { - if (myNotification != null && !myNotification.isExpired()) { // don't display this notification twice - return; - } - myNotification = new Notification(GitVcs.NOTIFICATION_GROUP_ID, GitBundle.getString("executable.error.title"), + final Notification newNotification = new Notification(GitVcs.NOTIFICATION_GROUP_ID, GitBundle.getString("executable.error.title"), GitBundle.getString("executable.error.description"), NotificationType.ERROR, new NotificationListener() { public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { @@ -78,7 +78,19 @@ public class GitExecutableValidator { } } }); - Notifications.Bus.notify(myNotification, myProject); + + // expire() needs to be called from EventDispatch thread. notify handles it by itself. + // but we want to be sure that previous notification expires before new one is shown (and assigned to myNotification). + UIUtil.invokeLaterIfNeeded(new Runnable() { + @Override public void run() { + if (myNotification != null && !myNotification.isExpired()) { + // don't display this notification twice, but better to redisplay it again so that popup appears. + myNotification.expire(); + } + myNotification = newNotification; + Notifications.Bus.notify(myNotification, myProject); + } + }); } /** @@ -89,5 +101,20 @@ public class GitExecutableValidator { showExecutableNotConfiguredNotification(); } } + + /** + * Checks if git executable is valid. If not (which is a common case for low-level vcs exceptions), shows the + * notification. Otherwise throws the exception. + * This is to be used in catch-clauses + * @param e exception which was thrown. + * @throws VcsException if git executable is valid. + */ + public void showNotificationOrThrow(VcsException e) throws VcsException { + if (!isGitExecutableValid()) { + showExecutableNotConfiguredNotification(); + } else { + throw e; + } + } } diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java index 1503d5acd310..9526a05032e4 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java @@ -25,6 +25,7 @@ import com.intellij.util.Consumer; import com.intellij.util.ui.ColumnInfo; import git4idea.GitFileRevision; import git4idea.actions.GitShowAllSubmittedFilesAction; +import git4idea.config.GitExecutableValidator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,7 +44,7 @@ public class GitHistoryProvider implements VcsHistoryProvider { /** * the current project instance */ - private final Project project; + private final Project myProject; /** * A constructor @@ -51,7 +52,7 @@ public class GitHistoryProvider implements VcsHistoryProvider { * @param project a context project */ public GitHistoryProvider(@NotNull Project project) { - this.project = project; + this.myProject = project; } /** @@ -89,7 +90,12 @@ public class GitHistoryProvider implements VcsHistoryProvider { */ @Nullable public VcsHistorySession createSessionFor(final FilePath filePath) throws VcsException { - List revisions = GitHistoryUtils.history(project, filePath); + List revisions = null; + try { + revisions = GitHistoryUtils.history(myProject, filePath); + } catch (VcsException e) { + GitExecutableValidator.getInstance(myProject).showNotificationOrThrow(e); + } return createSession(filePath, revisions); } @@ -98,7 +104,7 @@ public class GitHistoryProvider implements VcsHistoryProvider { @Nullable protected VcsRevisionNumber calcCurrentRevisionNumber() { try { - return GitHistoryUtils.getCurrentRevision(project, GitHistoryUtils.getLastCommitName(project, filePath)); + return GitHistoryUtils.getCurrentRevision(myProject, GitHistoryUtils.getLastCommitName(myProject, filePath)); } catch (VcsException e) { // likely the file is not under VCS anymore. @@ -123,13 +129,18 @@ public class GitHistoryProvider implements VcsHistoryProvider { public void reportAppendableHistory(final FilePath path, final VcsAppendableHistorySessionPartner partner) throws VcsException { final VcsAbstractHistorySession emptySession = createSession(path, Collections.emptyList()); partner.reportCreatedEmptySession(emptySession); - GitHistoryUtils.history(project, path, new Consumer() { + final GitExecutableValidator validator = GitExecutableValidator.getInstance(myProject); + GitHistoryUtils.history(myProject, path, new Consumer() { public void consume(GitFileRevision gitFileRevision) { partner.acceptRevision(gitFileRevision); } }, new Consumer() { public void consume(VcsException e) { - partner.reportException(e); + if (!validator.isGitExecutableValid()) { + validator.showExecutableNotConfiguredNotification(); + } else { + partner.reportException(e); + } } }); } diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index 02453e91c050..2dfe0f0b9692 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -166,6 +166,7 @@ public class GitHistoryUtils { public void startFailed(Throwable exception) { //noinspection ThrowableInstanceNeverThrown exceptionConsumer.consume(new VcsException(exception)); + semaphore.up(); } @Override From 73e121ce346672a6133c9bd2f624a7172373e2aa Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 21 Oct 2010 18:06:18 +0400 Subject: [PATCH 77/98] jdk->sdk rename refactoring --- .../compiler/ant/BuildPropertiesImpl.java | 2 +- .../execution/util/JreVersionDetector.java | 2 +- .../com/intellij/ide/impl/NewProjectUtil.java | 2 +- .../newProjectWizard/AddModuleWizard.java | 2 +- .../util/projectWizard/JdkChooserPanel.java | 4 +- .../ProjectJdkForModuleStep.java | 2 +- .../configuration/ProjectJdkConfigurable.java | 8 ++-- .../UIRootConfigurationAccessor.java | 2 +- .../projectRoot/JdkListConfigurable.java | 2 +- .../ProjectOpenProcessorBase.java | 2 +- .../analysis/IncreaseLanguageLevelFix.java | 2 +- .../ex/GlobalJavaInspectionContextImpl.java | 4 +- .../com/intellij/roots/InheritedJdkTest.java | 6 +-- .../com/intellij/roots/RootsChangedTest.java | 4 +- .../ide/util/projectWizard/WizardContext.java | 2 +- .../openapi/roots/ModuleRootModel.java | 4 +- .../openapi/roots/ProjectRootManager.java | 8 ++-- .../util/OrderEntryCellAppearanceUtils.java | 4 +- .../openapi/projectRoots/ex/PathUtilEx.java | 2 +- .../impl/SdkConfigurationUtil.java | 6 +-- .../impl/InheritedJdkOrderEntryImpl.java | 2 +- .../roots/impl/ProjectRootManagerImpl.java | 48 +++++++++---------- .../roots/impl/RootConfigurationAccessor.java | 4 +- .../projectRoot/ProjectSdksModel.java | 2 +- .../lang/ant/config/execution/PathUtilEx.java | 2 +- .../ant/config/impl/AntConfigurationImpl.java | 2 +- .../intellij/lang/ant/dom/AntDomProject.java | 2 +- .../lang/ant/psi/impl/AntFileImpl.java | 4 +- .../intellij/execution/junit/TestObject.java | 2 +- .../configuration/TestNGRunnableState.java | 2 +- .../xpath/xslt/run/XsltRunConfiguration.java | 2 +- 31 files changed, 71 insertions(+), 71 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java b/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java index 80dae42cb5e6..c7e1a8d20a50 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java @@ -180,7 +180,7 @@ public class BuildPropertiesImpl extends BuildProperties { } } - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); add(new Property(PROPERTY_PROJECT_JDK_HOME, projectJdk != null ? propertyRef(getJdkHomeProperty(projectJdk.getName())) : ""), 1); add(new Property(PROPERTY_PROJECT_JDK_BIN, projectJdk != null ? propertyRef(getJdkBinProperty(projectJdk.getName())) : "")); add(new Property(PROPERTY_PROJECT_JDK_CLASSPATH, projectJdk != null ? getJdkPathId(projectJdk.getName()) : "")); diff --git a/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java b/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java index 102cb438a332..feaa6a69c22c 100644 --- a/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java +++ b/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java @@ -49,7 +49,7 @@ public class JreVersionDetector { return isJre50(jdk); } - final Sdk projectJdk = ProjectRootManager.getInstance(configuration.getProject()).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(configuration.getProject()).getProjectSdk(); return isJre50(projectJdk); } } diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java index 3a55f74021bd..1288d2af9c68 100644 --- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java +++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java @@ -177,7 +177,7 @@ public class NewProjectUtil { if (versionString == null) return; ProjectRootManagerEx rootManager = ProjectRootManagerEx.getInstanceEx(project); - rootManager.setProjectJdk(jdk); + rootManager.setProjectSdk(jdk); LanguageLevel level = LanguageLevelUtil.getDefaultLanguageLevel(versionString); LanguageLevelProjectExtension ext = LanguageLevelProjectExtension.getInstance(project); if (level.compareTo(ext.getLanguageLevel()) < 0) { diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java index e0be57f7cafa..de335bac90a7 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java @@ -301,7 +301,7 @@ public class AddModuleWizard extends AbstractWizard { return context.getProjectJdk(); } final Project project = context.getProject() == null ? ProjectManager.getInstance().getDefaultProject() : context.getProject(); - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java index 3fd85200e823..adcef1334736 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java @@ -223,14 +223,14 @@ public class JdkChooserPanel extends JPanel { } public static Sdk chooseAndSetJDK(final Project project) { - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); final Sdk jdk = showDialog(project, ProjectBundle.message("module.libraries.target.jdk.select.title"), WindowManagerEx.getInstanceEx().getFrame(project), projectJdk); if (jdk == null) { return null; } ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { - ProjectRootManager.getInstance(project).setProjectJdk(jdk); + ProjectRootManager.getInstance(project).setProjectSdk(jdk); } }); return jdk; diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java index 4681a04b372f..0b562dff41a0 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java @@ -149,7 +149,7 @@ public class ProjectJdkForModuleStep extends ModuleWizardStep { @Nullable private static Sdk getDefaultJdk() { Project defaultProject = ProjectManagerEx.getInstanceEx().getDefaultProject(); - return ProjectRootManagerEx.getInstanceEx(defaultProject).getProjectJdk(); + return ProjectRootManagerEx.getInstanceEx(defaultProject).getProjectSdk(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java index 5567ef30be8d..f03f13b0b953 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java @@ -86,7 +86,7 @@ public class ProjectJdkConfigurable implements UnnamedConfigurable { myFreeze = true; final Sdk projectJdk = myJdksModel.getProjectSdk(); myCbProjectJdk.reloadModel(new JdkComboBox.NoneJdkComboBoxItem(), myProject); - final String sdkName = projectJdk == null ? ProjectRootManager.getInstance(myProject).getProjectJdkName() : projectJdk.getName(); + final String sdkName = projectJdk == null ? ProjectRootManager.getInstance(myProject).getProjectSdkName() : projectJdk.getName(); if (sdkName != null) { final Sdk jdk = myJdksModel.findSdk(sdkName); if (jdk != null) { @@ -135,18 +135,18 @@ public class ProjectJdkConfigurable implements UnnamedConfigurable { } public boolean isModified() { - final Sdk projectJdk = ProjectRootManager.getInstance(myProject).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(myProject).getProjectSdk(); return !Comparing.equal(projectJdk, getSelectedProjectJdk()); } public void apply() throws ConfigurationException { - ProjectRootManager.getInstance(myProject).setProjectJdk(getSelectedProjectJdk()); + ProjectRootManager.getInstance(myProject).setProjectSdk(getSelectedProjectJdk()); } public void reset() { reloadModel(); - final String sdkName = ProjectRootManager.getInstance(myProject).getProjectJdkName(); + final String sdkName = ProjectRootManager.getInstance(myProject).getProjectSdkName(); if (sdkName != null) { final Sdk jdk = myJdksModel.findSdk(sdkName); if (jdk != null) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java index 54ea7528ab27..859119b9cf22 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java @@ -72,7 +72,7 @@ public class UIRootConfigurationAccessor extends RootConfigurationAccessor { @Nullable public String getProjectSdkName(final Project project) { - final String projectJdkName = ProjectRootManager.getInstance(project).getProjectJdkName(); + final String projectJdkName = ProjectRootManager.getInstance(project).getProjectSdkName(); final Sdk projectJdk = getProjectSdk(project); if (projectJdk != null) { return projectJdk.getName(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java index 86b664d45b3d..ab2fc0aaca2d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java @@ -168,7 +168,7 @@ public class JdkListConfigurable extends BaseStructureConfigurable { } if (myJdksTreeModel.isModified() || modifiedJdks) myJdksTreeModel.apply(this); - myJdksTreeModel.setProjectSdk(ProjectRootManager.getInstance(myProject).getProjectJdk()); + myJdksTreeModel.setProjectSdk(ProjectRootManager.getInstance(myProject).getProjectSdk()); } public boolean isModified() { diff --git a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java index 0959dab65992..78dcfe8985fa 100644 --- a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java +++ b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java @@ -124,7 +124,7 @@ public abstract class ProjectOpenProcessorBase extends ProjectOpenProcessor { wizardContext.setProjectFileDirectory(virtualFile.getParent().getPath()); Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - Sdk jdk = ProjectRootManager.getInstance(defaultProject).getProjectJdk(); + Sdk jdk = ProjectRootManager.getInstance(defaultProject).getProjectSdk(); if (jdk == null) { jdk = ProjectJdkTable.getInstance().findMostRecentSdkOfType(JavaSdk.getInstance()); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java index 66553f60c997..9cf11d9e68c3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java @@ -110,7 +110,7 @@ public class IncreaseLanguageLevelFix implements IntentionAction { @Nullable private static Sdk getRelevantJdk(final Project project, @Nullable Module module) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); Sdk moduleJdk = module == null ? null : ModuleRootManager.getInstance(module).getSdk(); return moduleJdk == null ? projectJdk : moduleJdk; } diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java index d48f6da93786..c739d62cbf07 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java @@ -120,7 +120,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext if (isBadSdk(project, modules)) { System.err.println(InspectionsBundle.message("inspection.no.jdk.error.message")); System.err.println( - InspectionsBundle.message("offline.inspections.jdk.not.found", ProjectRootManager.getInstance(project).getProjectJdkName())); + InspectionsBundle.message("offline.inspections.jdk.not.found", ProjectRootManager.getInstance(project).getProjectSdkName())); return false; } for (Module module : modules) { @@ -152,7 +152,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext private static boolean isBadSdk(final Project project, final Module[] modules) { boolean anyModuleAcceptsSdk = false; boolean anyModuleUsesProjectSdk = false; - Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk(); for (Module module : modules) { if (ModuleRootManager.getInstance(module).isSdkInherited()) { anyModuleUsesProjectSdk = true; diff --git a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java index 9f5b1ec53efc..06b4794a65ac 100644 --- a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java @@ -34,7 +34,7 @@ public class InheritedJdkTest extends ModuleTestCase { @Override public void run() { final ProjectRootManagerEx rootManagerEx = ProjectRootManagerEx.getInstanceEx(myProject); - rootManagerEx.setProjectJdkName(jdk.getName()); + rootManagerEx.setProjectSdkName(jdk.getName()); final ModifiableRootModel rootModel = rootManager.getModifiableModel(); rootModel.inheritSdk(); rootModel.commit(); @@ -102,7 +102,7 @@ public class InheritedJdkTest extends ModuleTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - projectRootManager.setProjectJdk(mockJdk); + projectRootManager.setProjectSdk(mockJdk); } }); @@ -112,7 +112,7 @@ public class InheritedJdkTest extends ModuleTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - projectRootManager.setProjectJdkName("jdk1"); + projectRootManager.setProjectSdkName("jdk1"); } }); diff --git a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java index 2fe2009ee2f8..51b728df3e6c 100644 --- a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java @@ -99,7 +99,7 @@ public class RootsChangedTest extends ModuleTestCase { ProjectJdkTable.getInstance().addJdk(jdk); assertEventsCount(0); - ProjectRootManager.getInstance(myProject).setProjectJdk(jdkBBB); + ProjectRootManager.getInstance(myProject).setProjectSdk(jdkBBB); assertEventsCount(0); final ModifiableRootModel rootModelA = ModuleRootManager.getInstance(moduleA).getModifiableModel(); @@ -109,7 +109,7 @@ public class RootsChangedTest extends ModuleTestCase { ProjectRootManager.getInstance(myProject).multiCommit(new ModifiableRootModel[]{rootModelA, rootModelB}); assertEventsCount(1); - ProjectRootManager.getInstance(myProject).setProjectJdk(jdk); + ProjectRootManager.getInstance(myProject).setProjectSdk(jdk); assertEventsCount(1); final SdkModificator sdkModificator = jdk.getSdkModificator(); diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java index 84061770853a..e5daad1340c0 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java @@ -56,7 +56,7 @@ public class WizardContext { public WizardContext(Project project) { myProject = project; if (myProject != null){ - myProjectJdk = ProjectRootManager.getInstance(myProject).getProjectJdk(); + myProjectJdk = ProjectRootManager.getInstance(myProject).getProjectSdk(); } } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java index 956330b4a056..ba8b609dacad 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java @@ -65,8 +65,8 @@ public interface ModuleRootModel { * Returns true if JDK for this module is inherited from a project. * * @return true if the JDK is inherited, false otherwise - * @see ProjectRootManager#getProjectJdk() - * @see ProjectRootManager#setProjectJdk(com.intellij.openapi.projectRoots.Sdk) + * @see ProjectRootManager#getProjectSdk() + * @see ProjectRootManager#setProjectSdk(com.intellij.openapi.projectRoots.Sdk) */ boolean isSdkInherited(); diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java index 61349d15b38f..4021f63a481b 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java @@ -124,28 +124,28 @@ public abstract class ProjectRootManager implements ModificationTracker { * to any existing JDK instance. */ @Nullable - public abstract Sdk getProjectJdk(); + public abstract Sdk getProjectSdk(); /** * Returns the name of the JDK selected for the project. * * @return the JDK name. */ - public abstract String getProjectJdkName(); + public abstract String getProjectSdkName(); /** * Sets the JDK to be used for the project. * * @param jdk the JDK instance. */ - public abstract void setProjectJdk(@Nullable Sdk jdk); + public abstract void setProjectSdk(@Nullable Sdk jdk); /** * Sets the name of the JDK to be used for the project. * * @param name the name of the JDK. */ - public abstract void setProjectJdkName(String name); + public abstract void setProjectSdkName(String name); /** * Commits the change to the lists of roots for the specified modules. diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java index a59c95fe9b36..37d4766a6c2a 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java @@ -177,14 +177,14 @@ public class OrderEntryCellAppearanceUtils { public static CellAppearance forProjectJdk(final Project project) { final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project); - final Sdk projectJdk = projectRootManager.getProjectJdk(); + final Sdk projectJdk = projectRootManager.getProjectSdk(); final CellAppearance appearance; if (projectJdk != null) { appearance = forJdk(projectJdk, false, false); } else { // probably invalid JDK - final String projectJdkName = projectRootManager.getProjectJdkName(); + final String projectJdkName = projectRootManager.getProjectSdkName(); if (projectJdkName != null) { appearance = SimpleTextCellAppearance.invalid(ProjectBundle.message("jdk.combo.box.invalid.item", projectJdkName), CellAppearanceUtils.INVALID_ICON); diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java index 3d6a84fc9589..c883b5ddfd87 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java @@ -55,7 +55,7 @@ public class PathUtilEx { } public static Sdk chooseJdk(Project project, Collection modules) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java index 3a4b490bc5c4..a775bf1399e2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java @@ -159,7 +159,7 @@ public class SdkConfigurationUtil { public static void setDirectoryProjectSdk(final Project project, final Sdk sdk) { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { - ProjectRootManager.getInstance(project).setProjectJdk(sdk); + ProjectRootManager.getInstance(project).setProjectSdk(sdk); final Module[] modules = ModuleManager.getInstance(project).getModules(); if (modules.length > 0) { final ModifiableRootModel model = ModuleRootManager.getInstance(modules[0]).getModifiableModel(); @@ -171,7 +171,7 @@ public class SdkConfigurationUtil { } public static void configureDirectoryProjectSdk(final Project project, final SdkType... sdkTypes) { - Sdk existingSdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk existingSdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (existingSdk != null && ArrayUtil.contains(existingSdk.getSdkType(), sdkTypes)) { return; } @@ -185,7 +185,7 @@ public class SdkConfigurationUtil { @Nullable public static Sdk findOrCreateSdk(final SdkType... sdkTypes) { final Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - final Sdk sdk = ProjectRootManager.getInstance(defaultProject).getProjectJdk(); + final Sdk sdk = ProjectRootManager.getInstance(defaultProject).getProjectSdk(); if (sdk != null) { for (SdkType type : sdkTypes) { if (sdk.getSdkType() == type) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java index be03ff5ca38b..05f8becf83ca 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java @@ -89,7 +89,7 @@ public class InheritedJdkOrderEntryImpl extends LibraryOrderEntryBaseImpl implem } protected RootProvider getRootProvider() { - final Sdk projectJdk = myProjectRootManagerImpl.getProjectJdk(); + final Sdk projectJdk = myProjectRootManagerImpl.getProjectSdk(); return projectJdk == null ? null : projectJdk.getRootProvider(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java index 091e451f5dd1..67425f598591 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java @@ -82,8 +82,8 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj private AppListener myApplicationListener; - private String myProjectJdkName; - private String myProjectJdkType; + private String myProjectSdkName; + private String myProjectSdkType; private final List myRootsChangeUpdaters = new ArrayList(); private final List myRefreshCacheUpdaters = new ArrayList(); @@ -327,28 +327,28 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj return VfsUtil.toVirtualFileArray(result); } - public Sdk getProjectJdk() { - if (myProjectJdkName != null) { - return ProjectJdkTable.getInstance().findJdk(myProjectJdkName, myProjectJdkType); + public Sdk getProjectSdk() { + if (myProjectSdkName != null) { + return ProjectJdkTable.getInstance().findJdk(myProjectSdkName, myProjectSdkType); } else { return null; } } - public String getProjectJdkName() { - return myProjectJdkName; + public String getProjectSdkName() { + return myProjectSdkName; } - public void setProjectJdk(Sdk projectJdk) { + public void setProjectSdk(Sdk projectSdk) { ApplicationManager.getApplication().assertWriteAccessAllowed(); - if (projectJdk != null) { - myProjectJdkName = projectJdk.getName(); - myProjectJdkType = projectJdk.getSdkType().getName(); + if (projectSdk != null) { + myProjectSdkName = projectSdk.getName(); + myProjectSdkType = projectSdk.getSdkType().getName(); } else { - myProjectJdkName = null; - myProjectJdkType = null; + myProjectSdkName = null; + myProjectSdkType = null; } mergeRootsChangesDuring(new Runnable() { public void run() { @@ -357,9 +357,9 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj }); } - public void setProjectJdkName(String name) { + public void setProjectSdkName(String name) { ApplicationManager.getApplication().assertWriteAccessAllowed(); - myProjectJdkName = name; + myProjectSdkName = name; mergeRootsChangesDuring(new Runnable() { public void run() { @@ -409,8 +409,8 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj for (ProjectExtension extension : Extensions.getExtensions(ProjectExtension.EP_NAME, myProject)) { extension.readExternal(element); } - myProjectJdkName = element.getAttributeValue(PROJECT_JDK_NAME_ATTR); - myProjectJdkType = element.getAttributeValue(PROJECT_JDK_TYPE_ATTR); + myProjectSdkName = element.getAttributeValue(PROJECT_JDK_NAME_ATTR); + myProjectSdkType = element.getAttributeValue(PROJECT_JDK_TYPE_ATTR); } public void writeExternal(Element element) throws WriteExternalException { @@ -418,11 +418,11 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj for (ProjectExtension extension : Extensions.getExtensions(ProjectExtension.EP_NAME, myProject)) { extension.writeExternal(element); } - if (myProjectJdkName != null) { - element.setAttribute(PROJECT_JDK_NAME_ATTR, myProjectJdkName); + if (myProjectSdkName != null) { + element.setAttribute(PROJECT_JDK_NAME_ATTR, myProjectSdkName); } - if (myProjectJdkType != null) { - element.setAttribute(PROJECT_JDK_TYPE_ATTR, myProjectJdkType); + if (myProjectSdkType != null) { + element.setAttribute(PROJECT_JDK_TYPE_ATTR, myProjectSdkType); } } @@ -946,11 +946,11 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj myDispatcher.getMulticaster().jdkNameChanged(jdk, previousName); } }); - String currentName = getProjectJdkName(); + String currentName = getProjectSdkName(); if (previousName != null && previousName.equals(currentName)) { // if already had jdk name and that name was the name of the jdk just changed - myProjectJdkName = jdk.getName(); - myProjectJdkType = jdk.getSdkType().getName(); + myProjectSdkName = jdk.getName(); + myProjectSdkType = jdk.getSdkType().getName(); } } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java index ab33bd5434a8..3800dc91a028 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java @@ -42,11 +42,11 @@ public class RootConfigurationAccessor { } public Sdk getProjectSdk(Project project) { - return ProjectRootManager.getInstance(project).getProjectJdk(); + return ProjectRootManager.getInstance(project).getProjectSdk(); } @Nullable public String getProjectSdkName(final Project project) { - return ProjectRootManager.getInstance(project).getProjectJdkName(); + return ProjectRootManager.getInstance(project).getProjectSdkName(); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java index 4171a12890e4..d128170b3db3 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java @@ -91,7 +91,7 @@ public class ProjectSdksModel implements SdkModel { //can't be } } - myProjectSdk = findSdk(ProjectRootManager.getInstance(project).getProjectJdkName()); + myProjectSdk = findSdk(ProjectRootManager.getInstance(project).getProjectSdkName()); myModified = false; myInitialized = true; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java index 163d9bd59488..6b901a54371b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java @@ -75,7 +75,7 @@ public class PathUtilEx { } public static Sdk chooseJdk(Project project, Collection modules) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index 40be821385cf..789e548f7743 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -94,7 +94,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis public String get(final AbstractPropertyContainer container) { if (!container.hasProperty(this)) return null; AntConfiguration antConfiguration = AntConfigurationImpl.INSTANCE.get(container); - return ProjectRootManager.getInstance(antConfiguration.getProject()).getProjectJdkName(); + return ProjectRootManager.getInstance(antConfiguration.getProject()).getProjectSdkName(); } public String copy(final String jdkName) { diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java index e2cf4a1f6e3f..0939e404de2f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java @@ -168,7 +168,7 @@ public abstract class AntDomProject extends AntDomNamedElement implements Proper return ProjectJdkTable.getInstance().findJdk(jdkName); } } - return ProjectRootManager.getInstance(tag.getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(tag.getProject()).getProjectSdk(); } @NotNull diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java index f0d1f9e7df88..c0ccc59e54b0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java @@ -346,7 +346,7 @@ public class AntFileImpl extends LightPsiFileBase implements AntFile { public Sdk getTargetJdk() { final AntBuildFileImpl buildFile = (AntBuildFileImpl)getSourceElement().getCopyableUserData(AntBuildFile.ANT_BUILD_FILE_KEY); if (buildFile == null) { - return ProjectRootManager.getInstance(getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(getProject()).getProjectSdk(); } String jdkName = AntBuildFileImpl.CUSTOM_JDK_NAME.get(buildFile.getAllOptions()); @@ -356,7 +356,7 @@ public class AntFileImpl extends LightPsiFileBase implements AntFile { if (jdkName != null && jdkName.length() > 0) { return ProjectJdkTable.getInstance().findJdk(jdkName); } - return ProjectRootManager.getInstance(getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(getProject()).getProjectSdk(); } @Nullable diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index 870794475474..6b0782e07539 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -199,7 +199,7 @@ public abstract class TestObject implements JavaCommandLine { if (myJavaParameters.getJdk() == null){ myJavaParameters.setJdk(module != null ? ModuleRootManager.getInstance(module).getSdk() - : ProjectRootManager.getInstance(myProject).getProjectJdk()); + : ProjectRootManager.getInstance(myProject).getProjectSdk()); } myJavaParameters.getClassPath().add(JavaSdkUtil.getIdeaRtJarPath()); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java index 999752289ea8..270004471a0d 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java @@ -237,7 +237,7 @@ public class TestNGRunnableState extends JavaCommandLineState { .getPath());//todo !do not hard code lib name! // Configure rest of jars JavaParametersUtil.configureConfiguration(javaParameters, config); - Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectJdk() : ModuleRootManager.getInstance(module).getSdk(); + Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk(); javaParameters.setJdk(jdk); final Object[] patchers = Extensions.getExtensions(ExtensionPoints.JUNIT_PATCHER); for (Object patcher : patchers) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java index cf418924b5cd..528be4a3c2c9 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java @@ -470,7 +470,7 @@ public final class XsltRunConfiguration extends RunConfigurationBase implements jdk = ModuleRootManager.getInstance(module).getSdk(); } if (jdk == null) { - jdk = ProjectRootManager.getInstance(getProject()).getProjectJdk(); + jdk = ProjectRootManager.getInstance(getProject()).getProjectSdk(); } return jdk; } From 6e5c926a7c289116d39fed6bad0e28be74a1dd0d Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 21 Oct 2010 18:21:55 +0400 Subject: [PATCH 78/98] Git executable: fixed getGitExecutable() (according to ConfigurableModifiedTest) --- .../git4idea/src/git4idea/config/GitVcsApplicationSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java index 964589350565..38af49516670 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsApplicationSettings.java @@ -103,7 +103,7 @@ public class GitVcsApplicationSettings implements PersistentStateComponent Date: Thu, 21 Oct 2010 13:07:29 +0400 Subject: [PATCH 79/98] tip for search in settings (IDEA-60097) --- resources-en/src/tips/SearchInSettings.html | 13 +++++++++++++ resources-en/src/tips/images/search_settings.png | Bin 0 -> 7038 bytes resources-en/src/tips/tips.xml | 1 + 3 files changed, 14 insertions(+) create mode 100644 resources-en/src/tips/SearchInSettings.html create mode 100644 resources-en/src/tips/images/search_settings.png diff --git a/resources-en/src/tips/SearchInSettings.html b/resources-en/src/tips/SearchInSettings.html new file mode 100644 index 000000000000..2858bdfdc42e --- /dev/null +++ b/resources-en/src/tips/SearchInSettings.html @@ -0,0 +1,13 @@ + + + + + + +
You can quickly find a setting you need in the Settings dialog, without browsing through the numerous options. +Just type some characters that to your opinion exist in the option description, and the list of settings will reduce to the +matching ones. Select the desired entry, and see the setting that contains the entered characters highlighted: +

+
+ + diff --git a/resources-en/src/tips/images/search_settings.png b/resources-en/src/tips/images/search_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..a689f1452052f6a950e1af5e4db43bc3040d326f GIT binary patch literal 7038 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 I_bBdv01x?qC;$Ke literal 0 HcmV?d00001 diff --git a/resources-en/src/tips/tips.xml b/resources-en/src/tips/tips.xml index f4463faadd44..6d3a222eba79 100644 --- a/resources-en/src/tips/tips.xml +++ b/resources-en/src/tips/tips.xml @@ -84,6 +84,7 @@ + From 868f64f185abafd65cdc6161112195c8b3eb3009 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 13:19:13 +0400 Subject: [PATCH 80/98] move to correct place, sorry --- .../src/tips/SearchInSettings.html | 2 +- .../src/tips/images/search_settings.png | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename {resources-en => platform/platform-resources-en}/src/tips/SearchInSettings.html (84%) rename {resources-en => platform/platform-resources-en}/src/tips/images/search_settings.png (100%) diff --git a/resources-en/src/tips/SearchInSettings.html b/platform/platform-resources-en/src/tips/SearchInSettings.html similarity index 84% rename from resources-en/src/tips/SearchInSettings.html rename to platform/platform-resources-en/src/tips/SearchInSettings.html index 2858bdfdc42e..b9a158bd277a 100644 --- a/resources-en/src/tips/SearchInSettings.html +++ b/platform/platform-resources-en/src/tips/SearchInSettings.html @@ -5,7 +5,7 @@

You can quickly find a setting you need in the Settings dialog, without browsing through the numerous options. Just type some characters that to your opinion exist in the option description, and the list of settings will reduce to the matching ones. Select the desired entry, and see the setting that contains the entered characters highlighted: -

+

diff --git a/resources-en/src/tips/images/search_settings.png b/platform/platform-resources-en/src/tips/images/search_settings.png similarity index 100% rename from resources-en/src/tips/images/search_settings.png rename to platform/platform-resources-en/src/tips/images/search_settings.png From cd47af72e36682160729fd021e0d1d31f96af24c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 13:20:05 +0400 Subject: [PATCH 81/98] tip image updated (IDEA-59588) --- .../src/tips/images/issueNavigation1.png | Bin 13025 -> 24459 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/platform/platform-resources-en/src/tips/images/issueNavigation1.png b/platform/platform-resources-en/src/tips/images/issueNavigation1.png index 9c53dccfc9819d1aae7b1ebe5fa0c44c42c0ec9f..605d9acad17a556d56bc2db9286bd654b72359d5 100644 GIT binary patch literal 24459 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 From 944119af01616b7377613fac55eb51399da1b7e8 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 13:30:42 +0400 Subject: [PATCH 82/98] use GeneralCommandLine for running external editor of images (IDEA-19808) --- images/src/META-INF/ImagesPlugin.xml | 2 +- .../images/actions/EditExternallyAction.java | 124 ++++++++++++++++++ .../images/actions/EditExternalyAction.java | 123 ----------------- 3 files changed, 125 insertions(+), 124 deletions(-) create mode 100644 images/src/org/intellij/images/actions/EditExternallyAction.java delete mode 100644 images/src/org/intellij/images/actions/EditExternalyAction.java diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml index 8ff4e61b7bea..989297b32af5 100644 --- a/images/src/META-INF/ImagesPlugin.xml +++ b/images/src/META-INF/ImagesPlugin.xml @@ -27,7 +27,7 @@ - diff --git a/images/src/org/intellij/images/actions/EditExternallyAction.java b/images/src/org/intellij/images/actions/EditExternallyAction.java new file mode 100644 index 000000000000..795cd0ba873e --- /dev/null +++ b/images/src/org/intellij/images/actions/EditExternallyAction.java @@ -0,0 +1,124 @@ +/* + * Copyright 2000-2009 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.intellij.images.actions; + +import com.intellij.execution.ExecutionException; +import com.intellij.execution.configurations.GeneralCommandLine; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.PlatformDataKeys; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.EnvironmentUtil; +import org.intellij.images.ImagesBundle; +import org.intellij.images.fileTypes.ImageFileTypeManager; +import org.intellij.images.options.Options; +import org.intellij.images.options.OptionsManager; +import org.intellij.images.options.impl.OptionsConfigurabe; + +import java.io.File; +import java.util.Map; +import java.util.Set; + +/** + * Open image file externally. + * + * @author Alexey Efimov + */ +public final class EditExternallyAction extends AnAction { + public void actionPerformed(AnActionEvent e) { + Project project = e.getData(PlatformDataKeys.PROJECT); + VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); + Options options = OptionsManager.getInstance().getOptions(); + String executablePath = options.getExternalEditorOptions().getExecutablePath(); + if (StringUtil.isEmpty(executablePath)) { + Messages.showErrorDialog(project, + ImagesBundle.message("error.empty.external.editor.path"), + ImagesBundle.message("error.title.empty.external.editor.path")); + OptionsConfigurabe.show(project); + } + else { + if (files != null) { + Map env = EnvironmentUtil.getEnviromentProperties(); + Set varNames = env.keySet(); + for (String varName : varNames) { + if (SystemInfo.isWindows) { + executablePath = StringUtil.replace(executablePath, "%" + varName + "%", env.get(varName), true); + } + else { + executablePath = StringUtil.replace(executablePath, "${" + varName + "}", env.get(varName), false); + } + } + executablePath = FileUtil.toSystemDependentName(executablePath); + File executable = new File(executablePath); + GeneralCommandLine commandLine = new GeneralCommandLine(); + commandLine.setExePath(executable.exists() ? executable.getAbsolutePath() : executablePath); + ImageFileTypeManager typeManager = ImageFileTypeManager.getInstance(); + for (VirtualFile file : files) { + if (file.isInLocalFileSystem() && typeManager.isImage(file)) { + commandLine.addParameter(VfsUtil.virtualToIoFile(file).getAbsolutePath()); + } + } + commandLine.setWorkingDirectory(new File(executablePath).getParentFile()); + + try { + commandLine.createProcess(); + } + catch (ExecutionException ex) { + Messages.showErrorDialog(project, + ex.getLocalizedMessage(), + ImagesBundle.message("error.title.launching.external.editor")); + OptionsConfigurabe.show(project); + } + } + } + } + + public void update(AnActionEvent e) { + super.update(e); + + VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); + final boolean isEnabled = isImages(files); + if (e.getPlace().equals(ActionPlaces.PROJECT_VIEW_POPUP)) { + e.getPresentation().setVisible(isEnabled); + } + else { + e.getPresentation().setEnabled(isEnabled); + } + } + + private static boolean isImages(VirtualFile[] files) { + boolean isImagesFound = false; + if (files != null) { + ImageFileTypeManager typeManager = ImageFileTypeManager.getInstance(); + for (VirtualFile file : files) { + boolean isImage = typeManager.isImage(file); + isImagesFound |= isImage; + if (!file.isInLocalFileSystem() || !isImage) { + return false; + } + } + } + return isImagesFound; + } +} diff --git a/images/src/org/intellij/images/actions/EditExternalyAction.java b/images/src/org/intellij/images/actions/EditExternalyAction.java deleted file mode 100644 index 3399c400a95d..000000000000 --- a/images/src/org/intellij/images/actions/EditExternalyAction.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2000-2009 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. - */ - -/** $Id$ */ - -package org.intellij.images.actions; - -import com.intellij.openapi.actionSystem.ActionPlaces; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.EnvironmentUtil; -import org.intellij.images.ImagesBundle; -import org.intellij.images.fileTypes.ImageFileTypeManager; -import org.intellij.images.options.Options; -import org.intellij.images.options.OptionsManager; -import org.intellij.images.options.impl.OptionsConfigurabe; - -import java.io.File; -import java.io.IOException; -import java.util.Map; -import java.util.Set; - -/** - * Open image file externaly. - * - * @author Alexey Efimov - */ -public final class EditExternalyAction extends AnAction { - public void actionPerformed(AnActionEvent e) { - Project project = e.getData(PlatformDataKeys.PROJECT); - VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); - Options options = OptionsManager.getInstance().getOptions(); - String executablePath = options.getExternalEditorOptions().getExecutablePath(); - if (StringUtil.isEmpty(executablePath)) { - Messages.showErrorDialog(project, - ImagesBundle.message("error.empty.external.editor.path"), - ImagesBundle.message("error.title.empty.external.editor.path")); - OptionsConfigurabe.show(project); - } else { - if (files != null) { - Map env = EnvironmentUtil.getEnviromentProperties(); - Set varNames = env.keySet(); - for (String varName : varNames) { - if (SystemInfo.isWindows) { - executablePath = StringUtil.replace(executablePath, "%" + varName + "%", env.get(varName), true); - } else { - executablePath = StringUtil.replace(executablePath, "${" + varName + "}", env.get(varName), false); - } - } - executablePath = FileUtil.toSystemDependentName(executablePath); - File executable = new File(executablePath); - StringBuffer commandLine = new StringBuffer(executable.exists() ? executable.getAbsolutePath() : executablePath); - ImageFileTypeManager typeManager = ImageFileTypeManager.getInstance(); - for (VirtualFile file : files) { - if (file.isInLocalFileSystem() && typeManager.isImage(file)) { - commandLine.append(" \""); - commandLine.append(VfsUtil.virtualToIoFile(file).getAbsolutePath()); - commandLine.append('\"'); - } - } - - try { - File executableFile = new File(executablePath); - Runtime.getRuntime().exec(commandLine.toString(), null, executableFile.getParentFile()); - } catch (IOException ex) { - Messages.showErrorDialog(project, - ex.getLocalizedMessage(), - ImagesBundle.message("error.title.launching.external.editor")); - OptionsConfigurabe.show(project); - } - } - } - } - - public void update(AnActionEvent e) { - super.update(e); - - VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); - final boolean isEnabled = isImages(files); - if (e.getPlace().equals(ActionPlaces.PROJECT_VIEW_POPUP)) { - e.getPresentation().setVisible(isEnabled); - } - else { - e.getPresentation().setEnabled(isEnabled); - } - } - - private static boolean isImages(VirtualFile[] files) { - boolean isImagesFound = false; - if (files != null) { - ImageFileTypeManager typeManager = ImageFileTypeManager.getInstance(); - for (VirtualFile file : files) { - boolean isImage = typeManager.isImage(file); - isImagesFound |= isImage; - if (!file.isInLocalFileSystem() || !isImage) { - return false; - } - } - } - return isImagesFound; - } -} From c4946f1d1cc9ff3c05774293285cd04b91d8a175 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 13:34:21 +0400 Subject: [PATCH 83/98] delete obsolete isDummy parameter --- .../openapi/project/impl/ProjectManagerImpl.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java index 5eb0d324fac8..7c0201e3a10c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java @@ -214,7 +214,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt try { ProjectImpl project = - createAndInitProject(projectName, filePath, false, isDummy, ApplicationManager.getApplication().isUnitTestMode(), + createAndInitProject(projectName, filePath, false, ApplicationManager.getApplication().isUnitTestMode(), useDefaultProjectSettings ? getDefaultProject() : null); if (LOG_PROJECT_LEAKAGE_IN_TESTS) { myProjects.put(project, null); @@ -244,11 +244,8 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt return message; } - private ProjectImpl createAndInitProject(String projectName, String filePath, boolean isDefault, boolean isDummy, boolean isOptimiseTestLoadSpeed, + private ProjectImpl createAndInitProject(String projectName, String filePath, boolean isDefault, boolean isOptimiseTestLoadSpeed, @Nullable Project template) throws IOException { - if (isDummy) { - throw new UnsupportedOperationException("Dummy project is deprecated and shall not be used anymore."); - } final ProjectImpl project = isDefault ? new DefaultProject(this, filePath, isOptimiseTestLoadSpeed, projectName) : new ProjectImpl(this, filePath, isOptimiseTestLoadSpeed, projectName); @@ -299,7 +296,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt filePath = canonicalize(filePath); ProjectImpl project = null; try { - project = createAndInitProject(null, filePath, false, false, false, null); + project = createAndInitProject(null, filePath, false, false, null); } catch (ProcessCanceledException e) { if (project != null) { @@ -332,7 +329,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt public synchronized Project getDefaultProject() { if (myDefaultProject == null) { try { - myDefaultProject = createAndInitProject(null, null, true, false, ApplicationManager.getApplication().isUnitTestMode(), null); + myDefaultProject = createAndInitProject(null, null, true, ApplicationManager.getApplication().isUnitTestMode(), null); myDefaultProjectRootElement = null; } catch (IOException e) { From 2d382834d2802f7fcce645826c6e51515e3eccf7 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 13:45:14 +0400 Subject: [PATCH 84/98] use remembered value of "open in new window" also when opening a new project; rename option (IDEA-58404) --- .../com/intellij/ide/impl/NewProjectUtil.java | 12 ++++++---- .../intellij/ide/GeneralSettingsPanel.form | 2 +- .../com/intellij/ide/impl/ProjectUtil.java | 23 +++++++++++-------- .../PlatformProjectOpenProcessor.java | 17 +------------- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java index 1288d2af9c68..d6fc7c720a39 100644 --- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java +++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java @@ -19,6 +19,7 @@ */ package com.intellij.ide.impl; +import com.intellij.ide.GeneralSettings; import com.intellij.ide.IdeBundle; import com.intellij.ide.util.newProjectWizard.AddModuleWizard; import com.intellij.ide.util.projectWizard.ProjectBuilder; @@ -188,13 +189,16 @@ public class NewProjectUtil { public static void closePreviousProject(final Project projectToClose) { Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); if (openProjects.length > 0) { - int exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.new.project"), - new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe")}, 1, 0, - Messages.getQuestionIcon()); + final GeneralSettings settings = GeneralSettings.getInstance(); + int exitCode = settings.getConfirmOpenNewProject(); + if (exitCode < 0) { + exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.new.project"), + new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe")}, 1, 0, + Messages.getQuestionIcon(), new ProjectNewWindowDoNotAskOption()); + } if (exitCode == 1) { // "No" option ProjectUtil.closeProject(projectToClose != null ? projectToClose : openProjects[openProjects.length - 1]); } } } - } diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsPanel.form b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsPanel.form index 0b847b8ab594..85e7ae2e640b 100644 --- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsPanel.form +++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsPanel.form @@ -51,7 +51,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java index 5171776260ef..7862a170ffa7 100644 --- a/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java @@ -150,16 +150,7 @@ public class ProjectUtil { } if (!forceOpenInNewFrame && openProjects.length > 0) { - final GeneralSettings settings = GeneralSettings.getInstance(); - int exitCode; - if (settings.getConfirmOpenNewProject() < 0) { - exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), - new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), - CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), - new ProjectNewWindowDoNotAskOption()); - } else { - exitCode = settings.getConfirmOpenNewProject(); - } + int exitCode = confirmOpenNewProject(); if (exitCode == 1) { // "No" option if (!closeProject(projectToClose != null ? projectToClose : openProjects[openProjects.length - 1])) return null; } @@ -190,6 +181,18 @@ public class ProjectUtil { return project; } + public static int confirmOpenNewProject() { + final GeneralSettings settings = GeneralSettings.getInstance(); + if (settings.getConfirmOpenNewProject() < 0) { + return Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), + new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), + CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), + new ProjectNewWindowDoNotAskOption()); + } else { + return settings.getConfirmOpenNewProject(); + } + } + private static boolean isSameProject(String path, Project p) { final IProjectStore projectStore = ((ProjectEx)p).getStateStore(); diff --git a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java index 83e9f56b4285..7c2ef3ce2d20 100644 --- a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java +++ b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java @@ -15,10 +15,6 @@ */ package com.intellij.platform; -import com.intellij.CommonBundle; -import com.intellij.ide.GeneralSettings; -import com.intellij.ide.IdeBundle; -import com.intellij.ide.impl.ProjectNewWindowDoNotAskOption; import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; @@ -29,7 +25,6 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ex.ProjectManagerEx; import com.intellij.openapi.project.impl.ProjectManagerImpl; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindowManager; @@ -78,17 +73,7 @@ public class PlatformProjectOpenProcessor extends ProjectOpenProcessor { Project[] openProjects = ProjectManager.getInstance().getOpenProjects(); if (!forceOpenInNewFrame && openProjects.length > 0) { - final GeneralSettings settings = GeneralSettings.getInstance(); - int exitCode; - if (settings.getConfirmOpenNewProject() < 0) { - exitCode = Messages.showDialog(IdeBundle.message("prompt.open.project.in.new.frame"), IdeBundle.message("title.open.project"), - new String[]{IdeBundle.message("button.newframe"), IdeBundle.message("button.existingframe"), - CommonBundle.getCancelButtonText()}, 1, 0, Messages.getQuestionIcon(), - new ProjectNewWindowDoNotAskOption()); - } - else { - exitCode = settings.getConfirmOpenNewProject(); - } + int exitCode = ProjectUtil.confirmOpenNewProject(); if (exitCode == 1) { // "No" option if (!ProjectUtil.closeProject(projectToClose != null ? projectToClose : openProjects[openProjects.length - 1])) return null; } From ad44963e8076d19757d651fcef27ebb0d560a002 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 21 Oct 2010 14:08:19 +0400 Subject: [PATCH 85/98] include .png icons in IDEA CE tar.gz distribution (IDEA-53387) --- build/images/idea_CE128.png | Bin 0 -> 16074 bytes build/images/idea_CE16.png | Bin 0 -> 855 bytes build/images/idea_CE32.png | Bin 0 -> 2323 bytes build/images/idea_CE48.png | Bin 0 -> 3924 bytes build/scripts/dist.gant | 1 + 5 files changed, 1 insertion(+) create mode 100644 build/images/idea_CE128.png create mode 100644 build/images/idea_CE16.png create mode 100644 build/images/idea_CE32.png create mode 100644 build/images/idea_CE48.png diff --git a/build/images/idea_CE128.png b/build/images/idea_CE128.png new file mode 100644 index 0000000000000000000000000000000000000000..5b04015a55888c13d890d4c53cb91d4021d11011 GIT binary patch literal 16074 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 QBLDyZ07*qoM6N<$f@@<*F8}}l literal 0 HcmV?d00001 diff --git a/build/images/idea_CE16.png b/build/images/idea_CE16.png new file mode 100644 index 0000000000000000000000000000000000000000..c0e931fc86c927679af772ca9d6c88018b5e7b37 GIT binary patch literal 855 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 i(U(HF@jd@rfB^u%Z8`a_*@_qd0000 Date: Thu, 21 Oct 2010 18:28:11 +0400 Subject: [PATCH 86/98] major release date in AppInfo --- .../application/ex/ApplicationInfoEx.java | 3 ++ .../application/impl/ApplicationInfoImpl.java | 44 ++++++++++++------- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java index 46f9046ef782..dd0138cbd068 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java @@ -27,6 +27,7 @@ package com.intellij.openapi.application.ex; import com.intellij.openapi.application.ApplicationInfo; import java.awt.*; +import java.util.Calendar; import java.util.List; public abstract class ApplicationInfoEx extends ApplicationInfo { @@ -35,6 +36,8 @@ public abstract class ApplicationInfoEx extends ApplicationInfo { return (ApplicationInfoEx) getInstance(); } + public abstract Calendar getMajorReleaseBuildDate(); + public abstract String getLogoUrl(); public abstract Color getLogoTextColor(); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java index 019003a1259d..bc33d0767684 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationInfoImpl.java @@ -51,6 +51,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern @NonNls private String myOpaqueIconUrl = "/icon.png"; @NonNls private String myToolWindowIconUrl = "/general/toolWindowProject.png"; private Calendar myBuildDate = null; + private Calendar myMajorReleaseBuildDate = null; private String myPackageCode = null; private boolean myShowLicensee = true; private String myWelcomeScreenCaptionUrl; @@ -81,6 +82,7 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern @NonNls private static final String ELEMENT_BUILD = "build"; @NonNls private static final String ATTRIBUTE_NUMBER = "number"; @NonNls private static final String ATTRIBUTE_DATE = "date"; + @NonNls private static final String ATTRIBUTE_MAJOR_RELEASE_DATE = "majorReleaseDate"; @NonNls private static final String ELEMENT_LOGO = "logo"; @NonNls private static final String ATTRIBUTE_URL = "url"; @NonNls private static final String ATTRIBUTE_TEXTCOLOR = "textcolor"; @@ -128,6 +130,10 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern return myBuildDate; } + public Calendar getMajorReleaseBuildDate() { + return myMajorReleaseBuildDate != null ? myMajorReleaseBuildDate : myBuildDate; + } + @Override public BuildNumber getBuild() { return BuildNumber.fromString(myBuildNumber); @@ -314,21 +320,11 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern myBuildDate = new GregorianCalendar(); } else { - int year = 0; - int month = 0; - int day = 0; - try { - year = Integer.parseInt(dateString.substring(0, 4)); - month = Integer.parseInt(dateString.substring(4, 6)); - day = Integer.parseInt(dateString.substring(6, 8)); - } - catch (Exception ex) { - //ignore - } - if (month > 0) { - month--; - } - myBuildDate = new GregorianCalendar(year, month, day); + myBuildDate = parseDate(dateString); + } + String majorReleaseDateString = buildElement.getAttributeValue(ATTRIBUTE_MAJOR_RELEASE_DATE); + if (majorReleaseDateString != null) { + myMajorReleaseBuildDate = parseDate(majorReleaseDateString); } } @@ -446,6 +442,24 @@ public class ApplicationInfoImpl extends ApplicationInfoEx implements JDOMExtern } } + private static GregorianCalendar parseDate(String dateString) { + int year = 0; + int month = 0; + int day = 0; + try { + year = Integer.parseInt(dateString.substring(0, 4)); + month = Integer.parseInt(dateString.substring(4, 6)); + day = Integer.parseInt(dateString.substring(6, 8)); + } + catch (Exception ex) { + //ignore + } + if (month > 0) { + month--; + } + return new GregorianCalendar(year, month, day); + } + public List getPluginChooserPages() { return myPluginChooserPages; } From 0b26d50083da47dd646d62440555324f9ca41f16 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 21 Oct 2010 18:31:15 +0400 Subject: [PATCH 87/98] Fix: IDEA-49788 (Grails: Run Grails Target dialog: there is no completion for a script from user home) --- xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java index dd6df1d7ae6f..2daf4c2d01f2 100644 --- a/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java +++ b/xml/impl/src/com/intellij/xml/actions/XmlSplitTagAction.java @@ -140,13 +140,13 @@ public class XmlSplitTagAction implements IntentionAction { final String name = xmlTag.getName(); sb.append("<").append(name); if (attrs.length() > 0) { - sb.append(' ').append(attrs.toString()); + sb.append(' ').append(attrs); } sb.append('>'); sb.append(first); sb.append("<").append(name); if (attrsWoId.length() > 0) { - sb.append(' ').append(attrsWoId.toString()); + sb.append(' ').append(attrsWoId); } sb.append('>'); sb.append(second).append(""); From 54dfd905a87a49161187582446c5409ea8551f58 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 21 Oct 2010 18:58:19 +0400 Subject: [PATCH 88/98] fix NPE --- .../platform-api/src/com/intellij/ui/treeStructure/Tree.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java index 4a6b17238756..4cf4e129f6ab 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java @@ -175,8 +175,8 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith TreePath[] paths = getSelectionModel().getSelectionPaths(); if (paths != null) { for (TreePath each : paths) { - Rectangle selection = getPathBounds(each); - if (g.getClipBounds().intersects(selection) || g.getClipBounds().contains(selection)) { + final Rectangle selection = getPathBounds(each); + if (selection != null && (g.getClipBounds().intersects(selection) || g.getClipBounds().contains(selection))) { if (myBusy) { Rectangle busyIconBounds = myBusyIcon.getBounds(); if (selection.contains(busyIconBounds) || selection.intersects(busyIconBounds)) { From 87766a2dc1db0748e723e668b1b1f5881c596355 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 21 Oct 2010 19:08:42 +0400 Subject: [PATCH 89/98] providing better error descriptions (IDEA-60110) --- .../intellij/lang/ant/dom/CustomAntElementsRegistry.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java index 8bf4aa8f39b4..71194132edf6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java @@ -283,21 +283,21 @@ public class CustomAntElementsRegistry { clazz = loader.loadClass(classname); } catch (ClassNotFoundException e) { - error = e.getMessage(); + error = "Class not found " + e.getMessage(); if (error == null) { error = ""; } clazz = null; } catch (NoClassDefFoundError e) { - error = e.getMessage(); + error = "Class definition not found " + e.getMessage(); if (error == null) { error = ""; } clazz = null; } catch (UnsupportedClassVersionError e) { - error = e.getMessage(); + error = "Unsupported class version " + e.getMessage(); if (error == null) { error = ""; } @@ -309,7 +309,7 @@ public class CustomAntElementsRegistry { private void addCustomDefinition(@NotNull AntDomNamedElement declaringTag, String customTagName, String nsUri, Class clazz, String error) { final XmlName xmlName = new XmlName(customTagName, nsUri == null? "" : nsUri); if (error != null) { - myErrors.put(xmlName, customTagName); + myErrors.put(xmlName, error); } myCustomElements.put(xmlName, clazz); myDeclarations.put(xmlName, declaringTag); From a083c6fc4c794f40198e2064741c1cbb918256eb Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 21 Oct 2010 19:31:59 +0400 Subject: [PATCH 90/98] IDEA-60172 Ctrl + Y doesn't delete the line --- .../com/intellij/openapi/editor/actions/DeleteLineAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java index 185198aa17ee..9c3b94b20c0b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/DeleteLineAction.java @@ -45,8 +45,8 @@ public class DeleteLineAction extends TextComponentEditorAction { int selectionEnd = selectionModel.getSelectionEnd(); selectionModel.removeSelection(); int lineStartOffset = document.getLineStartOffset(document.getLineNumber(selectionStart)); - int lineEndOffset = document.getLineEndOffset(document.getLineNumber(selectionEnd)); - document.deleteString(lineStartOffset, lineEndOffset); + int nextLineStartOffset = Math.min(document.getTextLength(), document.getLineStartOffset(document.getLineNumber(selectionEnd) + 1)); + document.deleteString(lineStartOffset, nextLineStartOffset); return; } deleteLineAtCaret(editor); From c4dd9429501ca7282e530400358de41ef258f3b8 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 17:21:48 +0400 Subject: [PATCH 91/98] more idiomatic autopopup check --- .../completion/ComboEditorCompletionContributor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java index fdbc741cf588..de826e017f2e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/ComboEditorCompletionContributor.java @@ -31,8 +31,7 @@ public class ComboEditorCompletionContributor extends CompletionContributor{ @Override public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) { - final CompletionProcess process = CompletionService.getCompletionService().getCurrentCompletion(); - if (process != null && process.isAutopopupCompletion()) { + if (parameters.getInvocationCount() == 0) { return; } From a3a06b1bce5efc21fdcbb4413cf0d79f3e67403c Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 18:32:37 +0400 Subject: [PATCH 92/98] more stable lookup position --- .../completion/CodeCompletionHandlerBase.java | 1 - .../com/intellij/codeInsight/lookup/impl/LookupImpl.java | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java index 109433c646cd..f1a607a6f829 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java @@ -199,7 +199,6 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { LookupImpl lookup = (LookupImpl)LookupManager.getInstance(editor.getProject()).createLookup(editor, LookupElement.EMPTY_ARRAY, "", LookupArranger.DEFAULT); if (editor.isOneLineMode()) { - lookup.setForceShowAsPopup(true); lookup.setCancelOnClickOutside(true); lookup.setCancelOnOtherWindowOpen(true); lookup.setResizable(false); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 520d65ad1511..76e808e900ab 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -550,13 +550,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { return myLookupStartMarker.getStartOffset(); } - @Override - protected void beforeShow() { - if (isRealPopup()) { - getComponent().setBorder(null); - } - } - public void performGuardedChange(Runnable change) { assert !myChangeGuard; myChangeGuard = true; @@ -648,6 +641,8 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { if (ApplicationManager.getApplication().isUnitTestMode()) return; + getComponent().setBorder(null); + Point p = calculatePosition(); HintManagerImpl hintManager = HintManagerImpl.getInstanceImpl(); hintManager.showEditorHint(this, myEditor, p, HintManagerImpl.HIDE_BY_ESCAPE | HintManagerImpl.UPDATE_BY_SCROLLING, 0, false); From 90b6ca94e201cc8cb105539716652a1ff1996411 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 18:53:51 +0400 Subject: [PATCH 93/98] some cases where lookup was not under the prefix fixed --- .../codeInsight/lookup/impl/BackspaceHandler.java | 13 +++---------- .../codeInsight/lookup/impl/TypedHandler.java | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java index dd23bb802af0..836cbdba1b6c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java @@ -38,15 +38,6 @@ public class BackspaceHandler extends EditorActionHandler { return; } - boolean toRestart = false; - final String prefix = lookup.getAdditionalPrefix(); - if (prefix.length() > 0) { - lookup.setAdditionalPrefix(prefix.substring(0, prefix.length() - 1)); - } - else { - toRestart = lookup.getLookupStart() < editor.getCaretModel().getOffset(); - } - lookup.performGuardedChange(new Runnable() { @Override public void run() { @@ -54,11 +45,13 @@ public class BackspaceHandler extends EditorActionHandler { } }); + final String prefix = lookup.getAdditionalPrefix(); if (prefix.length() > 0) { + lookup.setAdditionalPrefix(prefix.substring(0, prefix.length() - 1)); return; } - if (toRestart) { + if (lookup.getLookupStart() < editor.getCaretModel().getOffset()) { final CompletionProcess process = CompletionService.getCompletionService().getCurrentCompletion(); if (process instanceof CompletionProgressIndicator) { ((CompletionProgressIndicator)process).restartCompletion(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/TypedHandler.java index e9c8e99a69e4..eff071ab3b50 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/TypedHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/TypedHandler.java @@ -58,7 +58,6 @@ public class TypedHandler implements TypedActionHandler { } }); if (result == CharFilter.Result.ADD_TO_PREFIX) { - lookup.setAdditionalPrefix(lookup.getAdditionalPrefix() + charTyped); Document document = editor.getDocument(); long modificationStamp = document.getModificationStamp(); @@ -67,6 +66,7 @@ public class TypedHandler implements TypedActionHandler { EditorModificationUtil.typeInStringAtCaretHonorBlockSelection(editor, String.valueOf(charTyped), true); } }); + lookup.setAdditionalPrefix(lookup.getAdditionalPrefix() + charTyped); AutoHardWrapHandler.getInstance().wrapLineIfNecessary(editor, dataContext, modificationStamp); From 348a1be0f52b0deea69e937c676477e0c18435f2 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 19:21:44 +0400 Subject: [PATCH 94/98] lookup should listen for editor/document events even before it's shown --- .../codeInsight/lookup/impl/LookupImpl.java | 79 +++++++++---------- 1 file changed, 38 insertions(+), 41 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 76e808e900ab..cfec8f4dd080 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -83,10 +83,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { private final LookupCellRenderer myCellRenderer; private Boolean myPositionedAbove = null; - private CaretListener myEditorCaretListener; - private SelectionListener myEditorSelectionListener; - private EditorMouseListener myEditorMouseListener; - private final ArrayList myListeners = new ArrayList(); private boolean myShown = false; @@ -141,6 +137,8 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { updateListHeight(model); setArranger(arranger); + + addListeners(); } public void setArranger(LookupArranger arranger) { @@ -571,6 +569,18 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { LOG.assertTrue(!myShown); myShown = true; + if (ApplicationManager.getApplication().isUnitTestMode()) return; + + getComponent().setBorder(null); + + Point p = calculatePosition(); + HintManagerImpl hintManager = HintManagerImpl.getInstanceImpl(); + hintManager.showEditorHint(this, myEditor, p, HintManagerImpl.HIDE_BY_ESCAPE | HintManagerImpl.UPDATE_BY_SCROLLING, 0, false); + + myShownStamp = System.currentTimeMillis(); + } + + private void addListeners() { myEditor.getDocument().addDocumentListener(new DocumentAdapter() { public void documentChanged(DocumentEvent e) { if (!myChangeGuard) { @@ -579,29 +589,41 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { } }, this); - myEditorCaretListener = new CaretListener() { + final CaretListener caretListener = new CaretListener() { public void caretPositionChanged(CaretEvent e){ - caretOrSelectionChanged(); + if (!myChangeGuard) { + hide(); + } } }; - myEditorSelectionListener = new SelectionListener() { + final SelectionListener selectionListener = new SelectionListener() { public void selectionChanged(final SelectionEvent e) { - caretOrSelectionChanged(); + if (!myChangeGuard) { + hide(); + } } }; - myEditor.getCaretModel().addCaretListener(myEditorCaretListener); - myEditor.getSelectionModel().addSelectionListener(myEditorSelectionListener); - - myEditorMouseListener = new EditorMouseAdapter() { + final EditorMouseListener mouseListener = new EditorMouseAdapter() { public void mouseClicked(EditorMouseEvent e){ e.consume(); hide(); } }; - myEditor.addEditorMouseListener(myEditorMouseListener); + + myEditor.getCaretModel().addCaretListener(caretListener); + myEditor.getSelectionModel().addSelectionListener(selectionListener); + myEditor.addEditorMouseListener(mouseListener); + Disposer.register(this, new Disposable() { + @Override + public void dispose() { + myEditor.getCaretModel().removeCaretListener(caretListener); + myEditor.getSelectionModel().removeSelectionListener(selectionListener); + myEditor.removeEditorMouseListener(mouseListener); + } + }); myList.addListSelectionListener(new ListSelectionListener() { - private LookupElement oldItem = null; + private LookupElement oldItem = null; public void valueChanged(ListSelectionEvent e){ LookupElement item = getCurrentItem(); @@ -621,7 +643,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { final int i = myList.locationToIndex(point); if (i >= 0) { final LookupElement selected = (LookupElement)myList.getModel().getElementAt(i); - if (selected != null && + if (selected != null && e.getClickCount() == 1 && point.x >= myList.getCellBounds(i, i).width - PopupIcons.EMPTY_ICON.getIconWidth() && ShowLookupActionsHandler.showItemActions(LookupImpl.this, selected)) { @@ -638,22 +660,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { } } }); - - if (ApplicationManager.getApplication().isUnitTestMode()) return; - - getComponent().setBorder(null); - - Point p = calculatePosition(); - HintManagerImpl hintManager = HintManagerImpl.getInstanceImpl(); - hintManager.showEditorHint(this, myEditor, p, HintManagerImpl.HIDE_BY_ESCAPE | HintManagerImpl.UPDATE_BY_SCROLLING, 0, false); - - myShownStamp = System.currentTimeMillis(); - } - - private void caretOrSelectionChanged() { - if (!myChangeGuard) { - hide(); - } } private int calcLookupStart() { @@ -922,16 +928,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable { assert !myDisposed; Disposer.dispose(myProcessIcon); - if (myEditorCaretListener != null) { - myEditor.getCaretModel().removeCaretListener(myEditorCaretListener); - myEditor.getSelectionModel().removeSelectionListener(myEditorSelectionListener); - myEditorCaretListener = null; - myEditorSelectionListener = null; - } - if (myEditorMouseListener != null) { - myEditor.removeEditorMouseListener(myEditorMouseListener); - myEditorMouseListener = null; - } + myDisposed = true; } From aa1c3a522c7fa7aef34215d29475eb6bf0dee489 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 19:41:56 +0400 Subject: [PATCH 95/98] don't close lookup on typing during in-place rename --- .../codeInsight/template/impl/TemplateState.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java index e79090729741..298b8601441d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java @@ -125,7 +125,17 @@ public class TemplateState implements Disposable { public void beforeCommandFinished(CommandEvent event) { if (started) { - afterChangedUpdate(); + Runnable runnable = new Runnable() { + public void run() { + afterChangedUpdate(); + } + }; + final LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(myEditor); + if (lookup != null) { + lookup.performGuardedChange(runnable); + } else { + runnable.run(); + } } } }; From 9096eb8d2d89fadeff20f433373d7a29f6253d3c Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Thu, 21 Oct 2010 19:40:41 +0400 Subject: [PATCH 96/98] fix KeymapTest --- platform/platform-resources/src/idea/Keymap_Netbeans.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/platform/platform-resources/src/idea/Keymap_Netbeans.xml b/platform/platform-resources/src/idea/Keymap_Netbeans.xml index 89b6cf4258de..4b643cda07ab 100644 --- a/platform/platform-resources/src/idea/Keymap_Netbeans.xml +++ b/platform/platform-resources/src/idea/Keymap_Netbeans.xml @@ -334,9 +334,6 @@ - - - From 8b6d6332e29935fb6f6345a5fd12330e2c0d9b9d Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 21 Oct 2010 20:02:29 +0400 Subject: [PATCH 97/98] IDEA-53540 run dx compiler only for package directories instead of whole output dir; refactoring --- .../android/compiler/AndroidDexCompiler.java | 21 +++++++--- .../compiler/AndroidPackagingCompiler.java | 15 ++----- .../android/compiler/tools/AndroidDx.java | 6 ++- .../android/facet/AndroidRootUtil.java | 41 +++++++++++-------- 4 files changed, 49 insertions(+), 34 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java index a527276651ce..c6b224f751e6 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompiler.java @@ -129,13 +129,15 @@ public class AndroidDexCompiler implements ClassPostProcessingCompiler { AndroidFacetConfiguration configuration = facet.getConfiguration(); AndroidPlatform platform = configuration.getAndroidPlatform(); if (platform != null) { - Set dependencies = AndroidRootUtil.getExternalLibrariesAndModules(module, outputDir, platform.getLibrary()); - List files = new ArrayList(); - files.add(outputDir); - files.addAll(dependencies); + Set files = new HashSet(); + addModuleOutputDir(files, outputDir); + files.addAll(AndroidRootUtil.getExternalLibraries(module, platform.getLibrary())); + for (VirtualFile file : AndroidRootUtil.getDependentModules(module, outputDir)) { + addModuleOutputDir(files, file); + } VirtualFile outputDirForTests = extension.getCompilerOutputPathForTests(); if (outputDirForTests != null) { - files.add(outputDirForTests); + addModuleOutputDir(files, outputDirForTests); } IAndroidTarget target = configuration.getAndroidTarget(); if (target != null) { @@ -149,6 +151,15 @@ public class AndroidDexCompiler implements ClassPostProcessingCompiler { } return items.toArray(new ProcessingItem[items.size()]); } + + private static void addModuleOutputDir(Set files, VirtualFile dir) { + // only include files inside packages + for (VirtualFile child : dir.getChildren()) { + if (child.isDirectory()) { + files.add(child); + } + } + } } private static void collectClassFilesInLibraryModules(AndroidFacet facet, Collection result) { diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java index f9a6c90a29cd..d9e63ab2d994 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java @@ -52,20 +52,11 @@ public class AndroidPackagingCompiler implements PackagingCompiler { @NotNull private static VirtualFile[] getExternalJars(@NotNull Module module, - @NotNull VirtualFile moduleOutputDir, @NotNull AndroidFacetConfiguration configuration) { AndroidPlatform platform = configuration.getAndroidPlatform(); if (platform != null) { - Set externalLibsAndModules = - AndroidRootUtil.getExternalLibrariesAndModules(module, moduleOutputDir, platform.getLibrary()); - List result = new ArrayList(); - for (VirtualFile file : externalLibsAndModules) { - // ignore modules' compiler output folders - if (!file.isDirectory()) { - result.add(file); - } - } - return result.toArray(new VirtualFile[result.size()]); + List externalLibsAndModules = AndroidRootUtil.getExternalLibraries(module, platform.getLibrary()); + return externalLibsAndModules.toArray(new VirtualFile[externalLibsAndModules.size()]); } return VirtualFile.EMPTY_ARRAY; } @@ -107,7 +98,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler { AndroidFacetConfiguration configuration = facet.getConfiguration(); VirtualFile outputDir = context.getModuleOutputDirectory(module); if (outputDir != null) { - VirtualFile[] externalJars = getExternalJars(module, outputDir, configuration); + VirtualFile[] externalJars = getExternalJars(module, configuration); String resPackage = AndroidResourcesPackagingCompiler.getOutputPath(module, outputDir); String outputPath = new File(outputDir.getPath(), module.getName() + ".apk").getPath(); String classesDexPath = new File(outputDir.getPath(), AndroidUtils.CLASSES_FILE_NAME).getPath(); diff --git a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidDx.java b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidDx.java index a756f66f74a7..d914da45490d 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidDx.java +++ b/plugins/android/src/org/jetbrains/android/compiler/tools/AndroidDx.java @@ -18,6 +18,7 @@ package org.jetbrains.android.compiler.tools; import com.android.sdklib.IAndroidTarget; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.CommandLineBuilder; +import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.configurations.JavaParameters; import com.intellij.execution.configurations.ParametersList; import com.intellij.execution.process.OSProcessHandler; @@ -74,13 +75,16 @@ public final class AndroidDx { parameters.setMainClass(DEX_MAIN); ParametersList params = parameters.getProgramParametersList(); //params.add("--verbose"); + params.add("--no-strict"); params.add("--output=" + outFile); params.addAll(compileTargets); parameters.getVMParametersList().add("-Xmx1024M"); parameters.getClassPath().add(dxJar); Process process = null; try { - process = CommandLineBuilder.createFromJavaParameters(parameters, true).createProcess(); + GeneralCommandLine commandLine = CommandLineBuilder.createFromJavaParameters(parameters, true); + LOG.info(commandLine.getCommandLineString()); + process = commandLine.createProcess(); } catch (ExecutionException e) { messages.get(CompilerMessageCategory.ERROR).add("ExecutionException: " + e.getMessage()); diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java b/plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java index ea7572c95175..62dcd9f1128e 100644 --- a/plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java +++ b/plugins/android/src/org/jetbrains/android/facet/AndroidRootUtil.java @@ -29,10 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; /** @@ -136,7 +133,10 @@ public class AndroidRootUtil { return getFileByRelativeModulePath(module, '/' + SdkConstants.FD_GEN_SOURCES, false); } - public static void fillExternalLibrariesAndModules(final Module module, final Set result, final Library platformLibrary) { + private static void fillExternalLibrariesAndModules(final Module module, + final Set outputDirs, + @Nullable final Collection libraries, + final Library platformLibrary) { ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { ModuleRootManager manager = ModuleRootManager.getInstance(module); @@ -144,18 +144,19 @@ public class AndroidRootUtil { if (!(entry instanceof ExportableOrderEntry) || ((ExportableOrderEntry)entry).getScope() != DependencyScope.COMPILE) { continue; } - if (entry instanceof LibraryOrderEntry) { + if (libraries != null && entry instanceof LibraryOrderEntry) { Library library = ((LibraryOrderEntry)entry).getLibrary(); + assert platformLibrary != null; if (!platformLibrary.equals(library)) { if (library != null) { for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) { if (file.exists()) { if (file.getFileSystem() instanceof JarFileSystem) { VirtualFile localFile = JarFileSystem.getInstance().getVirtualFileForJar(file); - if (localFile != null) result.add(localFile); + if (localFile != null) libraries.add(localFile); } else { - result.add(file); + libraries.add(file); } } } @@ -168,17 +169,17 @@ public class AndroidRootUtil { if (extension != null) { VirtualFile classDir = extension.getCompilerOutputPath(); boolean added = false; - if (!result.contains(classDir) && classDir != null && classDir.exists()) { - result.add(classDir); + if (!outputDirs.contains(classDir) && classDir != null && classDir.exists()) { + outputDirs.add(classDir); added = true; } VirtualFile classDirForTests = extension.getCompilerOutputPathForTests(); - if (!result.contains(classDirForTests) && classDirForTests != null && classDirForTests.exists()) { - result.add(classDirForTests); + if (!outputDirs.contains(classDirForTests) && classDirForTests != null && classDirForTests.exists()) { + outputDirs.add(classDirForTests); added = true; } if (added) { - fillExternalLibrariesAndModules(module, result, platformLibrary); + fillExternalLibrariesAndModules(module, outputDirs, libraries, platformLibrary); } } } @@ -188,16 +189,24 @@ public class AndroidRootUtil { } @NotNull - public static Set getExternalLibrariesAndModules(Module module, VirtualFile moduleOutputDir, Library platformLibrary) { + public static List getExternalLibraries(Module module, Library platformLibrary) { Set files = new HashSet(); - fillExternalLibrariesAndModules(module, files, platformLibrary); + List libs = new ArrayList(); + fillExternalLibrariesAndModules(module, files, libs, platformLibrary); + return libs; + } + + @NotNull + public static Set getDependentModules(Module module, VirtualFile moduleOutputDir) { + Set files = new HashSet(); + fillExternalLibrariesAndModules(module, files, null, null); files.remove(moduleOutputDir); return files; } @NotNull public static VirtualFile[] getResourceOverlayDirs(Module module) { - AndroidFacet facet = AndroidFacet.getInstance(module); + AndroidFacet facet = AndroidFacet.getInstance(module); if (facet == null) { return VirtualFile.EMPTY_ARRAY; } From 1d2fb47c090585329014c92e4b70cd0b9c6a4050 Mon Sep 17 00:00:00 2001 From: "peter.gromov" Date: Thu, 21 Oct 2010 20:02:25 +0400 Subject: [PATCH 98/98] fix NPE --- .../com/intellij/codeInsight/template/impl/TemplateState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java index 298b8601441d..b8365ad8aa7e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java @@ -130,7 +130,7 @@ public class TemplateState implements Disposable { afterChangedUpdate(); } }; - final LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(myEditor); + final LookupImpl lookup = myEditor != null ? (LookupImpl)LookupManager.getActiveLookup(myEditor) : null; if (lookup != null) { lookup.performGuardedChange(runnable); } else {