From 4b80aa4435aaa12b35112cdac59d07cd38e41f9e Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 19 Jul 2016 15:03:18 +0300 Subject: [PATCH 01/74] use getBoxedTypeName --- .../expression/BoxingEvaluator.java | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BoxingEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BoxingEvaluator.java index 1bcd93ef432f2..c5eb7951615e6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BoxingEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BoxingEvaluator.java @@ -19,9 +19,9 @@ import com.intellij.debugger.engine.JVMNameUtil; import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; -import com.intellij.psi.CommonClassNames; +import com.intellij.psi.PsiPrimitiveType; +import com.intellij.psi.impl.PsiJavaParserFacadeImpl; import com.sun.jdi.*; -import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; @@ -43,29 +43,12 @@ public Object evaluate(EvaluationContextImpl context) throws EvaluateException { return result; } - if (result instanceof BooleanValue) { - return convertToWrapper(context, (BooleanValue)result, CommonClassNames.JAVA_LANG_BOOLEAN); - } - if (result instanceof ByteValue) { - return convertToWrapper(context, (ByteValue)result, CommonClassNames.JAVA_LANG_BYTE); - } - if (result instanceof CharValue) { - return convertToWrapper(context, (CharValue)result, CommonClassNames.JAVA_LANG_CHARACTER); - } - if (result instanceof ShortValue) { - return convertToWrapper(context, (ShortValue)result, CommonClassNames.JAVA_LANG_SHORT); - } - if (result instanceof IntegerValue) { - return convertToWrapper(context, (IntegerValue)result, CommonClassNames.JAVA_LANG_INTEGER); - } - if (result instanceof LongValue) { - return convertToWrapper(context, (LongValue)result, CommonClassNames.JAVA_LANG_LONG); - } - if (result instanceof FloatValue) { - return convertToWrapper(context, (FloatValue)result, CommonClassNames.JAVA_LANG_FLOAT); - } - if (result instanceof DoubleValue) { - return convertToWrapper(context, (DoubleValue)result, CommonClassNames.JAVA_LANG_DOUBLE); + if (result instanceof PrimitiveValue) { + PrimitiveValue primitiveValue = (PrimitiveValue)result; + PsiPrimitiveType primitiveType = PsiJavaParserFacadeImpl.getPrimitiveType(primitiveValue.type().name()); + if (primitiveType != null) { + return convertToWrapper(context, primitiveValue, primitiveType.getBoxedTypeName()); + } } throw new EvaluateException("Cannot perform boxing conversion for a value of type " + ((Value)result).type().name()); } From 5efd872e5e658d265465a58446c62029627dcb9f Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 19 Jul 2016 15:10:12 +0300 Subject: [PATCH 02/74] prepared CachedEvaluator for primitive types renderers --- .../ui/tree/render/CachedEvaluator.java | 23 ++++++++++++++----- .../debugger/engine/DebuggerUtils.java | 17 ++++++++------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CachedEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CachedEvaluator.java index c878a356dc012..224e78431161a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CachedEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CachedEvaluator.java @@ -20,6 +20,7 @@ import com.intellij.debugger.engine.evaluation.expression.ExpressionEvaluator; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.impl.PsiJavaParserFacadeImpl; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.reference.SoftReference; import org.jetbrains.annotations.Nullable; @@ -65,14 +66,24 @@ public void clear() { protected Cache initEvaluatorAndChildrenExpression(final Project project) { final Cache cache = new Cache(); try { - PsiClass contextClass = DebuggerUtils.findClass(getClassName(), project, GlobalSearchScope.allScope(project)); - if (contextClass instanceof PsiCompiledElement) { - contextClass = (PsiClass)((PsiCompiledElement)contextClass).getMirror(); + String className = getClassName(); + PsiClass contextClass; + PsiType contextType; + PsiPrimitiveType primitiveType = PsiJavaParserFacadeImpl.getPrimitiveType(className); + if (primitiveType != null) { + contextClass = JavaPsiFacade.getInstance(project).findClass(primitiveType.getBoxedTypeName(), GlobalSearchScope.allScope(project)); + contextType = primitiveType; } - if(contextClass == null) { - throw EvaluateExceptionUtil.CANNOT_FIND_SOURCE_CLASS; + else { + contextClass = DebuggerUtils.findClass(className, project, GlobalSearchScope.allScope(project)); + if (contextClass instanceof PsiCompiledElement) { + contextClass = (PsiClass)((PsiCompiledElement)contextClass).getMirror(); + } + if (contextClass == null) { + throw EvaluateExceptionUtil.CANNOT_FIND_SOURCE_CLASS; + } + contextType = DebuggerUtils.getType(className, project); } - final PsiType contextType = DebuggerUtils.getType(getClassName(), project); cache.myPsiChildrenExpression = null; JavaCodeFragment codeFragment = myDefaultFragmentFactory.createCodeFragment(myReferenceExpression, contextClass, project); codeFragment.forceResolveScope(GlobalSearchScope.allScope(project)); diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java index 9f3b1229aac83..2f382f0ca80fd 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java @@ -40,6 +40,7 @@ import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiTypesUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.StringBuilderSpinAllocator; import com.intellij.util.containers.ContainerUtil; @@ -266,10 +267,14 @@ else if (nodeClass.dims > rendererClass.dims) { } public static boolean instanceOf(@Nullable Type subType, @NotNull String superType) { - if (subType == null || subType instanceof PrimitiveType || subType instanceof VoidType) { + if (subType == null || subType instanceof VoidType) { return false; } + if (subType instanceof PrimitiveType) { + return superType.equals(subType.name()); + } + if (CommonClassNames.JAVA_LANG_OBJECT.equals(superType)) { return true; } @@ -389,18 +394,16 @@ public static PsiClass findClass(@NotNull final String className, @NotNull Proje public static PsiType getType(@NotNull String className, @NotNull Project project) { ApplicationManager.getApplication().assertReadAccessAllowed(); - final PsiManager psiManager = PsiManager.getInstance(project); try { if (getArrayClass(className) != null) { - return JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createTypeFromText(className, null); + return JavaPsiFacade.getInstance(project).getElementFactory().createTypeFromText(className, null); } - if(project.isDefault()) { + if (project.isDefault()) { return null; } - final PsiClass aClass = - JavaPsiFacade.getInstance(psiManager.getProject()).findClass(className.replace('$', '.'), GlobalSearchScope.allScope(project)); + PsiClass aClass = findClass(className, project, GlobalSearchScope.allScope(project)); if (aClass != null) { - return JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory().createType(aClass); + return PsiTypesUtil.getClassType(aClass); } } catch (IncorrectOperationException e) { From c9acd89f648a095a5b6173daafdf1782c6079661 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Jul 2016 14:17:13 +0200 Subject: [PATCH 03/74] Cleanup (code reuse) --- .../impl/analysis/ModuleHighlightUtil.java | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java index 13faebfeb7990..6d699ea589fc1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java @@ -24,6 +24,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.QuickFixAction; import com.intellij.codeInsight.intention.QuickFixFactory; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.module.impl.scopes.ModulesScope; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; @@ -75,21 +76,18 @@ static HighlightInfo checkModuleDuplicates(@NotNull PsiJavaModule element, @NotN @Nullable static HighlightInfo checkFileDuplicates(@NotNull PsiJavaModule element, @NotNull PsiFile file) { - VirtualFile vFile = file.getVirtualFile(); - if (vFile != null) { + Module module = ModuleUtilCore.findModuleForPsiElement(element); + if (module != null) { Project project = file.getProject(); - Module module = ProjectFileIndex.SERVICE.getInstance(project).getModuleForFile(vFile); - if (module != null) { - Collection others = - FilenameIndex.getVirtualFilesByName(project, MODULE_INFO_FILE, new ModulesScope(Collections.singleton(module), project)); - if (others.size() > 1) { - String message = JavaErrorMessages.message("module.file.duplicate"); - HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(range(element)).description(message).create(); - others.stream().map(f -> PsiManager.getInstance(project).findFile(f)).filter(f -> f != file).findFirst().ifPresent( - duplicate -> QuickFixAction.registerQuickFixAction(info, new GoToSymbolFix(duplicate, JavaErrorMessages.message("module.open.duplicate.text"))) - ); - return info; - } + Collection others = + FilenameIndex.getVirtualFilesByName(project, MODULE_INFO_FILE, new ModulesScope(Collections.singleton(module), project)); + if (others.size() > 1) { + String message = JavaErrorMessages.message("module.file.duplicate"); + HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(range(element)).description(message).create(); + others.stream().map(f -> PsiManager.getInstance(project).findFile(f)).filter(f -> f != file).findFirst().ifPresent( + duplicate -> QuickFixAction.registerQuickFixAction(info, new GoToSymbolFix(duplicate, JavaErrorMessages.message("module.open.duplicate.text"))) + ); + return info; } } From bf79decfb7a2d08a94a0d739091f85cb32fda28b Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 19 Jul 2016 15:15:05 +0300 Subject: [PATCH 04/74] Fix javadoc --- .../src/com/intellij/openapi/roots/TestSourcesFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/TestSourcesFilter.java b/platform/projectModel-api/src/com/intellij/openapi/roots/TestSourcesFilter.java index 66b9b617348a1..be20208355334 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/roots/TestSourcesFilter.java +++ b/platform/projectModel-api/src/com/intellij/openapi/roots/TestSourcesFilter.java @@ -26,7 +26,7 @@ * By default, IntelliJ Platform considers files as tests only if they are located under test * sources root {@link FileIndex#isInTestSourceContent(VirtualFile)}. *

- * However there plenty frameworks and languages which keep test files just nearby production files. + * However there are plenty frameworks and languages which keep test files just nearby production files. * E.g. *_test.go files are test files in Go language and some js/dart files are test files depending * on their content. The extensions allow IDE to highlight such files with a green background, * properly check if they are included in built-in search scopes, etc. @@ -35,7 +35,6 @@ * @since 2016.3 * @author zolotov */ - public abstract class TestSourcesFilter { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.testSourcesFilter"); From c4d8ba959eee02bc579f75d0a2b93a02179ddebb Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Tue, 19 Jul 2016 15:29:34 +0300 Subject: [PATCH 05/74] [patch]: fix tests -> use files with content as testData, remain one ignored test with empty file creation and mark to be fixed --- .../history/integration/PatchingTestCase.java | 7 ++++ .../integration/patches/PatchCreatorTest.java | 35 ++++++++++--------- ...rectoryHistoryDialogPatchCreationTest.java | 10 +++--- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java b/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java index 5c7ecdea6a1a5..a19b87c8b7893 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/PatchingTestCase.java @@ -23,6 +23,7 @@ import com.intellij.openapi.diff.impl.patch.formove.PatchApplier; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; @@ -52,4 +53,10 @@ protected void applyPatch() throws Exception { new PatchApplier(myProject, myRoot, patches, null, null, null).execute(); } + + protected static void createChildDataWithContent(@NotNull VirtualFile dir, @NotNull String name) throws IOException { + createChildData(dir, name); + VirtualFile file = dir.findChild(name); + setFileText(file, "some content"); + } } diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java index 31face320d812..d6ddcd10ef2ef 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java @@ -21,12 +21,16 @@ import com.intellij.history.integration.PatchingTestCase; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vfs.VirtualFile; +import org.junit.Assume; import java.util.ArrayList; import java.util.List; public class PatchCreatorTest extends PatchingTestCase { - public void testCreationPatch() throws Exception { + + // now we are not able to apply empty file creation patch, to not forget temporary ignore this test; todo fix + public void testCreationEmptyPatch() throws Exception { + Assume.assumeTrue(false); createChildData(myRoot, "f.txt"); createPatchBetweenRevisions(1, 0); @@ -37,14 +41,14 @@ public void testCreationPatch() throws Exception { } public void testPatchBetweenTwoOldRevisions() throws Exception { - createChildData(myRoot, "f1.txt"); - createChildData(myRoot, "f2.txt"); - createChildData(myRoot, "f3.txt"); + createChildDataWithContent(myRoot, "f1.txt"); + createChildDataWithContent(myRoot, "f2.txt"); + createChildDataWithContent(myRoot, "f3.txt"); - createPatchBetweenRevisions(3, 1); + createPatchBetweenRevisions(6, 1); clearRoot(); applyPatch(); - + myRoot.refresh(false, true); assertNotNull(myRoot.findChild("f1.txt")); assertNotNull(myRoot.findChild("f2.txt")); assertNull(myRoot.findChild("f3.txt")); @@ -52,7 +56,7 @@ public void testPatchBetweenTwoOldRevisions() throws Exception { public void testRename() throws Exception { VirtualFile f = createChildData(myRoot, "f.txt"); - setBinaryContent(f,new byte[]{'x'}); + setBinaryContent(f, new byte[]{'x'}); rename(f, "ff.txt"); @@ -67,9 +71,8 @@ public void testRename() throws Exception { } public void testReversePatch() throws Exception { - createChildData(myRoot, "f.txt"); - - createPatchBetweenRevisions(1, 0, true); + createChildDataWithContent(myRoot, "f.txt"); + createPatchBetweenRevisions(2, 0, true); applyPatch(); assertNull(myRoot.findChild("f.txt")); @@ -77,7 +80,7 @@ public void testReversePatch() throws Exception { public void testDirectoryCreationWithFiles() throws Exception { VirtualFile dir = createChildDirectory(myRoot, "dir"); - createChildData(dir, "f.txt"); + createChildDataWithContent(dir, "f.txt"); createPatchBetweenRevisions(2, 0, false); clearRoot(); @@ -90,15 +93,15 @@ public void testDirectoryCreationWithFiles() throws Exception { public void testDirectoryDeletionWithFiles() throws Exception { VirtualFile dir = createChildDirectory(myRoot, "dir"); - createChildData(dir, "f1.txt"); - createChildData(dir, "f2.txt"); + createChildDataWithContent(dir, "f1.txt"); + createChildDataWithContent(dir, "f2.txt"); delete(dir); createPatchBetweenRevisions(1, 0, false); dir = createChildDirectory(myRoot, "dir"); - createChildData(dir, "f1.txt"); - createChildData(dir, "f2.txt"); + createChildDataWithContent(dir, "f1.txt"); + createChildDataWithContent(dir, "f2.txt"); applyPatch(); @@ -109,7 +112,7 @@ public void testDirectoryDeletionWithFiles() throws Exception { public void testDirectoryRename() throws Exception { VirtualFile dir = createChildDirectory(myRoot, "dir1"); - createChildData(dir, "f.txt"); + createChildDataWithContent(dir, "f.txt"); rename(dir, "dir2"); diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java index 5cacba564cc4a..d739ac5bf2b92 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/ui/DirectoryHistoryDialogPatchCreationTest.java @@ -23,14 +23,14 @@ public class DirectoryHistoryDialogPatchCreationTest extends PatchingTestCase { public void testPatchCreation() throws Exception { - createChildData(myRoot, "f1.txt"); - createChildData(myRoot, "f2.txt"); - createChildData(myRoot, "f3.txt"); + createChildDataWithContent(myRoot, "f1.txt"); + createChildDataWithContent(myRoot, "f2.txt"); + createChildDataWithContent(myRoot, "f3.txt"); DirectoryHistoryDialogModel m = new DirectoryHistoryDialogModel(myProject, myGateway, getVcs(), myRoot); - assertSize(3, m.getRevisions()); + assertSize(6, m.getRevisions()); - m.selectRevisions(0, 2); + m.selectRevisions(0, 5); m.createPatch(patchFilePath, myProject.getBasePath(), false, Charset.defaultCharset()); clearRoot(); From 20c93931c7de62bafdd02cab083156df2ff984a9 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 19 Jul 2016 15:36:31 +0300 Subject: [PATCH 06/74] IDEA-153908 The setting "reformat according to style" is not saved. (re-fixed) --- .../impl/ExportableFileTemplateSettings.java | 22 +--- .../impl/FileTemplateManagerImpl.java | 100 ++++++------------ .../impl/FileTemplateSettings.java | 20 +--- .../src/META-INF/LangExtensions.xml | 1 - .../impl/LightFileTemplatesTest.java | 9 +- 5 files changed, 50 insertions(+), 102 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/ExportableFileTemplateSettings.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/ExportableFileTemplateSettings.java index 62f5c3790d2e8..a0b5a1de95fbb 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/ExportableFileTemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/ExportableFileTemplateSettings.java @@ -15,12 +15,10 @@ */ package com.intellij.ide.fileTemplates.impl; -import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; -import com.intellij.openapi.project.ProjectManager; -import org.jdom.Element; -import org.jetbrains.annotations.Nullable; +import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; +import org.jetbrains.annotations.NotNull; /** * @author Dmitry Avdeev @@ -30,19 +28,9 @@ storages = @Storage(FileTemplateSettings.EXPORTABLE_SETTINGS_FILE), additionalExportFile = FileTemplatesLoader.TEMPLATES_DIR ) -public class ExportableFileTemplateSettings implements PersistentStateComponent { - @Nullable - @Override - public Element getState() { - return getSettingInstance().getState(); - } - - @Override - public void loadState(Element state) { - getSettingInstance().loadState(state); - } +public class ExportableFileTemplateSettings extends FileTemplateSettings { - private static FileTemplateSettings getSettingInstance() { - return FileTemplateSettings.getInstance(ProjectManager.getInstance().getDefaultProject()); + public ExportableFileTemplateSettings(@NotNull FileTypeManagerEx typeManager) { + super(typeManager); } } diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java index a80f45eaf824c..b2d37d64c4076 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java @@ -23,10 +23,7 @@ import com.intellij.ide.fileTemplates.InternalTemplateBean; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; -import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.State; -import com.intellij.openapi.components.Storage; -import com.intellij.openapi.components.StoragePathMacros; +import com.intellij.openapi.components.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; @@ -56,58 +53,29 @@ public class FileTemplateManagerImpl extends FileTemplateManager implements Pers private final State myState = new State(); private final FileTypeManagerEx myTypeManager; + private final FileTemplateSettings myProjectSettings; + private final ExportableFileTemplateSettings myDefaultSettings; private final Project myProject; - /** Null for default project. */ - @Nullable private final FileTemplatesScheme myProjectScheme; private FileTemplatesScheme myScheme = FileTemplatesScheme.DEFAULT; private boolean myInitialized; - private final FTManager myInternalTemplatesManager; - private final FTManager myDefaultTemplatesManager; - private final FTManager myPatternsManager; - private final FTManager myCodeTemplatesManager; - private final FTManager myJ2eeTemplatesManager; - private final FTManager[] myAllManagers; - private final URL myDefaultTemplateDescription; - private final URL myDefaultIncludeDescription; - - public static FileTemplateManagerImpl getInstanceImpl(Project project) { + public static FileTemplateManagerImpl getInstanceImpl(@NotNull Project project) { return (FileTemplateManagerImpl)getInstance(project); } public FileTemplateManagerImpl(@NotNull FileTypeManagerEx typeManager, - FileTemplatesLoader loader, + FileTemplateSettings projectSettings, + ExportableFileTemplateSettings defaultSettings, /*need this to ensure disposal of the service _after_ project manager*/ @SuppressWarnings("UnusedParameters") ProjectManager pm, final Project project) { myTypeManager = typeManager; + myProjectSettings = projectSettings; + myDefaultSettings = defaultSettings; myProject = project; - myInternalTemplatesManager = loader.getInternalTemplatesManager(); - myDefaultTemplatesManager = loader.getDefaultTemplatesManager(); - myPatternsManager = loader.getPatternsManager(); - myCodeTemplatesManager = loader.getCodeTemplatesManager(); - myJ2eeTemplatesManager = loader.getJ2eeTemplatesManager(); - myAllManagers = new FTManager[] { myInternalTemplatesManager, myDefaultTemplatesManager, myPatternsManager, myCodeTemplatesManager, myJ2eeTemplatesManager }; - - myDefaultTemplateDescription = loader.getDefaultTemplateDescription(); - myDefaultIncludeDescription = loader.getDefaultIncludeDescription(); - - if (ApplicationManager.getApplication().isUnitTestMode()) { - for (String tname : Arrays.asList("Class", "AnnotationType", "Enum", "Interface")) { - for (FileTemplate template : myInternalTemplatesManager.getAllTemplates(true)) { - if (tname.equals(template.getName())) { - myInternalTemplatesManager.removeTemplate(((FileTemplateBase)template).getQualifiedName()); - break; - } - } - final FileTemplateBase template = myInternalTemplatesManager.addTemplate(tname, "java"); - template.setText(normalizeText(getTestClassTemplateText(tname))); - } - } - myProjectScheme = project.isDefault() ? null : new FileTemplatesScheme("Project") { @NotNull @Override @@ -123,6 +91,10 @@ public Project getProject() { }; } + private FileTemplateSettings getSettings() { + return myScheme == FileTemplatesScheme.DEFAULT ? myDefaultSettings : myProjectSettings; + } + @NotNull @Override public FileTemplatesScheme getCurrentScheme() { @@ -131,7 +103,7 @@ public FileTemplatesScheme getCurrentScheme() { @Override public void setCurrentScheme(@NotNull FileTemplatesScheme scheme) { - for (FTManager child : myAllManagers) { + for (FTManager child : getAllManagers()) { child.saveTemplates(); } setScheme(scheme); @@ -139,7 +111,7 @@ public void setCurrentScheme(@NotNull FileTemplatesScheme scheme) { private void setScheme(@NotNull FileTemplatesScheme scheme) { myScheme = scheme; - for (FTManager manager : myAllManagers) { + for (FTManager manager : getAllManagers()) { manager.setScheme(scheme); } myInitialized = true; @@ -172,25 +144,25 @@ public FileTemplate[] getTemplates(String category) { @Override @NotNull public FileTemplate[] getAllTemplates() { - final Collection templates = myDefaultTemplatesManager.getAllTemplates(false); + final Collection templates = getSettings().getDefaultTemplatesManager().getAllTemplates(false); return templates.toArray(new FileTemplate[templates.size()]); } @Override public FileTemplate getTemplate(@NotNull String templateName) { - return myDefaultTemplatesManager.findTemplateByName(templateName); + return getSettings().getDefaultTemplatesManager().findTemplateByName(templateName); } @Override @NotNull public FileTemplate addTemplate(@NotNull String name, @NotNull String extension) { - return myDefaultTemplatesManager.addTemplate(name, extension); + return getSettings().getDefaultTemplatesManager().addTemplate(name, extension); } @Override public void removeTemplate(@NotNull FileTemplate template) { final String qName = ((FileTemplateBase)template).getQualifiedName(); - for (FTManager manager : myAllManagers) { + for (FTManager manager : getAllManagers()) { manager.removeTemplate(qName); } } @@ -255,7 +227,7 @@ public void addRecentName(@NotNull @NonNls String name) { } private void validateRecentNames() { - final Collection allTemplates = myDefaultTemplatesManager.getAllTemplates(false); + final Collection allTemplates = getSettings().getDefaultTemplatesManager().getAllTemplates(false); final List allNames = new ArrayList<>(allTemplates.size()); for (FileTemplate fileTemplate : allTemplates) { allNames.add(fileTemplate.getName()); @@ -285,7 +257,7 @@ public FileTemplate getInternalTemplate(@NotNull @NonNls String templateName) { } else { final String text = normalizeText(getDefaultClassTemplateText(templateName)); - template = myInternalTemplatesManager.addTemplate(templateName, "java"); + template = getSettings().getInternalTemplatesManager().addTemplate(templateName, "java"); template.setText(text); } } @@ -294,12 +266,11 @@ public FileTemplate getInternalTemplate(@NotNull @NonNls String templateName) { @Override public FileTemplate findInternalTemplate(@NotNull @NonNls String templateName) { - LOG.assertTrue(myInternalTemplatesManager != null); - FileTemplateBase template = myInternalTemplatesManager.findTemplateByName(templateName); + FileTemplateBase template = getSettings().getInternalTemplatesManager().findTemplateByName(templateName); if (template == null) { // todo: review the hack and try to get rid of this weird logic completely - template = myDefaultTemplatesManager.findTemplateByName(templateName); + template = getSettings().getDefaultTemplatesManager().findTemplateByName(templateName); } return template; } @@ -348,12 +319,12 @@ private String getDefaultClassTemplateText(@NotNull @NonNls String templateName) @Override public FileTemplate getCodeTemplate(@NotNull @NonNls String templateName) { - return getTemplateFromManager(templateName, myCodeTemplatesManager); + return getTemplateFromManager(templateName, getSettings().getCodeTemplatesManager()); } @Override public FileTemplate getJ2eeTemplate(@NotNull @NonNls String templateName) { - return getTemplateFromManager(templateName, myJ2eeTemplatesManager); + return getTemplateFromManager(templateName, getSettings().getJ2eeTemplatesManager()); } @Nullable @@ -380,7 +351,7 @@ private static FileTemplate getTemplateFromManager(@NotNull final String templat public FileTemplate getDefaultTemplate(@NotNull final String name) { final String templateQName = myTypeManager.getExtension(name).isEmpty()? FileTemplateBase.getQualifiedName(name, "java") : name; - for (FTManager manager : myAllManagers) { + for (FTManager manager : getAllManagers()) { final FileTemplateBase template = manager.getTemplate(templateQName); if (template instanceof BundledFileTemplate) { final BundledFileTemplate copy = ((BundledFileTemplate)template).clone(); @@ -397,32 +368,32 @@ public FileTemplate getDefaultTemplate(@NotNull final String name) { @Override @NotNull public FileTemplate[] getAllPatterns() { - final Collection allTemplates = myPatternsManager.getAllTemplates(false); + final Collection allTemplates = getSettings().getPatternsManager().getAllTemplates(false); return allTemplates.toArray(new FileTemplate[allTemplates.size()]); } @Override public FileTemplate getPattern(@NotNull String name) { - return myPatternsManager.findTemplateByName(name); + return getSettings().getPatternsManager().findTemplateByName(name); } @Override @NotNull public FileTemplate[] getAllCodeTemplates() { - final Collection templates = myCodeTemplatesManager.getAllTemplates(false); + final Collection templates = getSettings().getCodeTemplatesManager().getAllTemplates(false); return templates.toArray(new FileTemplate[templates.size()]); } @Override @NotNull public FileTemplate[] getAllJ2eeTemplates() { - final Collection templates = myJ2eeTemplatesManager.getAllTemplates(false); + final Collection templates = getSettings().getJ2eeTemplatesManager().getAllTemplates(false); return templates.toArray(new FileTemplate[templates.size()]); } @Override public void setTemplates(@NotNull String templatesCategory, @NotNull Collection templates) { - for (FTManager manager : myAllManagers) { + for (FTManager manager : getAllManagers()) { if (templatesCategory.equals(manager.getName())) { manager.updateTemplates(templates); manager.saveTemplates(); @@ -433,17 +404,17 @@ public void setTemplates(@NotNull String templatesCategory, @NotNull Collection< @Override public void saveAllTemplates() { - for (FTManager manager : myAllManagers) { + for (FTManager manager : getAllManagers()) { manager.saveTemplates(); } } public URL getDefaultTemplateDescription() { - return myDefaultTemplateDescription; + return myDefaultSettings.getDefaultTemplateDescription(); } public URL getDefaultIncludeDescription() { - return myDefaultIncludeDescription; + return myDefaultSettings.getDefaultIncludeDescription(); } private Date myTestDate; @@ -464,12 +435,11 @@ public State getState() { public void loadState(State state) { XmlSerializerUtil.copyBean(state, myState); FileTemplatesScheme scheme = myProjectScheme != null && myProjectScheme.getName().equals(state.SCHEME) ? myProjectScheme : FileTemplatesScheme.DEFAULT; - FileTemplateSettings.getInstance(scheme.getProject()); setScheme(scheme); } - FTManager[] getAllManagers() { - return myAllManagers; + private FTManager[] getAllManagers() { + return getSettings().getAllManagers(); } public static class State { diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateSettings.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateSettings.java index 17e0a2428cfdb..51078bdb77c2b 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateSettings.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateSettings.java @@ -16,11 +16,11 @@ package com.intellij.ide.fileTemplates.impl; 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.project.Project; +import com.intellij.openapi.fileTypes.ex.FileTypeManagerEx; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -35,7 +35,7 @@ name = "ExportableFileTemplateSettings", storages = @Storage(FileTemplateSettings.EXPORTABLE_SETTINGS_FILE) ) -public class FileTemplateSettings implements PersistentStateComponent { +public class FileTemplateSettings extends FileTemplatesLoader implements PersistentStateComponent { public final static String EXPORTABLE_SETTINGS_FILE = "file.template.settings.xml"; static final String ELEMENT_TEMPLATE = "template"; @@ -43,15 +43,9 @@ public class FileTemplateSettings implements PersistentStateComponent { static final String ATTRIBUTE_REFORMAT = "reformat"; static final String ATTRIBUTE_LIVE_TEMPLATE = "live-template-enabled"; static final String ATTRIBUTE_ENABLED = "enabled"; - private final Project myProject; - public FileTemplateSettings(Project project) { - myProject = project; - } - - - static FileTemplateSettings getInstance(Project project) { - return ServiceManager.getService(project, FileTemplateSettings.class); + public FileTemplateSettings(@NotNull FileTypeManagerEx typeManager) { + super(typeManager); } @Nullable @@ -91,10 +85,6 @@ public Element getState() { return element; } - private FTManager[] getAllManagers() { - return FileTemplateManagerImpl.getInstanceImpl(myProject).getAllManagers(); - } - @Override public void loadState(Element state) { doLoad(state); diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index 9ebe7af9091f3..267552d578145 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -30,7 +30,6 @@ serviceImplementation="com.intellij.ide.fileTemplates.impl.FileTemplateManagerImpl"/> - diff --git a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java index 41d737c0751de..f925c43f6fcba 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/fileTemplates/impl/LightFileTemplatesTest.java @@ -19,6 +19,7 @@ import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.FileTemplatesScheme; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.util.Disposer; @@ -120,7 +121,7 @@ public void testSurviveOnProjectReopen() throws Exception { String newText = "good bye"; template.setText(newText); assertEquals(newText, manager.getTemplate(TEST_TEMPLATE_TXT).getText()); - + manager.saveAllTemplates(); PlatformTestUtil.saveProject(project); closeProject(project); @@ -152,7 +153,7 @@ public void testRemoveTemplate() throws Exception { myTemplateManager.removeTemplate(template); assertNull(myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)); myTemplateManager.setCurrentScheme(myTemplateManager.getProjectScheme()); - assertNull(myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)); + assertNotNull(myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)); myTemplateManager.setCurrentScheme(FileTemplatesScheme.DEFAULT); assertNull(myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)); } @@ -168,7 +169,7 @@ public void testSaveReformatCode() throws Exception { assertTrue(template.isReformatCode()); template.setReformatCode(false); - FileTemplateSettings settings = FileTemplateSettings.getInstance(getProject()); + FileTemplateSettings settings = ServiceManager.getService(ExportableFileTemplateSettings.class); Element state = settings.getState(); assertNotNull(state); Element element = state.getChildren().get(0).getChildren().get(0); @@ -180,7 +181,7 @@ public void testDoNotSaveDefaults() throws Exception { assertFalse(((FileTemplateBase)myTemplateManager.getTemplate(TEST_TEMPLATE_TXT)).isLiveTemplateEnabledByDefault()); FileTemplateBase template = (FileTemplateBase)myTemplateManager.getTemplate("templateWithLiveTemplate.txt"); assertTrue(template.isLiveTemplateEnabledByDefault()); - FileTemplateSettings settings = FileTemplateSettings.getInstance(getProject()); + FileTemplateSettings settings = ServiceManager.getService(ExportableFileTemplateSettings.class); assertNull(settings.getState()); template.setLiveTemplateEnabled(false); Element state = settings.getState(); From 66475429ea1ac987ff7f6773bba26f959017cc67 Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Tue, 19 Jul 2016 15:09:53 +0300 Subject: [PATCH 07/74] [configure code style on selected fragment] show options if they are supported, but doesn't belong to any panel --- .../CodeFragmentCodeStyleSettingsPanel.java | 11 ++++++++++- .../CodeStyleSettingsCodeFragmentFilter.java | 13 +++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java index 7d4117fc6a34b..0e2e122abe116 100644 --- a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java +++ b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java @@ -97,7 +97,8 @@ public static boolean hasOptionsToShow(LanguageCodeStyleSettingsProvider provide return true; } } - return false; + + return !provider.getSupportedFields().isEmpty(); } private void reformatSelectedTextWithNewSettings() { @@ -129,6 +130,10 @@ protected void somethingChanged() { @Override protected void init() { List settingNames = mySettingsToShow.getSettings(getSettingsType()); + if (settingNames.isEmpty()) { + settingNames = mySettingsToShow.getOtherSetting(); + } + String[] names = ContainerUtil.toArray(settingNames, new String[settingNames.size()]); showStandardOptions(names); initTables(); @@ -174,6 +179,10 @@ public WrappingAndBracesPanelWithoutPreview(CodeStyleSettings settings) { @Override protected void init() { Collection settingNames = mySettingsToShow.getSettings(getSettingsType()); + if (settingNames.isEmpty()) { + settingNames = mySettingsToShow.getOtherSetting(); + } + initTables(); Collection fields = populateWithAssociatedFields(settingNames); diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java index 15af5e38e3e33..aaf1a8836fb10 100644 --- a/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java +++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java @@ -83,6 +83,12 @@ public CodeStyleSettingsToShow getFieldNamesAffectingCodeFragment(LanguageCodeSt typeToTask.put(type, task); } + Set otherFields = myProvider.getSupportedFields(); + final FilterFieldsTask otherFieldsTask = new FilterFieldsTask(otherFields); + if (!otherFields.isEmpty()) { + compositeTask.addTask(otherFieldsTask); + } + progressTask.setTask(compositeTask); progressTask.setMinIterationTime(10); ProgressManager.getInstance().run(progressTask); @@ -93,6 +99,11 @@ public List getSettings(LanguageCodeStyleSettingsProvider.SettingsType t FilterFieldsTask task = typeToTask.get(type); return task.getAffectedFields(); } + + @Override + public List getOtherSetting() { + return ContainerUtil.newArrayList(otherFieldsTask.getAffectedFields()); + } }; } finally { @@ -208,6 +219,8 @@ public void prepare() { public interface CodeStyleSettingsToShow { List getSettings(LanguageCodeStyleSettingsProvider.SettingsType type); + + List getOtherSetting(); } } From 60a78a497508ccbd0877403a1da1b9a159d7b05a Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Tue, 19 Jul 2016 15:13:19 +0300 Subject: [PATCH 08/74] [configure code style on selected fragment] track stats --- .../ConfigureCodeStyleOnSelectedFragment.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java index f77ac709fed57..ef3b4cf248de8 100644 --- a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java +++ b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/ConfigureCodeStyleOnSelectedFragment.java @@ -18,6 +18,7 @@ import com.intellij.application.options.codeStyle.CodeStyleSchemesModel; import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.internal.statistic.UsageTrigger; import com.intellij.lang.Language; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -28,7 +29,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.OptionAction; -import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; @@ -47,7 +47,8 @@ public class ConfigureCodeStyleOnSelectedFragment implements IntentionAction { private static final Logger LOG = Logger.getInstance(ConfigureCodeStyleOnSelectedFragment.class); - + private static final String ID = "configure.code.style.on.selected.fragment"; + @Nls @NotNull @Override @@ -78,6 +79,7 @@ private static boolean hasSettingsToShow(Language language) { @Override public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException { + UsageTrigger.trigger(ID); SelectedTextFormatter textFormatter = new SelectedTextFormatter(project, editor, file); CodeStyleSettingsToShow settingsToShow = calculateAffectingSettings(editor, file); CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(project); From e8bf0282cdf16a1d044c37bc8faae269c41c4d44 Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Tue, 19 Jul 2016 15:56:53 +0300 Subject: [PATCH 09/74] [configure code style on selected fragment] do not show empty spaces tab --- .../codeStyle/OptionTreeWithPreviewPanel.java | 10 ++--- .../CodeFragmentCodeStyleSettingsPanel.java | 37 ++++++++++++++++--- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java index f105f64fcbec5..2c6e51fc9d8a2 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java @@ -49,15 +49,15 @@ public abstract class OptionTreeWithPreviewPanel extends CustomizableLanguageCodeStylePanel { private static final Logger LOG = Logger.getInstance("#com.intellij.application.options.CodeStyleSpacesPanel"); protected JTree myOptionsTree; - private final ArrayList myKeys = new ArrayList(); + protected final ArrayList myKeys = new ArrayList<>(); protected final JPanel myPanel = new JPanel(new GridBagLayout()); private boolean myShowAllStandardOptions = false; - private Set myAllowedOptions = new HashSet(); - private MultiMap myCustomOptions = new MultiMap(); + private Set myAllowedOptions = new HashSet<>(); + private MultiMap myCustomOptions = new MultiMap<>(); protected boolean isFirstUpdate = true; - private final Map myRenamedFields = new THashMap(); - private final Map myRemappedGroups = new THashMap(); + private final Map myRenamedFields = new THashMap<>(); + private final Map myRemappedGroups = new THashMap<>(); public OptionTreeWithPreviewPanel(CodeStyleSettings settings) { diff --git a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java index 0e2e122abe116..9c40b617a34b0 100644 --- a/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java +++ b/platform/lang-impl/src/com/intellij/formatting/contextConfiguration/CodeFragmentCodeStyleSettingsPanel.java @@ -19,12 +19,14 @@ import com.intellij.lang.Language; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.util.Disposer; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsCodeFragmentFilter; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import com.intellij.ui.components.JBScrollPane; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -41,6 +43,7 @@ class CodeFragmentCodeStyleSettingsPanel extends TabbedLanguageCodeStylePanel { private final CodeStyleSettingsCodeFragmentFilter.CodeStyleSettingsToShow mySettingsToShow; private final SelectedTextFormatter mySelectedTextFormatter; private SpacesPanelWithoutPreview mySpacesPanel; + private WrappingAndBracesPanelWithoutPreview myWrappingPanel; private Runnable mySomethingChangedCallback; @@ -76,14 +79,30 @@ protected void updatePreview(boolean useDefaultSample) { @Override protected void initTabs(CodeStyleSettings settings) { - mySpacesPanel = new SpacesPanelWithoutPreview(settings); - addTab(mySpacesPanel); - addTab(new WrappingAndBracesPanelWithoutPreview(settings)); + SpacesPanelWithoutPreview panel = getSpacesPanel(settings); + if (panel != null) { + mySpacesPanel = panel; + addTab(mySpacesPanel); + } + + myWrappingPanel = new WrappingAndBracesPanelWithoutPreview(settings); + addTab(myWrappingPanel); reset(getSettings()); } + @Nullable + private SpacesPanelWithoutPreview getSpacesPanel(CodeStyleSettings settings) { + SpacesPanelWithoutPreview spacesPanel = new SpacesPanelWithoutPreview(settings); + if (spacesPanel.hasSomethingToShow()) { + return spacesPanel; + } + Disposer.dispose(spacesPanel); + return null; + } + public JComponent getPreferredFocusedComponent() { - return mySpacesPanel.getPreferredFocusedComponent(); + return mySpacesPanel != null ? mySpacesPanel.getPreferredFocusedComponent() + : myWrappingPanel.getPreferredFocusedComponent(); } public static CodeStyleSettingsCodeFragmentFilter.CodeStyleSettingsToShow calcSettingNamesToShow(CodeStyleSettingsCodeFragmentFilter filter) { @@ -154,6 +173,10 @@ public Dimension getMinimumSize() { isFirstUpdate = false; } + public boolean hasSomethingToShow() { + return !myKeys.isEmpty(); + } + @Override public JComponent getPanel() { return myPanel; @@ -195,7 +218,7 @@ protected void init() { JBScrollPane scrollPane = new JBScrollPane(myTreeTable) { @Override public Dimension getMinimumSize() { - return super.getPreferredSize(); + return myTreeTable.getPreferredSize(); } }; @@ -238,5 +261,9 @@ protected void somethingChanged() { protected String getPreviewText() { return null; } + + public JComponent getPreferredFocusedComponent() { + return myTreeTable; + } } } From 6c6973caea818709572e941c2e6567879bbd6704 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 13:17:30 +0300 Subject: [PATCH 10/74] properties: implementation navigation IDEA-115888 --- .../lang/properties/PropertiesUtil.java | 6 +- plugins/properties/src/META-INF/plugin.xml | 2 + .../editor/PropertiesInheritorsSearcher.java | 66 +++++++++++++++++++ 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java diff --git a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java index aa48a1aadc9b5..3152737691801 100644 --- a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java +++ b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesUtil.java @@ -26,7 +26,7 @@ import com.intellij.reference.SoftLazyValue; import com.intellij.util.Function; import com.intellij.util.SmartList; -import com.intellij.util.containers.*; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,8 +36,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.intellij.ui.plaf.beg.BegResources.j; - /** * @author cdr */ @@ -155,7 +153,7 @@ public static Locale getLocale(String suffix) { * messages_en.properties is a parent of the messages_en_US.properties */ @Nullable - public static PropertiesFile getParent(PropertiesFile file, List candidates) { + public static PropertiesFile getParent(PropertiesFile file, Collection candidates) { VirtualFile virtualFile = file.getVirtualFile(); if (virtualFile == null) return null; String name = virtualFile.getNameWithoutExtension(); diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml index a41aa11884ce8..b786698eb079e 100644 --- a/plugins/properties/src/META-INF/plugin.xml +++ b/plugins/properties/src/META-INF/plugin.xml @@ -113,6 +113,8 @@ + + diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java new file mode 100644 index 0000000000000..8c609a48a200f --- /dev/null +++ b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java @@ -0,0 +1,66 @@ +/* + * Copyright 2000-2016 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.lang.properties.editor; + +import com.intellij.lang.properties.IProperty; +import com.intellij.lang.properties.PropertiesImplUtil; +import com.intellij.lang.properties.PropertiesUtil; +import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.lang.properties.psi.Property; +import com.intellij.openapi.application.QueryExecutorBase; +import com.intellij.openapi.application.ReadAction; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.psi.PsiElement; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.searches.DefinitionsScopedSearch; +import com.intellij.util.Processor; +import org.jetbrains.annotations.NotNull; + +import java.util.Collections; +import java.util.Objects; + +/** + * @author Dmitry Batkovich + */ +public class PropertiesInheritorsSearcher extends QueryExecutorBase { + private final static Logger LOG = Logger.getInstance(PropertiesInheritorsSearcher.class); + + @Override + public void processQuery(@NotNull DefinitionsScopedSearch.SearchParameters queryParameters, @NotNull Processor consumer) { + final PsiElement element = queryParameters.getElement(); + if (!(element instanceof Property) || !(queryParameters.getScope() instanceof GlobalSearchScope)) { + return; + } + ReadAction.run(() -> { + final Property property = (Property)element; + final String key = property.getKey(); + if (!property.isValid() || key == null) return; + final PropertiesFile currentFile = PropertiesImplUtil.getPropertiesFile(property.getContainingFile()); + LOG.assertTrue(currentFile != null); + final GlobalSearchScope scope = (GlobalSearchScope)queryParameters.getScope(); + currentFile.getResourceBundle() + .getPropertiesFiles() + .stream() + .filter(f -> scope.contains(f.getVirtualFile())) + .filter(f -> PropertiesUtil.getParent(f, Collections.singleton(currentFile)) == currentFile) + .map(f -> f.findPropertyByKey(key)) + .filter(Objects::nonNull) + .map(IProperty::getPsiElement) + .forEach(consumer::process); + }); + } + +} From ee99a3251c5d4e25a5c2a1f8817ca583d3170c06 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 13:34:24 +0300 Subject: [PATCH 11/74] properties: parent declaration navigation IDEA-115888 --- plugins/properties/src/META-INF/plugin.xml | 1 + .../GotoPropertyParentDeclarationHandler.java | 59 +++++++++++++++++++ .../editor/PropertiesInheritorsSearcher.java | 10 ++-- 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 plugins/properties/src/com/intellij/lang/properties/editor/GotoPropertyParentDeclarationHandler.java diff --git a/plugins/properties/src/META-INF/plugin.xml b/plugins/properties/src/META-INF/plugin.xml index b786698eb079e..16e00fd962007 100644 --- a/plugins/properties/src/META-INF/plugin.xml +++ b/plugins/properties/src/META-INF/plugin.xml @@ -115,6 +115,7 @@ + diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/GotoPropertyParentDeclarationHandler.java b/plugins/properties/src/com/intellij/lang/properties/editor/GotoPropertyParentDeclarationHandler.java new file mode 100644 index 0000000000000..9227224aadb78 --- /dev/null +++ b/plugins/properties/src/com/intellij/lang/properties/editor/GotoPropertyParentDeclarationHandler.java @@ -0,0 +1,59 @@ +/* + * Copyright 2000-2016 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.lang.properties.editor; + +import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandlerBase; +import com.intellij.lang.properties.IProperty; +import com.intellij.lang.properties.PropertiesImplUtil; +import com.intellij.lang.properties.PropertiesUtil; +import com.intellij.lang.properties.psi.PropertiesFile; +import com.intellij.lang.properties.psi.Property; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.Nullable; + +/** + * @author Dmitry Batkovich + */ +public class GotoPropertyParentDeclarationHandler extends GotoDeclarationHandlerBase { + @Nullable + @Override + public PsiElement getGotoDeclarationTarget(@Nullable PsiElement sourceElement, Editor editor) { + Property property = findProperty(sourceElement); + if (property == null) return null; + final String key = property.getKey(); + if (key == null) return null; + PropertiesFile currentFile = PropertiesImplUtil.getPropertiesFile(property.getContainingFile()); + if (currentFile == null) return null; + + do { + currentFile = PropertiesUtil.getParent(currentFile, currentFile.getResourceBundle().getPropertiesFiles()); + if (currentFile != null) { + final IProperty parent = currentFile.findPropertyByKey(key); + if (parent != null) return parent.getPsiElement(); + } else { + return null; + } + } + while (true); + } + + static Property findProperty(PsiElement source) { + if (source instanceof Property) return (Property)source; + final PsiElement parent = source.getParent(); + return parent instanceof Property ? (Property)parent : null; + } +} diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java index 8c609a48a200f..acda3ad3451da 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesInheritorsSearcher.java @@ -41,14 +41,14 @@ public class PropertiesInheritorsSearcher extends QueryExecutorBase consumer) { final PsiElement element = queryParameters.getElement(); - if (!(element instanceof Property) || !(queryParameters.getScope() instanceof GlobalSearchScope)) { + Property prop = ReadAction.compute(() -> GotoPropertyParentDeclarationHandler.findProperty(element)); + if (prop == null || !(queryParameters.getScope() instanceof GlobalSearchScope)) { return; } ReadAction.run(() -> { - final Property property = (Property)element; - final String key = property.getKey(); - if (!property.isValid() || key == null) return; - final PropertiesFile currentFile = PropertiesImplUtil.getPropertiesFile(property.getContainingFile()); + final String key = prop.getKey(); + if (!prop.isValid() || key == null) return; + final PropertiesFile currentFile = PropertiesImplUtil.getPropertiesFile(prop.getContainingFile()); LOG.assertTrue(currentFile != null); final GlobalSearchScope scope = (GlobalSearchScope)queryParameters.getScope(); currentFile.getResourceBundle() From e3818644618e9e79b05fddc99158e7201107eb0c Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 14:58:03 +0300 Subject: [PATCH 12/74] properties: close RB editor on bundle deletion IDEA-153031 --- .../ResourceBundleDeleteProvider.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java index 44396a6b424c9..e148ae20d7f33 100644 --- a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java +++ b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleDeleteProvider.java @@ -17,22 +17,18 @@ import com.intellij.ide.DeleteProvider; import com.intellij.lang.properties.ResourceBundle; +import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; -import java.util.List; - -import static com.intellij.util.containers.ContainerUtil.*; /** * @author cdr @@ -40,19 +36,24 @@ public class ResourceBundleDeleteProvider implements DeleteProvider { private static final Logger LOG = Logger.getInstance(ResourceBundleDeleteProvider.class); - private static final Function> MAPPER_RES_BUNDLE_TO_FILES = - resourceBundle -> resourceBundle.getPropertiesFiles(); - - private static final Function MAPPER_FILE_AS_PSI_ELEMENT = - propertiesFile -> propertiesFile.getContainingFile(); - public void deleteElement(@NotNull DataContext dataContext) { final ResourceBundle[] resourceBundles = ResourceBundle.ARRAY_DATA_KEY.getData(dataContext); if (resourceBundles != null && resourceBundles.length != 0) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); LOG.assertTrue(project != null); - new SafeDeleteHandler() - .invoke(project, map2Array(flatten(map(resourceBundles, MAPPER_RES_BUNDLE_TO_FILES)), PsiElement.class, MAPPER_FILE_AS_PSI_ELEMENT), dataContext); + + final PsiElement[] toDelete = Arrays + .stream(resourceBundles) + .flatMap(rb -> rb.getPropertiesFiles().stream()) + .map(PropertiesFile::getContainingFile) + .toArray(PsiElement[]::new); + + SafeDeleteHandler.invoke(project, toDelete, true, () -> { + final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project); + for (ResourceBundle bundle : resourceBundles) { + fileEditorManager.closeFile(new ResourceBundleAsVirtualFile(bundle)); + } + }); } } From 67b5916b7b170ad250f2e337cba1e7fad577891b Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 15:27:47 +0300 Subject: [PATCH 13/74] properties: english grammar fixed IDEA-153376 --- .../lang/properties/editor/PropertiesCopyHandler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java index 1f9006a4c6d4a..49ac6a3e31cd7 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesCopyHandler.java @@ -28,7 +28,10 @@ import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.*; +import com.intellij.openapi.ui.ComboBox; +import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -44,10 +47,7 @@ import com.intellij.refactoring.copy.CopyHandlerDelegateBase; import com.intellij.ui.ComboboxSpeedSearch; import com.intellij.ui.DocumentAdapter; -import com.intellij.ui.ListSpeedSearch; -import com.intellij.ui.components.JBList; import com.intellij.ui.components.JBTextField; -import com.intellij.ui.speedSearch.SpeedSearch; import com.intellij.util.Consumer; import com.intellij.util.Function; import com.intellij.util.NullableFunction; @@ -216,7 +216,7 @@ protected ValidationInfo doValidate() { return new ValidationInfo("Property name must be not empty"); } return PropertiesUtil.containsProperty(myCurrentResourceBundle, myCurrentPropertyName) - ? new ValidationInfo(String.format("Property with name \'%s\' is already exist", myCurrentPropertyName)) + ? new ValidationInfo(String.format("Property with name \'%s\' already exists", myCurrentPropertyName)) : null; } From 4c992eddb71b2128688752ee5723a812b06cb419 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 16:20:57 +0300 Subject: [PATCH 14/74] properties: recreate RB-editors when property file added to resource bundle IDEA-153377 --- .../lang/properties/ResourceBundleManager.java | 17 ++++++++++++++++- .../editor/ResourceBundleAsVirtualFile.java | 0 .../CombinePropertiesFilesAction.java | 3 +-- .../DissociateResourceBundleAction.java | 5 ----- .../projectView/ResourceBundleNode.java | 15 ++++++++------- 5 files changed, 25 insertions(+), 15 deletions(-) rename plugins/properties/{ => properties-psi-impl}/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java (100%) diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java index 5fb32e6cc395b..07bcb3ddf5070 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/ResourceBundleManager.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.properties; +import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; @@ -22,13 +23,13 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.openapi.util.NullableComputable; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; -import com.intellij.util.Function; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -216,6 +217,7 @@ private String getBaseName(@NotNull final VirtualFile file) { public void dissociateResourceBundle(final @NotNull ResourceBundle resourceBundle) { + closeResourceBundleEditors(resourceBundle); if (resourceBundle instanceof CustomResourceBundle) { final CustomResourceBundleState state = getCustomResourceBundleState(resourceBundle.getDefaultPropertiesFile().getVirtualFile()); @@ -237,6 +239,11 @@ public void combineToResourceBundle(final @NotNull List properti .add(new CustomResourceBundleState().addAll(ContainerUtil.map(propertiesFiles, file -> file.getVirtualFile().getUrl())).setBaseName(baseName)); } + public ResourceBundle combineToResourceBundleAndGet(final @NotNull List propertiesFiles, final String baseName) { + combineToResourceBundle(propertiesFiles, baseName); + return propertiesFiles.get(0).getResourceBundle(); + } + @Nullable public CustomResourceBundle getCustomResourceBundle(final @NotNull PropertiesFile file) { final VirtualFile virtualFile = file.getVirtualFile(); @@ -279,4 +286,12 @@ public ResourceBundleManagerState getState() { public void loadState(ResourceBundleManagerState state) { myState = state.removeNonExistentFiles(); } + + private static void closeResourceBundleEditors(@NotNull ResourceBundle resourceBundle) { + final FileEditorManager fileEditorManager = FileEditorManager.getInstance(resourceBundle.getProject()); + fileEditorManager.closeFile(new ResourceBundleAsVirtualFile(resourceBundle)); + for (final PropertiesFile propertiesFile : resourceBundle.getPropertiesFiles()) { + fileEditorManager.closeFile(propertiesFile.getVirtualFile()); + } + } } diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java similarity index 100% rename from plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java rename to plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/editor/ResourceBundleAsVirtualFile.java diff --git a/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java b/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java index ddc2470f6e1d8..818eb12aa50ca 100644 --- a/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java +++ b/plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java @@ -79,8 +79,7 @@ public void actionPerformed(final AnActionEvent e) { resourceBundleManager.dissociateResourceBundle(resourceBundle); } - resourceBundleManager.combineToResourceBundle(propertiesFiles, newBaseName); - final ResourceBundle resourceBundle = propertiesFiles.get(0).getResourceBundle(); + final ResourceBundle resourceBundle = resourceBundleManager.combineToResourceBundleAndGet(propertiesFiles, newBaseName); FileEditorManager.getInstance(project).openFile(new ResourceBundleAsVirtualFile(resourceBundle), true); ProjectView.getInstance(project).refresh(); } diff --git a/plugins/properties/src/com/intellij/lang/properties/customizeActions/DissociateResourceBundleAction.java b/plugins/properties/src/com/intellij/lang/properties/customizeActions/DissociateResourceBundleAction.java index 43b87266d4754..901d2d1ff3443 100644 --- a/plugins/properties/src/com/intellij/lang/properties/customizeActions/DissociateResourceBundleAction.java +++ b/plugins/properties/src/com/intellij/lang/properties/customizeActions/DissociateResourceBundleAction.java @@ -22,12 +22,10 @@ import com.intellij.lang.properties.PropertiesImplUtil; import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.ResourceBundleManager; -import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; @@ -76,12 +74,9 @@ public void update(final AnActionEvent e) { } public static void dissociate(final Collection resourceBundles, final Project project) { - final FileEditorManager fileEditorManager = FileEditorManager.getInstance(project); final Set toUpdateInProjectView = new HashSet(); for (ResourceBundle resourceBundle : resourceBundles) { - fileEditorManager.closeFile(new ResourceBundleAsVirtualFile(resourceBundle)); for (final PropertiesFile propertiesFile : resourceBundle.getPropertiesFiles()) { - fileEditorManager.closeFile(propertiesFile.getVirtualFile()); PsiDirectory containingDirectory = propertiesFile.getContainingFile().getContainingDirectory(); if (containingDirectory != null) { toUpdateInProjectView.add(containingDirectory); diff --git a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java index 900e2b004d99e..99fc38426de2c 100644 --- a/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java +++ b/plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java @@ -29,12 +29,9 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.ValidateableNode; import com.intellij.lang.properties.*; -import com.intellij.lang.properties.ResourceBundle; import com.intellij.lang.properties.editor.ResourceBundleAsVirtualFile; -import com.intellij.lang.properties.editor.ResourceBundleEditor; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -50,8 +47,10 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; -import java.util.*; -import java.util.stream.Stream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; public class ResourceBundleNode extends ProjectViewNode implements ValidateableNode, DropTargetNode { public ResourceBundleNode(Project project, ResourceBundle resourceBundle, final ViewSettings settings) { @@ -165,9 +164,11 @@ public void drop(TreeNode[] sourceNodes, DataContext dataContext) { toAddInResourceBundle.addAll(resourceBundle.getPropertiesFiles()); final String baseName = resourceBundle.getBaseName(); + final FileEditorManager fileEditorManager = FileEditorManager.getInstance(getProject()); + fileEditorManager.closeFile(new ResourceBundleAsVirtualFile(resourceBundle)); resourceBundleManager.dissociateResourceBundle(resourceBundle); - resourceBundleManager.combineToResourceBundle(toAddInResourceBundle, baseName); - + final ResourceBundle updatedBundle = resourceBundleManager.combineToResourceBundleAndGet(toAddInResourceBundle, baseName); + FileEditorManager.getInstance(myProject).openFile(new ResourceBundleAsVirtualFile(updatedBundle), true); ProjectView.getInstance(myProject).refresh(); } From d9ed9d471bd89789d55cd45ace38046d48d2ac1b Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 19 Jul 2016 16:45:18 +0300 Subject: [PATCH 15/74] properties: close resource bundle when files was deleted --- .../ResourceBundleEditorFileListener.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditorFileListener.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditorFileListener.java index ec072e018be65..07d1171b15322 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditorFileListener.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditorFileListener.java @@ -18,10 +18,12 @@ import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.editor.ex.EditorEx; +import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressIndicatorUtils; import com.intellij.openapi.progress.util.ReadTask; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileAdapter; @@ -41,10 +43,12 @@ class ResourceBundleEditorFileListener extends VirtualFileAdapter { private final ResourceBundleEditor myEditor; private final MyVfsEventsProcessor myEventsProcessor; + private final Project myProject; public ResourceBundleEditorFileListener(ResourceBundleEditor editor) { myEditor = editor; myEventsProcessor = new MyVfsEventsProcessor(); + myProject = myEditor.getResourceBundle().getProject(); } @Override @@ -93,7 +97,21 @@ protected Set compute() { if (e.getType() == EventType.FILE_DELETED || (e.getType() == EventType.PROPERTY_CHANGED && ((VirtualFilePropertyEvent)e.getEvent()).getPropertyName().equals(VirtualFile.PROP_NAME))) { if (myEditor.getTranslationEditors().containsKey(e.getEvent().getFile())) { - toDo = myEditor::recreateEditorsPanel; + int validFilesCount = 0; + for (PropertiesFile file : myEditor.getResourceBundle().getPropertiesFiles()) { + if (file.getContainingFile().isValid()) { + validFilesCount ++; + } + if (validFilesCount == 2) { + break; + } + } + if (validFilesCount > 1) { + toDo = myEditor::recreateEditorsPanel; + } else { + toDo = () -> FileEditorManager.getInstance(myProject) + .closeFile(new ResourceBundleAsVirtualFile(myEditor.getResourceBundle())); + } break; } } From 5045164a0d3fc4a65c36f5a786bc2cb064f959eb Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Tue, 19 Jul 2016 17:33:58 +0300 Subject: [PATCH 16/74] PY-18839: Adding test --- .../testRunner/env/unit/rerun_derived.py | 13 ++++++++++++ .../PyUnitTestProcessWithConsoleTestTask.java | 3 +-- .../python/testing/PythonUnitTestingTest.java | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 python/testData/testRunner/env/unit/rerun_derived.py diff --git a/python/testData/testRunner/env/unit/rerun_derived.py b/python/testData/testRunner/env/unit/rerun_derived.py new file mode 100644 index 0000000000000..7aa81ee7ca828 --- /dev/null +++ b/python/testData/testRunner/env/unit/rerun_derived.py @@ -0,0 +1,13 @@ +import unittest + +from unittest import TestCase + +class BaseTestCases: + class TestAbstract(TestCase): + def test_a(self): + raise Exception() + + +class TestDerived(BaseTestCases.TestAbstract): + def test_b(self): + print("Running from derived class") \ No newline at end of file diff --git a/python/testSrc/com/jetbrains/env/python/testing/PyUnitTestProcessWithConsoleTestTask.java b/python/testSrc/com/jetbrains/env/python/testing/PyUnitTestProcessWithConsoleTestTask.java index e1695ce565401..70119731a37e4 100644 --- a/python/testSrc/com/jetbrains/env/python/testing/PyUnitTestProcessWithConsoleTestTask.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PyUnitTestProcessWithConsoleTestTask.java @@ -15,7 +15,6 @@ */ package com.jetbrains.env.python.testing; -import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.env.PyProcessWithConsoleTestTask; import com.jetbrains.env.ut.PyUnitTestProcessRunner; import com.jetbrains.python.sdkTools.SdkCreationType; @@ -29,7 +28,7 @@ */ abstract class PyUnitTestProcessWithConsoleTestTask extends PyProcessWithConsoleTestTask { @NotNull - private final String myScriptName; + protected final String myScriptName; PyUnitTestProcessWithConsoleTestTask(@NotNull final String relativePathToTestData, @NotNull final String scriptName) { super(relativePathToTestData, SdkCreationType.EMPTY_SDK); diff --git a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java index 1ee2aa5e2edd4..78b9cc22a0723 100644 --- a/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java +++ b/python/testSrc/com/jetbrains/env/python/testing/PythonUnitTestingTest.java @@ -89,6 +89,27 @@ protected void checkTestResults(@NotNull final PyUnitTestProcessRunner runner, }); } + /** + * Ensure rerun test works even if test is declared in parent + */ + @Test + public void testRerunDerivedClass() throws Exception { + runPythonTest(new PyUnitTestProcessWithConsoleTestTask("/testRunner/env/unit", "rerun_derived.py") { + @Override + protected void checkTestResults(@NotNull final PyUnitTestProcessRunner runner, + @NotNull final String stdout, + @NotNull final String stderr, + @NotNull final String all) { + Assert.assertThat("Premature error", stderr, isEmptyString()); + Assert.assertThat("Wrong number of failed tests", runner.getFailedTestsCount(), equalTo(1)); + } + @NotNull + @Override + protected PyUnitTestProcessRunner createProcessRunner() throws Exception { + return new PyUnitTestProcessRunner(myScriptName, 2); + } + }); + } /** * Run tests, delete file and click "rerun" should throw exception and display error since test ids do not point to correct PSI From 0c0473dab4bac0b88ef0340cac97f9f8b98a67c6 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Tue, 19 Jul 2016 17:30:38 +0300 Subject: [PATCH 17/74] [patch]: add test for wrong extra line at the end of file; change assume to bombed annotation --- .../history/integration/patches/PatchCreatorTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java index d6ddcd10ef2ef..d36ef226fbece 100644 --- a/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java +++ b/platform/platform-tests/testSrc/com/intellij/history/integration/patches/PatchCreatorTest.java @@ -19,18 +19,19 @@ import com.intellij.history.core.revisions.Difference; import com.intellij.history.core.revisions.Revision; import com.intellij.history.integration.PatchingTestCase; +import com.intellij.idea.Bombed; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vfs.VirtualFile; -import org.junit.Assume; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; public class PatchCreatorTest extends PatchingTestCase { - // now we are not able to apply empty file creation patch, to not forget temporary ignore this test; todo fix + @Bombed(user = "Nadya Zabrodina", day = 1, month = Calendar.OCTOBER, + description = "Now we are not able to apply empty file creation patch; git special tag needed or smth like that") public void testCreationEmptyPatch() throws Exception { - Assume.assumeTrue(false); createChildData(myRoot, "f.txt"); createPatchBetweenRevisions(1, 0); From b06b91096b7f05efed634a5611b26b9391141f86 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 19 Jul 2016 18:01:15 +0300 Subject: [PATCH 18/74] Align module renderer to the right edge --- .../src/com/intellij/ide/util/PsiElementModuleRenderer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java index 957680ebe74d0..28f76f500e59b 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java @@ -84,6 +84,7 @@ protected void customizeCellRenderer( setText(myText); setBorder(BorderFactory.createEmptyBorder(0, 0, 0, UIUtil.getListCellHPadding())); setHorizontalTextPosition(SwingConstants.LEFT); + setHorizontalAlignment(SwingConstants.RIGHT); // align icon to the right setBackground(selected ? UIUtil.getListSelectionBackground() : UIUtil.getListBackground()); setForeground(selected ? UIUtil.getListSelectionForeground() : UIUtil.getInactiveTextColor()); From 31bf1a950ad266cae8e3deb2bb037cd4abdfbadf Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Tue, 19 Jul 2016 16:58:36 +0300 Subject: [PATCH 19/74] add upload multihint course to stepic EDU-681 Multihints breaks json pushed to stepic --- .../edu/learning/StudySerializationUtils.java | 46 ++++++++++++++++++- .../courseFormat/AnswerPlaceholder.java | 1 + .../edu/learning/courseFormat/Lesson.java | 2 +- .../StudyProjectGenerator.java | 9 ++-- .../learning/stepic/EduStepicConnector.java | 14 +++--- 5 files changed, 58 insertions(+), 14 deletions(-) diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java index a8b9f078e35e8..6926cb3796546 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java @@ -10,6 +10,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.hash.HashMap; import com.jetbrains.edu.learning.core.EduNames; +import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder; import com.jetbrains.edu.learning.courseFormat.Course; import com.jetbrains.edu.learning.courseFormat.StudyStatus; import com.jetbrains.edu.learning.courseFormat.TaskFile; @@ -29,6 +30,10 @@ public class StudySerializationUtils { public static final String PLACEHOLDERS = "placeholders"; public static final String LINE = "line"; public static final String START = "start"; + public static final String LENGTH = "length"; + public static final String POSSIBLE_ANSWER = "possible_answer"; + public static final String HINT = "hint"; + public static final String HINTS = "hints"; public static final String OFFSET = "offset"; public static final String TEXT = "text"; public static final String LESSONS = "lessons"; @@ -378,6 +383,7 @@ public static class StepicTaskFileAdapter implements JsonDeserializer @Override public TaskFile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + final Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); JsonObject taskFileObject = json.getAsJsonObject(); JsonArray placeholders = taskFileObject.getAsJsonArray(PLACEHOLDERS); for (JsonElement placeholder : placeholders) { @@ -390,8 +396,46 @@ public TaskFile deserialize(JsonElement json, Type typeOfT, JsonDeserializationC Document document = EditorFactory.getInstance().createDocument(taskFileObject.getAsJsonPrimitive(TEXT).getAsString()); placeholderObject.addProperty(OFFSET, document.getLineStartOffset(line) + start); } + final String hintString = placeholderObject.getAsJsonPrimitive(HINT).getAsString(); + final JsonArray hintsArray = new JsonArray(); + + try { + final List hints = gson.fromJson(hintString, List.class); + for (String hint : hints) { + hintsArray.add(hint); + } + } + catch (JsonParseException e) { + hintsArray.add(hintString); + } + placeholderObject.add(HINTS, hintsArray); } - return new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create().fromJson(json, TaskFile.class); + + return gson.fromJson(json, TaskFile.class); + } + } + + public static class StepicAnswerPlaceholderAdapter implements JsonSerializer { + @Override + public JsonElement serialize(AnswerPlaceholder src, Type typeOfSrc, JsonSerializationContext context) { + final List hints = src.getHints(); + + final int length = src.getLength(); + final int start = src.getOffset(); + final String possibleAnswer = src.getPossibleAnswer(); + int line = -1; + + final Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); + final JsonObject answerPlaceholder = new JsonObject(); + answerPlaceholder.addProperty(LINE, line); + answerPlaceholder.addProperty(START, start); + answerPlaceholder.addProperty(LENGTH, length); + answerPlaceholder.addProperty(POSSIBLE_ANSWER, possibleAnswer); + + final String jsonHints = gson.toJson(hints); + answerPlaceholder.addProperty(HINT, jsonHints); + + return answerPlaceholder; } } } diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java index 7e96ab0011ea9..d2353eed45705 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java @@ -15,6 +15,7 @@ public class AnswerPlaceholder { + @SerializedName("hints") @Expose private List myHints = new ArrayList(); @SerializedName("possible_answer") diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java index 56765a78f1ce5..02770f418288a 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java @@ -11,7 +11,7 @@ import java.util.List; public class Lesson implements StudyItem { - @Expose private int myId; + @Expose @SerializedName("id") private int myId; @Transient public List steps; @Transient public List tags; @Transient boolean is_public; diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java index 1f36a3c6265f5..f4a988ab9be23 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java @@ -29,10 +29,7 @@ import com.jetbrains.edu.learning.StudyUtils; import com.jetbrains.edu.learning.core.EduNames; import com.jetbrains.edu.learning.core.EduUtils; -import com.jetbrains.edu.learning.courseFormat.Course; -import com.jetbrains.edu.learning.courseFormat.Lesson; -import com.jetbrains.edu.learning.courseFormat.Task; -import com.jetbrains.edu.learning.courseFormat.TaskFile; +import com.jetbrains.edu.learning.courseFormat.*; import com.jetbrains.edu.learning.statistics.EduUsagesCollector; import com.jetbrains.edu.learning.stepic.CourseInfo; import com.jetbrains.edu.learning.stepic.EduStepicConnector; @@ -289,7 +286,9 @@ public static void flushTask(@NotNull final Task task, @NotNull final File taskD } public static void flushCourseJson(@NotNull final Course course, @NotNull final File courseDirectory) { - final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create(); + final Gson gson = new GsonBuilder().setPrettyPrinting(). + registerTypeAdapter(AnswerPlaceholder.class, new StudySerializationUtils.Json.StepicAnswerPlaceholderAdapter()). + excludeFieldsWithoutExposeAnnotation().create(); final String json = gson.toJson(course); final File courseJson = new File(courseDirectory, EduNames.COURSE_META_FILE); final FileOutputStream fileOutputStream; diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java index 171de5e6cd181..2698f74871776 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java @@ -20,10 +20,7 @@ import com.jetbrains.edu.learning.StudyTaskManager; import com.jetbrains.edu.learning.core.EduNames; import com.jetbrains.edu.learning.core.EduUtils; -import com.jetbrains.edu.learning.courseFormat.Course; -import com.jetbrains.edu.learning.courseFormat.Lesson; -import com.jetbrains.edu.learning.courseFormat.Task; -import com.jetbrains.edu.learning.courseFormat.TaskFile; +import com.jetbrains.edu.learning.courseFormat.*; import org.apache.commons.codec.binary.Base64; import org.apache.http.*; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -237,10 +234,12 @@ static T getFromStepic(String link, final Class container) throws IOExcep if (statusLine.getStatusCode() != HttpStatus.SC_OK) { throw new IOException("Stepic returned non 200 status code " + responseString); } - Gson gson = new GsonBuilder().registerTypeAdapter(TaskFile.class, new StudySerializationUtils.Json.StepicTaskFileAdapter()).setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); + Gson gson = new GsonBuilder().registerTypeAdapter(TaskFile.class, new StudySerializationUtils.Json.StepicTaskFileAdapter()). + registerTypeAdapter(AnswerPlaceholder.class, new StudySerializationUtils.Json.StepicAnswerPlaceholderAdapter()). + setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); return gson.fromJson(responseString, container); } - + @NotNull public static CloseableHttpClient getHttpClient(@NotNull final Project project) { if (ourClient == null) { @@ -727,7 +726,8 @@ public static void postTask(final Project project, @NotNull final Task task, fin final HttpPost request = new HttpPost(EduStepicNames.STEPIC_API_URL + "/step-sources"); setHeaders(request, "application/json"); //TODO: register type adapter for task files here? - final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create(); + final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation(). + registerTypeAdapter(AnswerPlaceholder.class, new StudySerializationUtils.Json.StepicAnswerPlaceholderAdapter()).create(); ApplicationManager.getApplication().invokeLater(() -> { final String requestBody = gson.toJson(new StepicWrappers.StepSourceWrapper(project, task, lessonId)); request.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON)); From 75386f5159aff1c3ca7c12a5dffffa0c96b42c35 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Tue, 19 Jul 2016 18:08:15 +0300 Subject: [PATCH 20/74] associate silently created virtual env with new project --- .../actions/PythonGenerateProjectCallback.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java b/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java index 220ea0d959f00..b7ee703ddb219 100644 --- a/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java +++ b/python/ide/src/com/jetbrains/python/newProject/actions/PythonGenerateProjectCallback.java @@ -28,6 +28,7 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkAdditionalData; +import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl; import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil; import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel; import com.intellij.openapi.ui.Messages; @@ -162,6 +163,14 @@ public void virtualEnvCreated(Sdk createdSdk, boolean associateWithProject) { catch (ConfigurationException exception) { LOG.error("Error adding created virtual env " + exception.getMessage()); } + if (associateWithProject) { + SdkAdditionalData additionalData = createdSdk.getSdkAdditionalData(); + if (additionalData == null) { + additionalData = new PythonSdkAdditionalData(PythonSdkFlavor.getFlavor(createdSdk.getHomePath())); + ((ProjectJdkImpl)createdSdk).setSdkAdditionalData(additionalData); + } + ((PythonSdkAdditionalData)additionalData).associateWithNewProject(); + } } }); } From abb8bea389b313f9169b8880d77aca6c3a209160 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Tue, 19 Jul 2016 18:16:52 +0300 Subject: [PATCH 21/74] fix read course from cache --- .../edu/learning/StudySerializationUtils.java | 4 +-- .../StudyProjectGenerator.java | 30 +++++++++---------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java index 6926cb3796546..436ef8f3ebaad 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java @@ -423,12 +423,10 @@ public JsonElement serialize(AnswerPlaceholder src, Type typeOfSrc, JsonSerializ final int length = src.getLength(); final int start = src.getOffset(); final String possibleAnswer = src.getPossibleAnswer(); - int line = -1; final Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); final JsonObject answerPlaceholder = new JsonObject(); - answerPlaceholder.addProperty(LINE, line); - answerPlaceholder.addProperty(START, start); + answerPlaceholder.addProperty(OFFSET, start); answerPlaceholder.addProperty(LENGTH, length); answerPlaceholder.addProperty(POSSIBLE_ANSWER, possibleAnswer); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java index f4a988ab9be23..a6c085afb2908 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java @@ -11,7 +11,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -29,7 +28,10 @@ import com.jetbrains.edu.learning.StudyUtils; import com.jetbrains.edu.learning.core.EduNames; import com.jetbrains.edu.learning.core.EduUtils; -import com.jetbrains.edu.learning.courseFormat.*; +import com.jetbrains.edu.learning.courseFormat.Course; +import com.jetbrains.edu.learning.courseFormat.Lesson; +import com.jetbrains.edu.learning.courseFormat.Task; +import com.jetbrains.edu.learning.courseFormat.TaskFile; import com.jetbrains.edu.learning.statistics.EduUsagesCollector; import com.jetbrains.edu.learning.stepic.CourseInfo; import com.jetbrains.edu.learning.stepic.EduStepicConnector; @@ -116,20 +118,17 @@ else if (myUser != null) { return readCourseFromCache(adaptiveCourseFile, true); } } - return ProgressManager.getInstance().runProcessWithProgressSynchronously(new ThrowableComputable() { - @Override - public Course compute() throws RuntimeException { - ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true); - return execCancelable(() -> { + return ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> { + ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true); + return execCancelable(() -> { - final Course course = EduStepicConnector.getCourse(project, mySelectedCourseInfo); - if (course != null) { - flushCourse(project, course); - course.initCourse(false); - } - return course; - }); - } + final Course course = EduStepicConnector.getCourse(project, mySelectedCourseInfo); + if (course != null) { + flushCourse(project, course); + course.initCourse(false); + } + return course; + }); }, "Creating Course", true, project); } @@ -287,7 +286,6 @@ public static void flushTask(@NotNull final Task task, @NotNull final File taskD public static void flushCourseJson(@NotNull final Course course, @NotNull final File courseDirectory) { final Gson gson = new GsonBuilder().setPrettyPrinting(). - registerTypeAdapter(AnswerPlaceholder.class, new StudySerializationUtils.Json.StepicAnswerPlaceholderAdapter()). excludeFieldsWithoutExposeAnnotation().create(); final String json = gson.toJson(course); final File courseJson = new File(courseDirectory, EduNames.COURSE_META_FILE); From e3b6109b252436487bfbb0b214e85151481f328b Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 18 Jul 2016 19:03:03 +0300 Subject: [PATCH 22/74] convert to eager iteration because some perversive quick fixes can start iterating markup model which would lead to deadlock --- .../codeInsight/daemon/impl/ShowIntentionsPass.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java index 94c8eac43ff1e..b68b5ce746ea7 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java @@ -56,6 +56,7 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; +import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; import com.intellij.util.Processors; import com.intellij.util.containers.ContainerUtil; @@ -83,11 +84,11 @@ public static List getAvailableActions( final int offset = ((EditorEx)editor).getExpectedCaretOffset(); final Project project = file.getProject(); - final List result = new ArrayList<>(); - DaemonCodeAnalyzerImpl.processHighlightsNearOffset(editor.getDocument(), project, HighlightSeverity.INFORMATION, offset, true, info -> { - addAvailableActionsForGroups(info, editor, file, result, passId, offset); - return true; - }); + List infos = new ArrayList<>(); + DaemonCodeAnalyzerImpl.processHighlightsNearOffset(editor.getDocument(), project, HighlightSeverity.INFORMATION, offset, true, + new CommonProcessors.CollectProcessor<>(infos)); + List result = new ArrayList<>(); + infos.forEach(info->addAvailableActionsForGroups(info, editor, file, result, passId, offset)); return result; } From aaffc800a7f8fdb336587c7a860178343eaf2860 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 19 Jul 2016 18:17:15 +0300 Subject: [PATCH 23/74] Scopes like "Current file" and "Changed files" should be different event if empty --- .../com/intellij/psi/search/LocalSearchScope.java | 10 ++++++---- .../search/PredefinedSearchScopeProviderImpl.java | 13 ++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java index 42c3e9ea995a1..98cd4ede78b0f 100644 --- a/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java +++ b/platform/core-api/src/com/intellij/psi/search/LocalSearchScope.java @@ -115,12 +115,14 @@ public boolean equals(Object o) { if (this == o) return true; if (!(o instanceof LocalSearchScope)) return false; - final LocalSearchScope localSearchScope = (LocalSearchScope)o; + LocalSearchScope other = (LocalSearchScope)o; + + if (other.myIgnoreInjectedPsi != myIgnoreInjectedPsi) return false; + if (other.myScope.length != myScope.length) return false; + if (!Comparing.strEqual(myDisplayName, other.myDisplayName)) return false; // scopes like "Current file" and "Changed files" should be different event if empty - if (localSearchScope.myIgnoreInjectedPsi != myIgnoreInjectedPsi) return false; - if (localSearchScope.myScope.length != myScope.length) return false; for (final PsiElement scopeElement : myScope) { - final PsiElement[] thatScope = localSearchScope.myScope; + final PsiElement[] thatScope = other.myScope; for (final PsiElement thatScopeElement : thatScope) { if (!Comparing.equal(scopeElement, thatScopeElement)) return false; } diff --git a/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java b/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java index 9d98ba26c2937..2228187ddcd2d 100644 --- a/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/search/PredefinedSearchScopeProviderImpl.java @@ -68,7 +68,7 @@ public List getPredefinedScopes(@NotNull final Project project, boolean currentSelection, boolean usageView, boolean showEmptyScopes) { - Collection result = showEmptyScopes ? ContainerUtil.newArrayList() : ContainerUtil.newLinkedHashSet(); + Collection result = ContainerUtil.newLinkedHashSet(); result.add(GlobalSearchScope.projectScope(project)); if (suggestSearchInLibs) { result.add(GlobalSearchScope.allScope(project)); @@ -90,8 +90,7 @@ else if (showEmptyScopes) { final Editor selectedTextEditor = ApplicationManager.getApplication().isDispatchThread() ? FileEditorManager.getInstance(project).getSelectedTextEditor() : null; - final PsiFile psiFile = - (selectedTextEditor != null) ? PsiDocumentManager.getInstance(project).getPsiFile(selectedTextEditor.getDocument()) : null; + PsiFile psiFile = selectedTextEditor == null ? null : PsiDocumentManager.getInstance(project).getPsiFile(selectedTextEditor.getDocument()); PsiFile currentFile = psiFile; if (dataContext != null) { @@ -136,7 +135,7 @@ else if (showEmptyScopes) { if (endElement != null) { final PsiElement parent = PsiTreeUtil.findCommonParent(startElement, endElement); if (parent != null) { - final List elements = new ArrayList(); + final List elements = new ArrayList<>(); final PsiElement[] children = parent.getChildren(); TextRange selection = new TextRange(start, end); for (PsiElement child : children) { @@ -162,13 +161,12 @@ else if (showEmptyScopes) { if (selectedUsageView != null && !selectedUsageView.isSearchInProgress()) { final Set usages = ContainerUtil.newTroveSet(selectedUsageView.getUsages()); usages.removeAll(selectedUsageView.getExcludedUsages()); - final List results = new ArrayList(usages.size()); if (prevSearchFiles) { final Set files = collectFiles(usages, true); if (!files.isEmpty()) { GlobalSearchScope prev = new GlobalSearchScope(project) { - private Set myFiles = null; + private Set myFiles; @NotNull @Override @@ -203,6 +201,7 @@ public boolean isSearchInLibraries() { } } else { + final List results = new ArrayList<>(usages.size()); for (Usage usage : usages) { if (usage instanceof PsiElementUsage) { final PsiElement element = ((PsiElementUsage)usage).getElement(); @@ -294,7 +293,7 @@ private static SearchScope getSelectedFilesScope(final Project project, @Nullabl } protected static Set collectFiles(Set usages, boolean findFirst) { - final Set files = new HashSet(); + final Set files = new HashSet<>(); for (Usage usage : usages) { if (usage instanceof PsiElementUsage) { PsiElement psiElement = ((PsiElementUsage)usage).getElement(); From f207fa4f1d7dc099ccd161e1ddeb5daadb173567 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 19 Jul 2016 18:23:37 +0300 Subject: [PATCH 24/74] EA-85776 - NPE: MethodBytecodeUtil.visit --- .../intellij/debugger/jdi/MethodBytecodeUtil.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java index c994079ed0d3b..d84212cfb0639 100644 --- a/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java +++ b/java/debugger/impl/src/com/intellij/debugger/jdi/MethodBytecodeUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.debugger.jdi; +import com.intellij.util.ReflectionUtil; import com.intellij.util.ThrowableConsumer; import com.sun.jdi.*; import org.jetbrains.annotations.NotNull; @@ -52,13 +53,23 @@ public static void visit(ReferenceType classType, Method method, long maxOffset, visit(classType, method, bytecodes, methodVisitor); } + public static byte[] getConstantPool(ReferenceType type) { + try { + return type.constantPool(); + } + catch (NullPointerException e) { // workaround for JDK bug 6822627 + ReflectionUtil.resetField(type, "constantPoolInfoGotten"); + return type.constantPool(); + } + } + private static void visit(ReferenceType type, Method method, byte[] bytecodes, MethodVisitor methodVisitor) { try { try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream dos = new DataOutputStream(bos)) { dos.writeInt(0xCAFEBABE); // magic dos.writeInt(Opcodes.V1_8); // version dos.writeShort(type.constantPoolCount()); // constant_pool_count - dos.write(type.constantPool()); // constant_pool + dos.write(getConstantPool(type)); // constant_pool dos.writeShort(0); // access_flags; dos.writeShort(0); // this_class; dos.writeShort(0); // super_class; From 7b9362d5ece0537cfb1c9404a87bc2edafa52e2f Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 26 Jun 2016 18:42:48 +0300 Subject: [PATCH 25/74] IDEA-151728 Provide link to undo branch deletion --- .../git4idea/branch/GitBranchOperation.java | 2 +- .../branch/GitDeleteBranchOperation.java | 62 ++++++++++++++++--- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java index f84845b7fe771..67d781338b352 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java @@ -183,7 +183,7 @@ protected void notifySuccess(@NotNull String message) { VcsNotifier.getInstance(myProject).notifySuccess(message); } - protected final void notifySuccess() { + protected void notifySuccess() { notifySuccess(getSuccessMessage()); } diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 0b0ce76125e47..3da11ac685328 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -15,7 +15,11 @@ */ package git4idea.branch; +import com.intellij.notification.Notification; +import com.intellij.notification.NotificationListener; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.vcs.VcsException; @@ -29,6 +33,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.event.HyperlinkEvent; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -44,12 +49,14 @@ class GitDeleteBranchOperation extends GitBranchOperation { private static final Logger LOG = Logger.getInstance(GitDeleteBranchOperation.class); - private final String myBranchName; + @NotNull private final String myBranchName; + @NotNull private final VcsNotifier myNotifier; GitDeleteBranchOperation(@NotNull Project project, @NotNull Git git, @NotNull GitBranchUiHandler uiHandler, @NotNull Collection repositories, @NotNull String branchName) { super(project, git, uiHandler, repositories); myBranchName = branchName; + myNotifier = VcsNotifier.getInstance(myProject); } @Override @@ -104,6 +111,13 @@ else if (notFullyMergedDetector.hasHappened()) { } } + @Override + protected void notifySuccess() { + String message = String.format("Deleted branch %s", formatBranchName(myBranchName)); + message += "
Restore"; + myNotifier.notifySuccess("", message, new SuccessNotificationLinkListener()); + } + private static void refresh(@NotNull GitRepository... repositories) { for (GitRepository repository : repositories) { repository.update(); @@ -112,17 +126,21 @@ private static void refresh(@NotNull GitRepository... repositories) { @Override protected void rollback() { + GitCompoundResult result = doRollback(); + if (!result.totalSuccess()) { + myNotifier.notifyError("Error during rollback of branch deletion", result.getErrorOutputWithReposIndication()); + } + } + + @NotNull + private GitCompoundResult doRollback() { GitCompoundResult result = new GitCompoundResult(myProject); for (GitRepository repository : getSuccessfulRepositories()) { GitCommandResult res = myGit.branchCreate(repository, myBranchName); result.append(repository, res); refresh(repository); } - - if (!result.totalSuccess()) { - VcsNotifier.getInstance(myProject).notifyError("Error during rollback of branch deletion", - result.getErrorOutputWithReposIndication()); - } + return result; } @NotNull @@ -132,7 +150,7 @@ private String getErrorTitle() { @NotNull public String getSuccessMessage() { - return String.format("Deleted branch %s", myBranchName); + return String.format("Deleted branch %s", formatBranchName(myBranchName)); } @NotNull @@ -149,6 +167,11 @@ protected String getOperationName() { return "branch deletion"; } + @NotNull + private static String formatBranchName(@NotNull String name) { + return "" + name + ""; + } + @NotNull private GitCompoundResult forceDelete(@NotNull String branchName, @NotNull Collection possibleFailedRepositories) { GitCompoundResult compoundResult = new GitCompoundResult(myProject); @@ -290,4 +313,29 @@ public String getBaseBranch() { return myBaseBranch; } } + + private class SuccessNotificationLinkListener extends NotificationListener.Adapter { + @Override + protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { + if (e.getDescription().equals("undo")) { + notification.expire(); + new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + rollbackBranchDeletion(); + } + }.queue(); + } + } + + private void rollbackBranchDeletion() { + GitCompoundResult result = doRollback(); + if (result.totalSuccess()) { + myNotifier.notifySuccess("Restored " + formatBranchName(myBranchName)); + } + else { + myNotifier.notifyError("Couldn't Restore " + formatBranchName(myBranchName), result.getErrorOutputWithReposIndication()); + } + } + } } From e9800eeb78225bcf3eb9636ac3bd7b9314c039d8 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 26 Jun 2016 19:03:56 +0300 Subject: [PATCH 26/74] IDEA-130541 offer to delete remote branch --- .../src/git4idea/branch/GitBranchUtil.java | 5 +++ .../branch/GitDeleteBranchOperation.java | 40 +++++++++++++++++-- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java index 735269ee68235..86ae4326c1b73 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java @@ -83,6 +83,11 @@ public static GitBranchTrackInfo getTrackInfoForBranch(@NotNull GitRepository re return null; } + @Nullable + public static GitBranchTrackInfo getTrackInfo(@NotNull GitRepository repository, @NotNull String localBranchName) { + return ContainerUtil.find(repository.getBranchTrackInfos(), it -> it.getLocalBranch().getName().equals(localBranchName)); + } + @NotNull static String getCurrentBranchOrRev(@NotNull Collection repositories) { if (repositories.size() > 1) { diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 3da11ac685328..6569c84fc4abe 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -17,6 +17,7 @@ import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; +import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; @@ -26,9 +27,11 @@ import com.intellij.openapi.vcs.VcsNotifier; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.MultiMap; import git4idea.GitCommit; import git4idea.commands.*; import git4idea.history.GitHistoryUtils; +import git4idea.repo.GitBranchTrackInfo; import git4idea.repo.GitRepository; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,17 +49,21 @@ * current branch are merged to, and makes force delete, if wanted. */ class GitDeleteBranchOperation extends GitBranchOperation { - + private static final Logger LOG = Logger.getInstance(GitDeleteBranchOperation.class); + private static final String UNDO_LINK = "undo"; + private static final String DELETE_REMOTE_LINK = "delete_remote"; @NotNull private final String myBranchName; @NotNull private final VcsNotifier myNotifier; + @NotNull private final MultiMap myTrackedBranches; GitDeleteBranchOperation(@NotNull Project project, @NotNull Git git, @NotNull GitBranchUiHandler uiHandler, @NotNull Collection repositories, @NotNull String branchName) { super(project, git, uiHandler, repositories); myBranchName = branchName; myNotifier = VcsNotifier.getInstance(myProject); + myTrackedBranches = groupByTrackedBranchName(branchName, repositories); } @Override @@ -114,7 +121,10 @@ else if (notFullyMergedDetector.hasHappened()) { @Override protected void notifySuccess() { String message = String.format("Deleted branch %s", formatBranchName(myBranchName)); - message += "
Restore"; + message += "
Restore"; + if (!myTrackedBranches.isEmpty()) { + message += "
Delete tracked remote branch"; + } myNotifier.notifySuccess("", message, new SuccessNotificationLinkListener()); } @@ -283,6 +293,17 @@ private List branchContainsCommit(@NotNull GitRepository repository, @No return Collections.emptyList(); } + @NotNull + private static MultiMap groupByTrackedBranchName(@NotNull String branchName, + @NotNull Collection repositories) { + MultiMap trackedBranchNames = MultiMap.createLinked(); + for (GitRepository repository : repositories) { + GitBranchTrackInfo trackInfo = GitBranchUtil.getTrackInfo(repository, branchName); + if (trackInfo != null) trackedBranchNames.putValue(trackInfo.getRemoteBranch().getNameForLocalOperations(), repository); + } + return trackedBranchNames; + } + // warning: not deleting branch 'feature' that is not yet merged to // 'refs/remotes/origin/feature', even though it is merged to HEAD. // error: The branch 'feature' is not fully merged. @@ -317,8 +338,8 @@ public String getBaseBranch() { private class SuccessNotificationLinkListener extends NotificationListener.Adapter { @Override protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { - if (e.getDescription().equals("undo")) { - notification.expire(); + notification.expire(); + if (e.getDescription().equals(UNDO_LINK)) { new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { @Override public void run(@NotNull ProgressIndicator indicator) { @@ -326,6 +347,17 @@ public void run(@NotNull ProgressIndicator indicator) { } }.queue(); } + else if (e.getDescription().equals(DELETE_REMOTE_LINK)) { + new Task.Backgroundable(myProject, "Deleting Remote Branch " + myBranchName + "...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + GitBrancher brancher = ServiceManager.getService(getProject(), GitBrancher.class); + for (String remoteBranch : myTrackedBranches.keySet()) { + brancher.deleteRemoteBranch(remoteBranch, new ArrayList<>(myTrackedBranches.get(remoteBranch))); + } + } + }.queue(); + } } private void rollbackBranchDeletion() { From f85ca23f908891de3b8c4d4ef04f61278e3b07e9 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 8 Jul 2016 20:23:50 +0300 Subject: [PATCH 27/74] Save the initial current revision positions for all GitBranchOperations --- .../git4idea/branch/GitBranchOperation.java | 22 +++++++++++-------- .../src/git4idea/branch/GitBranchWorker.java | 8 +------ .../git4idea/branch/GitMergeOperation.java | 7 ++---- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java index 67d781338b352..68b8ea88dca3b 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java @@ -15,6 +15,7 @@ */ package git4idea.branch; +import com.google.common.collect.Maps; import com.intellij.dvcs.DvcsUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -29,9 +30,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import git4idea.GitLocalBranch; import git4idea.GitUtil; import git4idea.commands.Git; import git4idea.commands.GitMessageWithFilesDetector; @@ -44,6 +43,7 @@ import static com.intellij.openapi.application.ModalityState.defaultModalityState; import static com.intellij.openapi.util.text.StringUtil.pluralize; +import static com.intellij.util.ObjectUtils.chooseNotNull; /** * Common class for Git operations with branches aware of multi-root configuration, @@ -58,6 +58,7 @@ abstract class GitBranchOperation { @NotNull protected final GitBranchUiHandler myUiHandler; @NotNull private final Collection myRepositories; @NotNull protected final Map myCurrentHeads; + @NotNull protected final Map myInitialRevisions; @NotNull private final GitVcsSettings mySettings; @NotNull private final Collection mySuccessfulRepositories; @@ -70,13 +71,8 @@ protected GitBranchOperation(@NotNull Project project, @NotNull Git git, myGit = git; myUiHandler = uiHandler; myRepositories = repositories; - myCurrentHeads = ContainerUtil.map2Map(repositories, new Function>() { - @Override - public Pair fun(GitRepository repository) { - GitLocalBranch currentBranch = repository.getCurrentBranch(); - return Pair.create(repository, currentBranch == null ? repository.getCurrentRevision() : currentBranch.getName()); - } - }); + myCurrentHeads = Maps.toMap(repositories, repo -> chooseNotNull(repo.getCurrentBranchName(), repo.getCurrentRevision())); + myInitialRevisions = Maps.toMap(repositories, GitRepository::getCurrentRevision); mySuccessfulRepositories = new ArrayList(); mySkippedRepositories = new ArrayList(); myRemainingRepositories = new ArrayList(myRepositories); @@ -264,6 +260,14 @@ protected void updateRecentBranch() { } } + /** + * Returns the hash of the revision which was current before the start of this GitBranchOperation. + */ + @NotNull + protected String getInitialRevision(@NotNull GitRepository repository) { + return myInitialRevisions.get(repository); + } + @Nullable private String getRecentCommonBranch() { String recentCommonBranch = null; diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchWorker.java b/plugins/git4idea/src/git4idea/branch/GitBranchWorker.java index 2e4eadf4523ef..b7d14ea9f283d 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchWorker.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchWorker.java @@ -37,9 +37,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * Executes the logic of git branch operations. @@ -109,11 +107,7 @@ public void deleteRemoteBranch(@NotNull final String branchName, @NotNull final public void merge(@NotNull final String branchName, @NotNull final GitBrancher.DeleteOnMergeOption deleteOnMerge, @NotNull final List repositories) { updateInfo(repositories); - Map revisions = new HashMap(); - for (GitRepository repository : repositories) { - revisions.put(repository, repository.getCurrentRevision()); - } - new GitMergeOperation(myProject, myGit, myUiHandler, repositories, branchName, deleteOnMerge, revisions).execute(); + new GitMergeOperation(myProject, myGit, myUiHandler, repositories, branchName, deleteOnMerge).execute(); } public void rebase(@NotNull List repositories, @NotNull String branchName) { diff --git a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java index 19eb1517e1f5b..97312c4b129ce 100644 --- a/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitMergeOperation.java @@ -51,7 +51,6 @@ class GitMergeOperation extends GitBranchOperation { @NotNull private final ChangeListManager myChangeListManager; @NotNull private final String myBranchToMerge; private final GitBrancher.DeleteOnMergeOption myDeleteOnMerge; - @NotNull private final Map myCurrentRevisionsBeforeMerge; // true in value, if we've stashed local changes before merge and will need to unstash after resolving conflicts. @NotNull private final Map myConflictedRepositories = new HashMap(); @@ -59,12 +58,10 @@ class GitMergeOperation extends GitBranchOperation { GitMergeOperation(@NotNull Project project, @NotNull Git git, @NotNull GitBranchUiHandler uiHandler, @NotNull Collection repositories, - @NotNull String branchToMerge, GitBrancher.DeleteOnMergeOption deleteOnMerge, - @NotNull Map currentRevisionsBeforeMerge) { + @NotNull String branchToMerge, GitBrancher.DeleteOnMergeOption deleteOnMerge) { super(project, git, uiHandler, repositories); myBranchToMerge = branchToMerge; myDeleteOnMerge = deleteOnMerge; - myCurrentRevisionsBeforeMerge = currentRevisionsBeforeMerge; myChangeListManager = ChangeListManager.getInstance(myProject); } @@ -328,7 +325,7 @@ private GitCompoundResult smartRollback(@NotNull final Collection @NotNull private GitCommandResult rollback(@NotNull GitRepository repository) { - return myGit.reset(repository, GitResetMode.HARD, myCurrentRevisionsBeforeMerge.get(repository)); + return myGit.reset(repository, GitResetMode.HARD, getInitialRevision(repository)); } @NotNull From f305244b5e9c293c3ac8d5cc792c250772bbb4d1 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 11 Jul 2016 17:43:22 +0300 Subject: [PATCH 28/74] fix assertion on git rebase notification --- .../git4idea/rebase/GitMultiRepoRebaseTest.kt | 4 ++-- .../git4idea/rebase/GitRebaseBaseTest.kt | 5 ++++ .../rebase/GitSingleRepoRebaseTest.kt | 24 +++++++++---------- .../tests/git4idea/test/GitPlatformTest.kt | 8 +++---- .../tests/git4idea/test/GitTestUtil.java | 9 +++---- 5 files changed, 28 insertions(+), 22 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/rebase/GitMultiRepoRebaseTest.kt b/plugins/git4idea/tests/git4idea/rebase/GitMultiRepoRebaseTest.kt index 919cd0d7a04a7..27f9276b5b8e4 100644 --- a/plugins/git4idea/tests/git4idea/rebase/GitMultiRepoRebaseTest.kt +++ b/plugins/git4idea/tests/git4idea/rebase/GitMultiRepoRebaseTest.kt @@ -62,7 +62,7 @@ class GitMultiRepoRebaseTest : GitRebaseBaseTest() { rebase("master") - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") assertAllRebased() assertNoRebaseInProgress(myAllRepositories) } @@ -165,7 +165,7 @@ class GitMultiRepoRebaseTest : GitRebaseBaseTest() { GitRebaseUtils.continueRebase(myProject) - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") assertAllRebased() assertNoRebaseInProgress(myAllRepositories) } diff --git a/plugins/git4idea/tests/git4idea/rebase/GitRebaseBaseTest.kt b/plugins/git4idea/tests/git4idea/rebase/GitRebaseBaseTest.kt index 8e2f02e184b85..7fea1fdc57962 100644 --- a/plugins/git4idea/tests/git4idea/rebase/GitRebaseBaseTest.kt +++ b/plugins/git4idea/tests/git4idea/rebase/GitRebaseBaseTest.kt @@ -16,6 +16,7 @@ package git4idea.rebase import com.intellij.dvcs.repo.Repository +import com.intellij.notification.Notification import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.project.Project import com.intellij.openapi.vcs.AbstractVcsHelper @@ -130,6 +131,10 @@ abstract class GitRebaseBaseTest : GitPlatformTest() { myVcsHelper.onMerge{} } + protected fun assertSuccessfulRebaseNotification(message: String) : Notification { + return assertSuccessfulNotification("Rebase Successful", message) + } + protected fun GitRepository.`assert feature rebased on master`() { assertRebased(this, "feature", "master") } diff --git a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt index 59af0e076887a..1715d941cce26 100644 --- a/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt +++ b/plugins/git4idea/tests/git4idea/rebase/GitSingleRepoRebaseTest.kt @@ -49,7 +49,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { rebaseOnMaster() - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -59,7 +59,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { rebaseOnMaster() - assertSuccessfulNotification("feature is up-to-date with master") + assertSuccessfulRebaseNotification("feature is up-to-date with master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -69,7 +69,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { rebaseOnMaster() - assertSuccessfulNotification("Fast-forwarded feature to master") + assertSuccessfulRebaseNotification("Fast-forwarded feature to master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -114,7 +114,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { assertEquals("Incorrect number of conflicting patches", 2, conflicts) myRepo.`assert feature rebased on master`() - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") } fun `test continue rebase after resolving all conflicts`() { @@ -125,7 +125,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { } rebaseOnMaster() - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -147,7 +147,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { GitRebaseUtils.skipRebase(myProject) - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -188,7 +188,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { } }.rebase() - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") assertRebased(myRepo, "feature", "master") assertNoRebaseInProgress(myRepo) localChange.verify() @@ -204,7 +204,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { } }.rebase() - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") assertRebased(myRepo, "feature", "master") assertNoRebaseInProgress(myRepo) localChange.verify() @@ -363,7 +363,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { } GitRebaseUtils.continueRebase(myProject) - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -392,7 +392,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { assertRebased(myRepo, "feature", "master") assertNoRebaseInProgress(myRepo) - assertSuccessfulNotification( + assertSuccessfulRebaseNotification( """ Rebased feature on master
The following commit was skipped during rebase:
@@ -427,7 +427,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { GitRebaseUtils.continueRebase(myProject) - assertSuccessfulNotification("Rebased feature on master") + assertSuccessfulRebaseNotification("Rebased feature on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } @@ -472,7 +472,7 @@ class GitSingleRepoRebaseTest : GitRebaseBaseTest() { `when`(uiHandler.progressIndicator).thenReturn(EmptyProgressIndicator()) GitBranchWorker(myProject, myGit, uiHandler).rebaseOnCurrent(listOf(myRepo), "feature") - assertSuccessfulNotification("Checked out feature and rebased it on master") + assertSuccessfulRebaseNotification("Checked out feature and rebased it on master") myRepo.`assert feature rebased on master`() assertNoRebaseInProgress(myRepo) } diff --git a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.kt b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.kt index 60a30e3161e6d..fc114e011745f 100644 --- a/plugins/git4idea/tests/git4idea/test/GitPlatformTest.kt +++ b/plugins/git4idea/tests/git4idea/test/GitPlatformTest.kt @@ -113,12 +113,12 @@ abstract class GitPlatformTest : VcsPlatformTest() { hookFile.setExecutable(true, false) } - protected fun assertSuccessfulNotification(title: String, message: String) { - GitTestUtil.assertNotification(NotificationType.INFORMATION, title, message, myVcsNotifier.lastNotification) + protected fun assertSuccessfulNotification(title: String, message: String) : Notification { + return GitTestUtil.assertNotification(NotificationType.INFORMATION, title, message, myVcsNotifier.lastNotification) } - protected fun assertSuccessfulNotification(message: String) { - assertSuccessfulNotification("Rebase Successful", message) + protected fun assertSuccessfulNotification(message: String) : Notification { + return assertSuccessfulNotification("", message) } protected fun assertWarningNotification(title: String, message: String) { diff --git a/plugins/git4idea/tests/git4idea/test/GitTestUtil.java b/plugins/git4idea/tests/git4idea/test/GitTestUtil.java index 63a826d486d82..7e7f79dfa5a9e 100644 --- a/plugins/git4idea/tests/git4idea/test/GitTestUtil.java +++ b/plugins/git4idea/tests/git4idea/test/GitTestUtil.java @@ -186,13 +186,14 @@ public static String makeCommit(String file) throws IOException { return last(); } - public static void assertNotification(@NotNull NotificationType type, - @NotNull String title, - @NotNull String content, - @NotNull Notification actual) { + public static Notification assertNotification(@NotNull NotificationType type, + @NotNull String title, + @NotNull String content, + @NotNull Notification actual) { assertEquals("Incorrect notification type: " + tos(actual), type, actual.getType()); assertEquals("Incorrect notification title: " + tos(actual), title, actual.getTitle()); assertEquals("Incorrect notification content: " + tos(actual), cleanupForAssertion(content), cleanupForAssertion(actual.getContent())); + return actual; } @NotNull From 52ff8679a4e472782822801fc596b4eab2f29a47 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 9 Jul 2016 20:52:00 +0300 Subject: [PATCH 29/74] git test: rename to Kotlin --- .../branch/{GitBranchWorkerTest.java => GitBranchWorkerTest.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/git4idea/tests/git4idea/branch/{GitBranchWorkerTest.java => GitBranchWorkerTest.kt} (100%) diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt similarity index 100% rename from plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java rename to plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt From 0d3137f23bc21e6ab567fa5b22648bce8ed3b087 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 7 Jul 2016 20:07:09 +0300 Subject: [PATCH 30/74] IDEA-153297 delete without confirmation but with undo --- .../GitBranchIsNotFullyMergedDialog.java | 100 +- .../git4idea/branch/GitBranchUiHandler.java | 10 +- .../branch/GitBranchUiHandlerImpl.java | 15 +- .../branch/GitDeleteBranchOperation.java | 159 +- .../git4idea/src/git4idea/commands/Git.java | 6 +- .../src/git4idea/commands/GitImpl.java | 7 +- .../src/git4idea/i18n/GitBundle.properties | 7 - .../git4idea/branch/GitBranchWorkerTest.kt | 1438 ++++++++--------- .../git4idea/tests/git4idea/test/TestGit.kt | 12 + 9 files changed, 805 insertions(+), 949 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java index f85177c1f9654..52ebd1788d398 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java @@ -18,19 +18,15 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.components.JBLabel; import com.intellij.util.ArrayUtil; import com.intellij.xml.util.XmlStringUtil; import git4idea.DialogManager; -import git4idea.GitBranch; import git4idea.GitCommit; -import git4idea.i18n.GitBundle; import git4idea.repo.GitRepository; import git4idea.ui.GitCommitListWithDiffPanel; import git4idea.ui.GitRepositoryComboboxListCellRenderer; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -53,56 +49,50 @@ public class GitBranchIsNotFullyMergedDialog extends DialogWrapper { private final Project myProject; private final Map> myCommits; - private final String myBranchToDelete; - private final String myBaseBranch; - private final List myMergedToBranches; private final GitCommitListWithDiffPanel myCommitListWithDiffPanel; private final Collection myRepositories; + @NotNull private final String myRemovedBranch; + @NotNull private final Map myBaseBranches; private final GitRepository myInitialRepository; /** * Show the dialog and get user's answer, whether he wants to force delete the branch. * - * @param commits the list of commits, which are not merged from the branch being deleted to the current branch, - * grouped by repository. - * @param branchToDelete the name of the branch which user chose to delete. - * @param mergedToBranches the list of branches which the branch is merged to (returned by {@code git branch --merged } command. - * @param baseBranch branch which branchToDelete is not merged to. It is either current branch, or the upstream branch. - * @return true if user decided to delete the branch. + * @param commits the list of commits, which are not merged from the branch being deleted to the current branch, + * grouped by repository. + * @param baseBranches base branches (which Git reported as not containing commits from the removed branch) per repository. + * @return true if user decided to restore the branch. */ public static boolean showAndGetAnswer(@NotNull Project project, @NotNull Map> commits, - @NotNull String branchToDelete, - @NotNull List mergedToBranches, - @Nullable String baseBranch) { - GitBranchIsNotFullyMergedDialog dialog = new GitBranchIsNotFullyMergedDialog(project, commits, branchToDelete, baseBranch, mergedToBranches); + @NotNull Map baseBranches, + @NotNull String removedBranch) { + GitBranchIsNotFullyMergedDialog dialog = new GitBranchIsNotFullyMergedDialog(project, commits, baseBranches, removedBranch); DialogManager.show(dialog); return dialog.isOK(); } private GitBranchIsNotFullyMergedDialog(@NotNull Project project, @NotNull Map> commits, - @NotNull String branchToDelete, - @Nullable String baseBranch, - @NotNull List mergedToBranches) { + @NotNull Map baseBranches, + @NotNull String removedBranch) { super(project, false); myProject = project; myCommits = commits; - myBranchToDelete = branchToDelete; - myBaseBranch = baseBranch; - myMergedToBranches = mergedToBranches; myRepositories = commits.keySet(); + myBaseBranches = baseBranches; + myRemovedBranch = removedBranch; myInitialRepository = calcInitiallySelectedRepository(); myCommitListWithDiffPanel = new GitCommitListWithDiffPanel(myProject, new ArrayList(myCommits.get(myInitialRepository))); init(); - setTitle("Branch Is Not Fully Merged"); - setOKButtonText("Delete"); - setOKButtonMnemonic('D'); - setCancelButtonText("Cancel"); + setTitle("Branch Was Not Fully Merged"); + setOKButtonText("Restore"); + setOKButtonMnemonic('R'); + getCancelAction().putValue(DEFAULT_ACTION, Boolean.TRUE); } @NotNull @@ -115,61 +105,33 @@ private GitRepository calcInitiallySelectedRepository() { throw new AssertionError("The dialog shouldn't be shown. Unmerged commits: " + myCommits); } - private String makeDescription() { - String currentBranchOrRev; - boolean onBranch; - if (myRepositories.size() > 1) { - LOG.assertTrue(myBaseBranch != null, "Branches have unexpectedly diverged"); - currentBranchOrRev = myBaseBranch; - onBranch = true; + @NotNull + private String makeDescription(@NotNull GitRepository repository) { + String baseBranch = myBaseBranches.get(repository); + String description; + if (baseBranch == null) { + description = String.format("All commits from branch %s were merged", myRemovedBranch); } else { - GitRepository repository = myInitialRepository; - if (repository.isOnBranch()) { - GitBranch currentBranch = repository.getCurrentBranch(); - assert currentBranch != null; - currentBranchOrRev = currentBranch.getName(); - onBranch = true; - } - else { - currentBranchOrRev = repository.getCurrentRevision(); - onBranch = false; - } - } - - StringBuilder description = new StringBuilder(); - if (onBranch) { - description.append(GitBundle.message("branch.delete.not_fully_merged.description", myBranchToDelete, myBaseBranch)); - } else { - description.append(GitBundle.message("branch.delete.not_fully_merged.description.not_on_branch", myBranchToDelete, currentBranchOrRev, - myBaseBranch)); - } - if (!myMergedToBranches.isEmpty()) { - String listOfMergedBranches = StringUtil.join(StringUtil.surround(ArrayUtil.toStringArray(myMergedToBranches), "", ""), ", "); - description.append("
"); - if (myMergedToBranches.size() == 1) { - description.append(GitBundle.message("branch.delete.merged_to.one", myBranchToDelete, listOfMergedBranches)); - } - else { - description.append(GitBundle.message("branch.delete.merged_to.many", myBranchToDelete, listOfMergedBranches)); - } + description = String.format("The branch %s was not fully merged to %s.
Below is the list of unmerged commits.", + myRemovedBranch, baseBranch); } - description.append("
").append(GitBundle.message("branch.delete.warning", myBranchToDelete)); - return description.toString(); + return XmlStringUtil.wrapInHtml(description); } @Override protected JComponent createNorthPanel() { - JBLabel descriptionLabel = new JBLabel(XmlStringUtil.wrapInHtml(makeDescription())); + JBLabel descriptionLabel = new JBLabel(makeDescription(myInitialRepository)); - final JComboBox repositorySelector = new JComboBox(ArrayUtil.toObjectArray(myRepositories, GitRepository.class)); + JComboBox repositorySelector = new JComboBox(ArrayUtil.toObjectArray(myRepositories, GitRepository.class)); repositorySelector.setRenderer(new GitRepositoryComboboxListCellRenderer(repositorySelector)); repositorySelector.setSelectedItem(myInitialRepository); repositorySelector.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - List commits = myCommits.get((GitRepository)repositorySelector.getSelectedItem()); - myCommitListWithDiffPanel.setCommits(new ArrayList(commits)); + GitRepository selectedRepo = (GitRepository)repositorySelector.getSelectedItem(); + descriptionLabel.setText(makeDescription(selectedRepo)); + myCommitListWithDiffPanel.setCommits(myCommits.get(selectedRepo)); } }); diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java index dd3e08305d43f..bba53c98bb3b5 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandler.java @@ -81,8 +81,12 @@ boolean showUntrackedFilesDialogWithRollback(@NotNull String operationName, @Not int showSmartOperationDialog(@NotNull Project project, @NotNull List changes, @NotNull Collection paths, @NotNull String operation, @Nullable String forceButtonTitle); - boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, @NotNull Map> history, - @NotNull String unmergedBranch, @NotNull List mergedToBranches, - @NotNull String baseBranch); + /** + * @return true if user decided to restore the branch. + */ + boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, + @NotNull Map> history, + @NotNull Map baseBranches, + @NotNull String removedBranch); } diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java index f39461d60290b..826a78038b0fc 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java @@ -147,14 +147,15 @@ public int showSmartOperationDialog(@NotNull Project project, @NotNull List> history, - @NotNull final String unmergedBranch, @NotNull final List mergedToBranches, - @NotNull final String baseBranch) { - final AtomicBoolean forceDelete = new AtomicBoolean(); - ApplicationManager.getApplication().invokeAndWait(() -> forceDelete.set( - GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, unmergedBranch, mergedToBranches, baseBranch)), + public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, + @NotNull Map> history, + @NotNull Map baseBranches, + @NotNull String removedBranch) { + AtomicBoolean restore = new AtomicBoolean(); + ApplicationManager.getApplication().invokeAndWait(() -> restore.set( + GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, baseBranches, removedBranch)), ModalityState.defaultModalityState()); - return forceDelete.get(); + return restore.get(); } @NotNull diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 6569c84fc4abe..415ddc0bd8806 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -15,6 +15,7 @@ */ package git4idea.branch; +import com.google.common.collect.Maps; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.openapi.components.ServiceManager; @@ -25,7 +26,6 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.VcsNotifier; -import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import git4idea.GitCommit; @@ -42,6 +42,7 @@ import java.util.regex.Pattern; import static com.intellij.dvcs.DvcsUtil.getShortRepositoryName; +import static com.intellij.util.ObjectUtils.assertNotNull; /** * Deletes a branch. @@ -53,17 +54,26 @@ class GitDeleteBranchOperation extends GitBranchOperation { private static final Logger LOG = Logger.getInstance(GitDeleteBranchOperation.class); private static final String UNDO_LINK = "undo"; private static final String DELETE_REMOTE_LINK = "delete_remote"; + static final String VIEW_UNMERGED_LINK = "view"; @NotNull private final String myBranchName; @NotNull private final VcsNotifier myNotifier; @NotNull private final MultiMap myTrackedBranches; + @NotNull private final Map myUnmergedToBranches; + @NotNull private final Map myDeletedBranchTips; + GitDeleteBranchOperation(@NotNull Project project, @NotNull Git git, @NotNull GitBranchUiHandler uiHandler, @NotNull Collection repositories, @NotNull String branchName) { super(project, git, uiHandler, repositories); myBranchName = branchName; myNotifier = VcsNotifier.getInstance(myProject); myTrackedBranches = groupByTrackedBranchName(branchName, repositories); + myUnmergedToBranches = ContainerUtil.newHashMap(); + myDeletedBranchTips = Maps.toMap(repositories, (GitRepository repo) -> { + GitBranchesCollection branches = repo.getBranches(); + return assertNotNull(branches.getHash(assertNotNull(branches.findLocalBranch(myBranchName)))).asString(); + }); } @Override @@ -85,25 +95,15 @@ else if (notFullyMergedDetector.hasHappened()) { if (baseBranch == null) { // GitBranchNotMergedToUpstreamDetector didn't happen baseBranch = myCurrentHeads.get(repository); } + myUnmergedToBranches.put(repository, new UnmergedBranchInfo(myDeletedBranchTips.get(repository), baseBranch)); - Collection remainingRepositories = getRemainingRepositories(); - boolean forceDelete = showNotFullyMergedDialog(myBranchName, baseBranch, remainingRepositories); - if (forceDelete) { - GitCompoundResult compoundResult = forceDelete(myBranchName, remainingRepositories); - if (compoundResult.totalSuccess()) { - GitRepository[] remainingRepositoriesArray = ArrayUtil.toObjectArray(remainingRepositories, GitRepository.class); - markSuccessful(remainingRepositoriesArray); - refresh(remainingRepositoriesArray); - } - else { - fatalError(getErrorTitle(), compoundResult.getErrorOutputWithReposIndication()); - return; - } + GitCommandResult forceDeleteResult = myGit.branchDelete(repository, myBranchName, true); + if (forceDeleteResult.success()) { + refresh(repository); + markSuccessful(repository); } else { - if (wereSuccessful()) { - showFatalErrorDialogWithRollback(getErrorTitle(), "This branch is not fully merged to " + baseBranch + "."); - } + fatalError(getErrorTitle(), forceDeleteResult.getErrorOutputAsHtmlString()); fatalErrorHappened = true; } } @@ -125,6 +125,9 @@ protected void notifySuccess() { if (!myTrackedBranches.isEmpty()) { message += "
Delete tracked remote branch"; } + if (!myUnmergedToBranches.isEmpty()) { + message += "

Some commits were not merged and could be lost"; + } myNotifier.notifySuccess("", message, new SuccessNotificationLinkListener()); } @@ -146,7 +149,7 @@ protected void rollback() { private GitCompoundResult doRollback() { GitCompoundResult result = new GitCompoundResult(myProject); for (GitRepository repository : getSuccessfulRepositories()) { - GitCommandResult res = myGit.branchCreate(repository, myBranchName); + GitCommandResult res = myGit.branchCreate(repository, myBranchName, myDeletedBranchTips.get(repository)); result.append(repository, res); refresh(repository); } @@ -179,43 +182,30 @@ protected String getOperationName() { @NotNull private static String formatBranchName(@NotNull String name) { - return "" + name + ""; - } - - @NotNull - private GitCompoundResult forceDelete(@NotNull String branchName, @NotNull Collection possibleFailedRepositories) { - GitCompoundResult compoundResult = new GitCompoundResult(myProject); - for (GitRepository repository : possibleFailedRepositories) { - GitCommandResult res = myGit.branchDelete(repository, branchName, true); - compoundResult.append(repository, res); - } - return compoundResult; + return "" + name + ""; } /** * Shows a dialog "the branch is not fully merged" with the list of unmerged commits. * User may still want to force delete the branch. * In multi-repository setup collects unmerged commits for all given repositories. - * @return true if the branch should be force deleted. + * @return true if the branch should be restored. */ - private boolean showNotFullyMergedDialog(@NotNull final String unmergedBranch, @NotNull final String baseBranch, - @NotNull Collection repositories) { - final List mergedToBranches = getMergedToBranches(unmergedBranch); - - final Map> history = new HashMap>(); - - // note getRepositories() instead of getRemainingRepositories() here: - // we don't confuse user with the absence of repositories that have succeeded, just show no commits for them (and don't query for log) + private boolean showNotFullyMergedDialog(@NotNull Map unmergedBranches) { + Map> history = new HashMap>(); + // we don't confuse user with the absence of repositories which branch was deleted w/o force, + // we display no commits for them for (GitRepository repository : getRepositories()) { - if (repositories.contains(repository)) { - history.put(repository, getUnmergedCommits(repository, unmergedBranch, baseBranch)); + if (unmergedBranches.containsKey(repository)) { + UnmergedBranchInfo unmergedInfo = unmergedBranches.get(repository); + history.put(repository, getUnmergedCommits(repository, unmergedInfo.myTipOfDeletedUnmergedBranch, unmergedInfo.myBaseBranch)); } else { history.put(repository, Collections.emptyList()); } } - - return myUiHandler.showBranchIsNotFullyMergedDialog(myProject, history, unmergedBranch, mergedToBranches, baseBranch); + Map baseBranches = Maps.asMap(unmergedBranches.keySet(), it -> unmergedBranches.get(it).myBaseBranch); + return myUiHandler.showBranchIsNotFullyMergedDialog(myProject, history, baseBranches, myBranchName); } @NotNull @@ -232,67 +222,6 @@ private static List getUnmergedCommits(@NotNull GitRepository reposit return Collections.emptyList(); } - @NotNull - private List getMergedToBranches(String branchName) { - List mergedToBranches = null; - for (GitRepository repository : getRemainingRepositories()) { - List branches = getMergedToBranches(repository, branchName); - if (mergedToBranches == null) { - mergedToBranches = branches; - } - else { - mergedToBranches = new ArrayList(ContainerUtil.intersection(mergedToBranches, branches)); - } - } - return mergedToBranches != null ? mergedToBranches : new ArrayList(); - } - - /** - * Branches which the given branch is merged to ({@code git branch --merged}, - * except the given branch itself. - */ - @NotNull - private List getMergedToBranches(@NotNull GitRepository repository, @NotNull String branchName) { - String tip = tip(repository, branchName); - if (tip == null) { - return Collections.emptyList(); - } - return branchContainsCommit(repository, tip, branchName); - } - - @Nullable - private String tip(GitRepository repository, @NotNull String branchName) { - GitCommandResult result = myGit.tip(repository, branchName); - if (result.success() && result.getOutput().size() == 1) { - return result.getOutput().get(0).trim(); - } - // failing in this method is not critical - it is just additional information. So we just log the error - LOG.info("Failed to get [git rev-list -1] for branch [" + branchName + "]. " + result); - return null; - } - - @NotNull - private List branchContainsCommit(@NotNull GitRepository repository, @NotNull String tip, @NotNull String branchName) { - GitCommandResult result = myGit.branchContains(repository, tip); - if (result.success()) { - List branches = new ArrayList(); - for (String s : result.getOutput()) { - s = s.trim(); - if (s.startsWith("*")) { - s = s.substring(2); - } - if (!s.equals(branchName)) { // this branch contains itself - not interesting - branches.add(s); - } - } - return branches; - } - - // failing in this method is not critical - it is just additional information. So we just log the error - LOG.info("Failed to get [git branch --contains] for hash [" + tip + "]. " + result); - return Collections.emptyList(); - } - @NotNull private static MultiMap groupByTrackedBranchName(@NotNull String branchName, @NotNull Collection repositories) { @@ -335,10 +264,21 @@ public String getBaseBranch() { } } + static class UnmergedBranchInfo { + @NotNull private final String myTipOfDeletedUnmergedBranch; + @NotNull private final String myBaseBranch; + + public UnmergedBranchInfo(@NotNull String tipOfDeletedUnmergedBranch, @NotNull String baseBranch) { + myTipOfDeletedUnmergedBranch = tipOfDeletedUnmergedBranch; + myBaseBranch = baseBranch; + } + } + private class SuccessNotificationLinkListener extends NotificationListener.Adapter { + @Override protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { - notification.expire(); + notification.hideBalloon(); if (e.getDescription().equals(UNDO_LINK)) { new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { @Override @@ -358,6 +298,17 @@ public void run(@NotNull ProgressIndicator indicator) { } }.queue(); } + else if (e.getDescription().equals(VIEW_UNMERGED_LINK)) { + new Task.Backgroundable(myProject, "Collecting Unmerged Commits...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + boolean restore = showNotFullyMergedDialog(myUnmergedToBranches); + if (restore) { + rollback(); + } + } + }.queue(); + } } private void rollbackBranchDeletion() { diff --git a/plugins/git4idea/src/git4idea/commands/Git.java b/plugins/git4idea/src/git4idea/commands/Git.java index eb5e25784dfdd..2be6b2a03cec6 100644 --- a/plugins/git4idea/src/git4idea/commands/Git.java +++ b/plugins/git4idea/src/git4idea/commands/Git.java @@ -99,8 +99,12 @@ GitCommandResult branchDelete(@NotNull GitRepository repository, @NotNull String @NotNull GitCommandResult branchContains(@NotNull GitRepository repository, @NotNull String commit); + /** + * Create branch without checking it out:
+ * 
    git branch <branchName> <startPoint>
+ */ @NotNull - GitCommandResult branchCreate(@NotNull GitRepository repository, @NotNull String branchName); + GitCommandResult branchCreate(@NotNull GitRepository repository, @NotNull String branchName, @NotNull String startPoint); @NotNull GitCommandResult renameBranch(@NotNull GitRepository repository, diff --git a/plugins/git4idea/src/git4idea/commands/GitImpl.java b/plugins/git4idea/src/git4idea/commands/GitImpl.java index 9620eb00e52bc..4debae3328922 100644 --- a/plugins/git4idea/src/git4idea/commands/GitImpl.java +++ b/plugins/git4idea/src/git4idea/commands/GitImpl.java @@ -335,16 +335,13 @@ public GitCommandResult branchContains(@NotNull GitRepository repository, @NotNu return run(h); } - /** - * Create branch without checking it out. - * {@code git branch } - */ @Override @NotNull - public GitCommandResult branchCreate(@NotNull GitRepository repository, @NotNull String branchName) { + public GitCommandResult branchCreate(@NotNull GitRepository repository, @NotNull String branchName, @NotNull String startPoint) { final GitLineHandler h = new GitLineHandler(repository.getProject(), repository.getRoot(), GitCommand.BRANCH); h.setStdoutSuppressed(false); h.addParameters(branchName); + h.addParameters(startPoint); return run(h); } diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index 438f8e2c7b606..f4597806bfa61 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -482,13 +482,6 @@ git.unstash.clear.confirmation.title=Remove All Stashes? git.unstash.drop.confirmation.message=Do you want to remove {0}?
"{1}" git.unstash.drop.confirmation.title=Remove Stash {0}? -branch.delete.not_fully_merged.description=The branch {0} is not fully merged to the branch {1}.
Below is the list of unmerged commits. -branch.delete.not_fully_merged.description.not_on_branch=You are currently not on the branch ({1}).
\ - The branch {0} is not fully merged to {2}.
Below is the list of unmerged commits. -branch.delete.merged_to.many=The branch {0} is however fully merged to the following branches: {1}. -branch.delete.merged_to.one=The branch {0} is however fully merged to the branch {1}. -branch.delete.warning=You may still delete the branch {0}, but beware that it cannot be undone. - vcs.popup.git.github.section=GitHub vcs.history.action.gitlog=Select in Git Log diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 1fecb221df39f..4e85f9ee51da0 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -13,1037 +13,969 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.branch; - -import com.intellij.openapi.progress.EmptyProgressIndicator; -import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.Function; -import com.intellij.util.LineSeparator; -import com.intellij.util.ObjectUtils; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.text.CharArrayUtil; -import git4idea.GitCommit; -import git4idea.config.GitVersion; -import git4idea.config.GitVersionSpecialty; -import git4idea.repo.GitRepository; -import git4idea.test.GitPlatformTest; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.IOException; -import java.text.ParseException; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; - -import static git4idea.test.GitExecutor.*; -import static git4idea.test.GitExecutor.commit; -import static git4idea.test.GitScenarios.*; - -public class GitBranchWorkerTest extends GitPlatformTest { - - private GitRepository myUltimate; - private GitRepository myCommunity; - private GitRepository myContrib; - - private List myRepositories; - - public void setUp() throws Exception { - super.setUp(); - - cd(myProjectRoot); - File community = mkdir("community"); - File contrib = mkdir("contrib"); - - myUltimate = createRepository(myProjectPath); - myCommunity = createRepository(community.getPath()); - myContrib = createRepository(contrib.getPath()); - myRepositories = Arrays.asList(myUltimate, myCommunity, myContrib); - - cd(myProjectRoot); - touch(".gitignore", "community\ncontrib"); - git("add .gitignore"); - git("commit -m gitignore"); - } - - public void test_create_new_branch_without_problems() { - checkoutNewBranch("feature", new TestUiHandler()); - - assertCurrentBranch("feature"); +package git4idea.branch + +import com.intellij.openapi.progress.EmptyProgressIndicator +import com.intellij.openapi.progress.ProgressIndicator +import com.intellij.openapi.project.Project +import com.intellij.openapi.ui.DialogWrapper +import com.intellij.openapi.util.Condition +import com.intellij.openapi.util.Ref +import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.text.StringUtil +import com.intellij.openapi.vcs.Executor +import com.intellij.openapi.vcs.changes.Change +import com.intellij.openapi.vfs.VirtualFile +import com.intellij.util.Function +import com.intellij.util.LineSeparator +import com.intellij.util.ObjectUtils +import com.intellij.util.containers.ContainerUtil +import com.intellij.util.text.CharArrayUtil +import git4idea.GitCommit +import git4idea.commands.GitCommandResult +import git4idea.config.GitVersion +import git4idea.config.GitVersionSpecialty +import git4idea.repo.GitRepository +import git4idea.test.GitExecutor.* +import git4idea.test.GitPlatformTest +import git4idea.test.GitScenarios.* +import java.util.* +import java.util.regex.Matcher +import javax.swing.event.HyperlinkEvent + +class GitBranchWorkerTest : GitPlatformTest() { + + private lateinit var myUltimate: GitRepository + private lateinit var myCommunity: GitRepository + private lateinit var myContrib: GitRepository + private lateinit var myRepositories: List + + public override fun setUp() { + super.setUp() + + Executor.cd(myProjectRoot) + val community = Executor.mkdir("community") + val contrib = Executor.mkdir("contrib") + + myUltimate = createRepository(myProjectPath) + myCommunity = createRepository(community.getPath()) + myContrib = createRepository(contrib.getPath()) + myRepositories = Arrays.asList(myUltimate, myCommunity, myContrib) + + Executor.cd(myProjectRoot) + Executor.touch(".gitignore", "community\ncontrib") + git("add .gitignore") + git("commit -m gitignore") + } + + fun test_create_new_branch_without_problems() { + checkoutNewBranch("feature", TestUiHandler()) + + assertCurrentBranch("feature") assertEquals("Notification about successful branch creation is incorrect", - "Branch " + bcode("feature") + " was created", myVcsNotifier.getLastNotification().getContent()); + "Branch " + bcode("feature") + " was created", myVcsNotifier.getLastNotification().getContent()) } - private static String bcode(String s) { - return "" + s + ""; - } - - public void test_create_new_branch_with_unmerged_files_in_first_repo_should_show_notification() { - unmergedFiles(myUltimate); + fun test_create_new_branch_with_unmerged_files_in_first_repo_should_show_notification() { + unmergedFiles(myUltimate) - final Ref notificationShown = Ref.create(false); - checkoutNewBranch("feature", new TestUiHandler() { - @Override - public void showUnmergedFilesNotification(@NotNull String operationName, @NotNull Collection repositories) { - notificationShown.set(true); + val notificationShown = Ref.create(false) + checkoutNewBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesNotification(operationName: String, repositories: Collection) { + notificationShown.set(true) } - }); + }) - assertTrue("Unmerged files notification was not shown", notificationShown.get()); + assertTrue("Unmerged files notification was not shown", notificationShown.get()) } - public void test_create_new_branch_with_unmerged_files_in_second_repo_should_propose_to_rollback() { - unmergedFiles(myCommunity); + fun test_create_new_branch_with_unmerged_files_in_second_repo_should_propose_to_rollback() { + unmergedFiles(myCommunity) - final Ref rollbackProposed = Ref.create(false); - checkoutNewBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - rollbackProposed.set(true); - return false; + val rollbackProposed = Ref.create(false) + checkoutNewBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + rollbackProposed.set(true) + return false } - }); + }) - assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()); + assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()) } - public void test_rollback_create_new_branch_should_delete_branch() { - unmergedFiles(myCommunity); + fun test_rollback_create_new_branch_should_delete_branch() { + unmergedFiles(myCommunity) - checkoutNewBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return true; + checkoutNewBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return true } - }); + }) - assertCurrentBranch("master"); - assertBranchDeleted(myUltimate, "feature"); + assertCurrentBranch("master") + assertBranchDeleted(myUltimate, "feature") } - public void test_deny_rollback_create_new_branch_should_leave_new_branch() { - unmergedFiles(myCommunity); + fun test_deny_rollback_create_new_branch_should_leave_new_branch() { + unmergedFiles(myCommunity) - checkoutNewBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return false; + checkoutNewBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return false } - }); + }) - assertCurrentBranch(myUltimate, "feature"); - assertCurrentBranch(myCommunity, "master"); - assertCurrentBranch(myContrib, "master"); + assertCurrentBranch(myUltimate, "feature") + assertCurrentBranch(myCommunity, "master") + assertCurrentBranch(myContrib, "master") } - public void test_checkout_without_problems() { - branchWithCommit(myRepositories, "feature"); + fun test_checkout_without_problems() { + branchWithCommit(myRepositories, "feature") - checkoutBranch("feature", new TestUiHandler()); + checkoutBranch("feature", TestUiHandler()) - assertCurrentBranch("feature"); + assertCurrentBranch("feature") assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature"), - myVcsNotifier.getLastNotification().getContent()); + myVcsNotifier.getLastNotification().getContent()) } - public void test_checkout_with_unmerged_files_in_first_repo_should_show_notification() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myUltimate); + fun test_checkout_with_unmerged_files_in_first_repo_should_show_notification() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myUltimate) - final Ref notificationShown = Ref.create(false); - checkoutBranch("feature", new TestUiHandler() { - @Override - public void showUnmergedFilesNotification(@NotNull String operationName, @NotNull Collection repositories) { - notificationShown.set(true); + val notificationShown = Ref.create(false) + checkoutBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesNotification(operationName: String, repositories: Collection) { + notificationShown.set(true) } - }); + }) - assertTrue("Unmerged files notification was not shown", notificationShown.get()); + assertTrue("Unmerged files notification was not shown", notificationShown.get()) } - public void test_checkout_with_unmerged_file_in_second_repo_should_propose_to_rollback() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myCommunity); + fun test_checkout_with_unmerged_file_in_second_repo_should_propose_to_rollback() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myCommunity) - final Ref rollbackProposed = Ref.create(false); - checkoutBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - rollbackProposed.set(true); - return false; + val rollbackProposed = Ref.create(false) + checkoutBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + rollbackProposed.set(true) + return false } - }); + }) - assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()); + assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()) } - public void test_rollback_checkout_should_return_to_previous_branch() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myCommunity); + fun test_rollback_checkout_should_return_to_previous_branch() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myCommunity) - checkoutBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return true; + checkoutBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return true } - }); + }) - assertCurrentBranch("master"); + assertCurrentBranch("master") } - public void test_deny_rollback_checkout_should_do_nothing() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myCommunity); + fun test_deny_rollback_checkout_should_do_nothing() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myCommunity) - checkoutBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return false; + checkoutBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return false } - }); + }) - assertCurrentBranch(myUltimate, "feature"); - assertCurrentBranch(myCommunity, "master"); - assertCurrentBranch(myContrib, "master"); + assertCurrentBranch(myUltimate, "feature") + assertCurrentBranch(myCommunity, "master") + assertCurrentBranch(myContrib, "master") } - public void test_checkout_revision_checkout_branch_with_complete_success() { - branchWithCommit(myRepositories, "feature"); + fun test_checkout_revision_checkout_branch_with_complete_success() { + branchWithCommit(myRepositories, "feature") - checkoutRevision("feature", new TestUiHandler()); + checkoutRevision("feature", TestUiHandler()) - assertDetachedState("feature"); + assertDetachedState("feature") assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature"), - myVcsNotifier.getLastNotification().getContent()); + myVcsNotifier.getLastNotification().getContent()) } - public void test_checkout_revision_checkout_ref_with_complete_success() { - branchWithCommit(myRepositories, "feature"); + fun test_checkout_revision_checkout_ref_with_complete_success() { + branchWithCommit(myRepositories, "feature") - checkoutRevision("feature~1", new TestUiHandler()); + checkoutRevision("feature~1", TestUiHandler()) - assertDetachedState("master"); + assertDetachedState("master") assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature~1"), - myVcsNotifier.getLastNotification().getContent()); + myVcsNotifier.getLastNotification().getContent()) } - public void test_checkout_revision_checkout_ref_with_complete_failure() { - branchWithCommit(myRepositories, "feature"); + fun test_checkout_revision_checkout_ref_with_complete_failure() { + branchWithCommit(myRepositories, "feature") - checkoutRevision("unknown_ref", new TestUiHandler()); + checkoutRevision("unknown_ref", TestUiHandler()) - assertCurrentBranch("master"); - assertCurrentRevision("master"); - assertEquals("Notification about successful branch checkout is incorrect", "Revision not found in project, community and contrib", - myVcsNotifier.getLastNotification().getContent()); + assertCurrentBranch("master") + assertCurrentRevision("master") + assertEquals("Notification about successful branch checkout is incorrect", + "Revision not found in project, community and contrib", + myVcsNotifier.getLastNotification().getContent()) } - public void test_checkout_revision_checkout_ref_with_partial_success() { - branchWithCommit(ContainerUtil.list(myCommunity, myContrib), "feature"); + fun test_checkout_revision_checkout_ref_with_partial_success() { + branchWithCommit(ContainerUtil.list(myCommunity, myContrib), "feature") - checkoutRevision("feature", new TestUiHandler()); + checkoutRevision("feature", TestUiHandler()) - assertCurrentBranch(myUltimate, "master"); - assertDetachedState(myCommunity, "feature"); - assertDetachedState(myContrib, "feature"); + assertCurrentBranch(myUltimate, "master") + assertDetachedState(myCommunity, "feature") + assertDetachedState(myContrib, "feature") assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature") + " in community and contrib" + "
" + - "Revision not found in project" + "
Rollback", - myVcsNotifier.getLastNotification().getContent()); + "Revision not found in project" + "
Rollback", + myVcsNotifier.getLastNotification().getContent()) } - public void test_checkout_with_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { - test_untracked_files_overwritten_by_in_first_repo("checkout", 1); + fun test_checkout_with_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { + test_untracked_files_overwritten_by_in_first_repo("checkout", 1) } - public void test_checkout_with_several_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { + fun test_checkout_with_several_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { // note that in old Git versions only one file is listed in the error. - test_untracked_files_overwritten_by_in_first_repo("checkout", 3); + test_untracked_files_overwritten_by_in_first_repo("checkout", 3) } - public void test_merge_with_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { - test_untracked_files_overwritten_by_in_first_repo("merge", 1); + fun test_merge_with_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() { + test_untracked_files_overwritten_by_in_first_repo("merge", 1) } - private void test_untracked_files_overwritten_by_in_first_repo(String operation, int untrackedFiles) { - branchWithCommit(myRepositories, "feature"); + private fun test_untracked_files_overwritten_by_in_first_repo(operation: String, untrackedFiles: Int) { + branchWithCommit(myRepositories, "feature") - Collection files = ContainerUtil.newArrayList(); - for (int i = 0; i < untrackedFiles; i++) { - files.add("untracked" + i + ".txt"); + val files = ContainerUtil.newArrayList() + for (i in 0..untrackedFiles - 1) { + files.add("untracked" + i + ".txt") } - untrackedFileOverwrittenBy(myUltimate, "feature", files); - - final Ref notificationShown = Ref.create(false); - checkoutOrMerge(operation, "feature", new TestUiHandler() { - @Override - public void showUntrackedFilesNotification(@NotNull String operationName, - @NotNull VirtualFile root, - @NotNull Collection relativePaths) { - notificationShown.set(true); + untrackedFileOverwrittenBy(myUltimate, "feature", files) + + val notificationShown = Ref.create(false) + checkoutOrMerge(operation, "feature", object : TestUiHandler() { + override fun showUntrackedFilesNotification(operationName: String, + root: VirtualFile, + relativePaths: Collection) { + notificationShown.set(true) } - }); + }) - assertTrue("Untracked files notification was not shown", notificationShown.get()); + assertTrue("Untracked files notification was not shown", notificationShown.get()) } - public void test_checkout_with_untracked_files_overwritten_by_checkout_in_second_repo_should_show_rollback_proposal_with_file_list() { - check_checkout_with_untracked_files_overwritten_by_in_second_repo("checkout"); + fun test_checkout_with_untracked_files_overwritten_by_checkout_in_second_repo_should_show_rollback_proposal_with_file_list() { + check_checkout_with_untracked_files_overwritten_by_in_second_repo("checkout") } - public void test_merge_with_untracked_files_overwritten_by_checkout_in_second_repo_should_show_rollback_proposal_with_file_list() { - check_checkout_with_untracked_files_overwritten_by_in_second_repo("merge"); + fun test_merge_with_untracked_files_overwritten_by_checkout_in_second_repo_should_show_rollback_proposal_with_file_list() { + check_checkout_with_untracked_files_overwritten_by_in_second_repo("merge") } - private void check_checkout_with_untracked_files_overwritten_by_in_second_repo(String operation) { - branchWithCommit(myRepositories, "feature"); + private fun check_checkout_with_untracked_files_overwritten_by_in_second_repo(operation: String) { + branchWithCommit(myRepositories, "feature") - List untracked = Arrays.asList("untracked.txt"); - untrackedFileOverwrittenBy(myCommunity, "feature", untracked); + val untracked = Arrays.asList("untracked.txt") + untrackedFileOverwrittenBy(myCommunity, "feature", untracked) - final Collection untrackedPaths = ContainerUtil.newArrayList(); - checkoutOrMerge(operation, "feature", new TestUiHandler() { - @Override - public boolean showUntrackedFilesDialogWithRollback(@NotNull String operationName, - @NotNull String rollbackProposal, - @NotNull VirtualFile root, - @NotNull Collection relativePaths) { - untrackedPaths.addAll(relativePaths); - return false; + val untrackedPaths = ContainerUtil.newArrayList() + checkoutOrMerge(operation, "feature", object : TestUiHandler() { + override fun showUntrackedFilesDialogWithRollback(operationName: String, + rollbackProposal: String, + root: VirtualFile, + relativePaths: Collection): Boolean { + untrackedPaths.addAll(relativePaths) + return false } - }); + }) - assertTrue("Untracked files dialog was not shown", !untrackedPaths.isEmpty()); - assertEquals("Incorrect set of untracked files was shown in the dialog", untracked, untrackedPaths); + assertTrue("Untracked files dialog was not shown", !untrackedPaths.isEmpty()) + assertEquals("Incorrect set of untracked files was shown in the dialog", untracked, untrackedPaths) } - public void test_checkout_with_local_changes_overwritten_by_checkout_should_show_smart_checkout_dialog() throws ParseException { - check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("checkout", 1); + fun test_checkout_with_local_changes_overwritten_by_checkout_should_show_smart_checkout_dialog() { + check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("checkout", 1) } - public void test_checkout_with_several_local_changes_overwritten_by_checkout_should_show_smart_checkout_dialog() throws ParseException { - check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("checkout", 3); + fun test_checkout_with_several_local_changes_overwritten_by_checkout_should_show_smart_checkout_dialog() { + check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("checkout", 3) } - public void test_merge_with_local_changes_overwritten_by_merge_should_show_smart_merge_dialog() throws ParseException { - check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("merge", 1); + fun test_merge_with_local_changes_overwritten_by_merge_should_show_smart_merge_dialog() { + check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog("merge", 1) } - private void check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog(String operation, int numFiles) - throws ParseException { - List expectedChanges = prepareLocalChangesOverwrittenBy(myUltimate, numFiles); + private fun check_operation_with_local_changes_overwritten_by_should_show_smart_checkout_dialog(operation: String, numFiles: Int) { + val expectedChanges = prepareLocalChangesOverwrittenBy(myUltimate, numFiles) - final List actualChanges = ContainerUtil.newArrayList(); - checkoutOrMerge(operation, "feature", new TestUiHandler() { - @Override - public int showSmartOperationDialog(@NotNull Project project, - @NotNull List changes, - @NotNull Collection paths, - @NotNull String operation, - @Nullable String forceButton) { - actualChanges.addAll(changes); - return DialogWrapper.CANCEL_EXIT_CODE; + val actualChanges = ContainerUtil.newArrayList() + checkoutOrMerge(operation, "feature", object : TestUiHandler() { + override fun showSmartOperationDialog(project: Project, + changes: List, + paths: Collection, + operation: String, + forceButton: String?): Int { + actualChanges.addAll(changes) + return DialogWrapper.CANCEL_EXIT_CODE } - }); + }) - assertFalse("Local changes were not shown in the dialog", actualChanges.isEmpty()); + assertFalse("Local changes were not shown in the dialog", actualChanges.isEmpty()) if (newGitVersion()) { - Collection actualPaths = ContainerUtil.map(actualChanges, new Function() { - @Override - public String fun(Change change) { - return FileUtil.getRelativePath(myUltimate.getRoot().getPath(), change.getAfterRevision().getFile().getPath(), '/'); + val actualPaths = ContainerUtil.map(actualChanges, object : Function { + override fun `fun`(change: Change): String { + return FileUtil.getRelativePath(myUltimate.getRoot().getPath(), change.getAfterRevision()!!.getFile().getPath(), '/')!! } - }); - assertSameElements("Incorrect set of local changes was shown in the dialog", actualPaths, expectedChanges); + }) + assertSameElements("Incorrect set of local changes was shown in the dialog", actualPaths, expectedChanges) } } - static boolean newGitVersion() throws ParseException { - return !GitVersionSpecialty.OLD_STYLE_OF_UNTRACKED_AND_LOCAL_CHANGES_WOULD_BE_OVERWRITTEN.existsIn(GitVersion.parse(git("version"))); - } - - public void test_agree_to_smart_checkout_should_smart_checkout() { - List localChanges = agree_to_smart_operation("checkout", "Checked out feature"); + fun test_agree_to_smart_checkout_should_smart_checkout() { + val localChanges = agree_to_smart_operation("checkout", "Checked out feature") - assertCurrentBranch("feature"); - cd(myUltimate); - String actual = cat(localChanges.get(0)); - String expectedContent = LOCAL_CHANGES_OVERWRITTEN_BY.branchLine + - LOCAL_CHANGES_OVERWRITTEN_BY.initial + - LOCAL_CHANGES_OVERWRITTEN_BY.masterLine; - assertContent(expectedContent, actual); + assertCurrentBranch("feature") + cd(myUltimate) + val actual = Executor.cat(localChanges.get(0)) + val expectedContent = LOCAL_CHANGES_OVERWRITTEN_BY.branchLine + + LOCAL_CHANGES_OVERWRITTEN_BY.initial + + LOCAL_CHANGES_OVERWRITTEN_BY.masterLine + assertContent(expectedContent, actual) } - public void test_agree_to_smart_merge_should_smart_merge() { - Collection localChanges = agree_to_smart_operation("merge", - "Merged feature to master
Delete feature"); + fun test_agree_to_smart_merge_should_smart_merge() { + val localChanges = agree_to_smart_operation("merge", + "Merged feature to master
Delete feature") - cd(myUltimate); - String actual = cat(ContainerUtil.getFirstItem(localChanges)); - String expectedContent = LOCAL_CHANGES_OVERWRITTEN_BY.branchLine + - LOCAL_CHANGES_OVERWRITTEN_BY.initial + - LOCAL_CHANGES_OVERWRITTEN_BY.masterLine; - assertContent(expectedContent, actual); + cd(myUltimate) + val actual = Executor.cat(ContainerUtil.getFirstItem(localChanges)!!) + val expectedContent = LOCAL_CHANGES_OVERWRITTEN_BY.branchLine + + LOCAL_CHANGES_OVERWRITTEN_BY.initial + + LOCAL_CHANGES_OVERWRITTEN_BY.masterLine + assertContent(expectedContent, actual) } - List agree_to_smart_operation(String operation, String expectedSuccessMessage) { - List localChanges = prepareLocalChangesOverwrittenBy(myUltimate); - - TestUiHandler handler = new TestUiHandler(); - checkoutOrMerge(operation, "feature", handler); + private fun agree_to_smart_operation(operation: String, expectedSuccessMessage: String): List { + val localChanges = prepareLocalChangesOverwrittenBy(myUltimate) - assertNotNull("No success notification was shown", myVcsNotifier.getLastNotification()); - assertEquals("Success message is incorrect", expectedSuccessMessage, myVcsNotifier.getLastNotification().getContent()); + val handler = TestUiHandler() + checkoutOrMerge(operation, "feature", handler) - return localChanges; - } + assertNotNull("No success notification was shown", myVcsNotifier.getLastNotification()) + assertEquals("Success message is incorrect", expectedSuccessMessage, myVcsNotifier.getLastNotification().getContent()) - List prepareLocalChangesOverwrittenBy(GitRepository repository) { - return prepareLocalChangesOverwrittenBy(repository, 1); + return localChanges } - List prepareLocalChangesOverwrittenBy(GitRepository repository, int numFiles) { - List localChanges = ContainerUtil.newArrayList(); - for (int i = 0; i < numFiles; i++) { - localChanges.add(String.format("local%d.txt", i)); + @JvmOverloads internal fun prepareLocalChangesOverwrittenBy(repository: GitRepository, numFiles: Int = 1): List { + val localChanges = ContainerUtil.newArrayList() + for (i in 0..numFiles - 1) { + localChanges.add(String.format("local%d.txt", i)) } - localChangesOverwrittenByWithoutConflict(repository, "feature", localChanges); - updateChangeListManager(); + localChangesOverwrittenByWithoutConflict(repository, "feature", localChanges) + updateChangeListManager() - for (GitRepository repo : myRepositories) { - if (!repo.equals(repository)) { - branchWithCommit(repo, "feature"); + for (repo in myRepositories) { + if (repo != repository) { + branchWithCommit(repo, "feature") } } - return localChanges; + return localChanges } - public void test_deny_to_smart_checkout_in_first_repo_should_show_nothing() { - check_deny_to_smart_operation_in_first_repo_should_show_nothing("checkout"); + fun test_deny_to_smart_checkout_in_first_repo_should_show_nothing() { + check_deny_to_smart_operation_in_first_repo_should_show_nothing("checkout") } - public void test_deny_to_smart_merge_in_first_repo_should_show_nothing() { - check_deny_to_smart_operation_in_first_repo_should_show_nothing("merge"); + fun test_deny_to_smart_merge_in_first_repo_should_show_nothing() { + check_deny_to_smart_operation_in_first_repo_should_show_nothing("merge") } - public void check_deny_to_smart_operation_in_first_repo_should_show_nothing(String operation) { - prepareLocalChangesOverwrittenBy(myUltimate); + fun check_deny_to_smart_operation_in_first_repo_should_show_nothing(operation: String) { + prepareLocalChangesOverwrittenBy(myUltimate) - checkoutOrMerge(operation, "feature", new TestUiHandler() { - @Override - public int showSmartOperationDialog(@NotNull Project project, - @NotNull List changes, - @NotNull Collection paths, - @NotNull String operation, - @Nullable String forceButton) { - return GitSmartOperationDialog.CANCEL_EXIT_CODE; + checkoutOrMerge(operation, "feature", object : TestUiHandler() { + override fun showSmartOperationDialog(project: Project, + changes: List, + paths: Collection, + operation: String, + forceButton: String?): Int { + return GitSmartOperationDialog.CANCEL_EXIT_CODE } - }); + }) - assertNull("Notification was unexpectedly shown:" + myVcsNotifier.getLastNotification(), myVcsNotifier.getLastNotification()); - assertCurrentBranch("master"); + assertNull("Notification was unexpectedly shown:" + myVcsNotifier.getLastNotification(), myVcsNotifier.getLastNotification()) + assertCurrentBranch("master") } - public void test_deny_to_smart_checkout_in_second_repo_should_show_rollback_proposal() { - check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal("checkout"); - assertCurrentBranch(myUltimate, "feature"); - assertCurrentBranch(myCommunity, "master"); - assertCurrentBranch(myContrib, "master"); + fun test_deny_to_smart_checkout_in_second_repo_should_show_rollback_proposal() { + check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal("checkout") + assertCurrentBranch(myUltimate, "feature") + assertCurrentBranch(myCommunity, "master") + assertCurrentBranch(myContrib, "master") } - public void test_deny_to_smart_merge_in_second_repo_should_show_rollback_proposal() { - check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal("merge"); + fun test_deny_to_smart_merge_in_second_repo_should_show_rollback_proposal() { + check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal("merge") } - public void check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal(String operation) { - prepareLocalChangesOverwrittenBy(myCommunity); + fun check_deny_to_smart_operation_in_second_repo_should_show_rollback_proposal(operation: String) { + prepareLocalChangesOverwrittenBy(myCommunity) - final Ref rollbackMsg = Ref.create(); - checkoutOrMerge(operation, "feature", new TestUiHandler() { - @Override - public int showSmartOperationDialog(@NotNull Project project, - @NotNull List changes, - @NotNull Collection paths, - @NotNull String operation, - @Nullable String forceButton) { - return GitSmartOperationDialog.CANCEL_EXIT_CODE; - } + val rollbackMsg = Ref.create() + checkoutOrMerge(operation, "feature", object : TestUiHandler() { + override fun showSmartOperationDialog(project: Project, + changes: List, + paths: Collection, + operation: String, + forceButton: String?): Int { + return GitSmartOperationDialog.CANCEL_EXIT_CODE + } - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, - @NotNull String message, - @NotNull String rollbackProposal) { - rollbackMsg.set(message); - return false; - } - }); + override fun notifyErrorWithRollbackProposal(title: String, + message: String, + rollbackProposal: String): Boolean { + rollbackMsg.set(message) + return false + } + }) - assertNotNull("Rollback proposal was not shown", rollbackMsg.get()); + assertNotNull("Rollback proposal was not shown", rollbackMsg.get()) } - public void test_force_checkout_in_case_of_local_changes_that_would_be_overwritten_by_checkout() { + fun test_force_checkout_in_case_of_local_changes_that_would_be_overwritten_by_checkout() { // IDEA-99849 - prepareLocalChangesOverwrittenBy(myUltimate); - - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, new TestUiHandler() { - @Override - public int showSmartOperationDialog(@NotNull Project project, - @NotNull List changes, - @NotNull Collection paths, - @NotNull String operation, - @Nullable String forceButton) { - return GitSmartOperationDialog.FORCE_EXIT_CODE; + prepareLocalChangesOverwrittenBy(myUltimate) + + val brancher = GitBranchWorker(myProject, myGit, object : TestUiHandler() { + override fun showSmartOperationDialog(project: Project, + changes: List, + paths: Collection, + operation: String, + forceButton: String?): Int { + return GitSmartOperationDialog.FORCE_EXIT_CODE } - }); - brancher.checkoutNewBranchStartingFrom("new_branch", "feature", myRepositories); + }) + brancher.checkoutNewBranchStartingFrom("new_branch", "feature", myRepositories!!) assertEquals("Notification about successful branch creation is incorrect", "Checked out new branch new_branch from feature", - myVcsNotifier.getLastNotification().getContent()); - assertCurrentBranch("new_branch"); + myVcsNotifier.getLastNotification().getContent()) + assertCurrentBranch("new_branch") } - public void test_rollback_of_checkout_branch_as_new_branch_should_delete_branches() { - branchWithCommit(myRepositories, "feature"); - touch("feature.txt", "feature_content"); - git("add feature.txt"); - git("commit -m feature_changes"); - git("checkout master"); + fun test_rollback_of_checkout_branch_as_new_branch_should_delete_branches() { + branchWithCommit(myRepositories, "feature") + Executor.touch("feature.txt", "feature_content") + git("add feature.txt") + git("commit -m feature_changes") + git("checkout master") - unmergedFiles(myCommunity); + unmergedFiles(myCommunity) - final Ref rollbackProposed = Ref.create(false); - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - rollbackProposed.set(true); - return true; + val rollbackProposed = Ref.create(false) + val brancher = GitBranchWorker(myProject, myGit, object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + rollbackProposed.set(true) + return true } - }); - brancher.checkoutNewBranchStartingFrom("newBranch", "feature", myRepositories); + }) + brancher.checkoutNewBranchStartingFrom("newBranch", "feature", myRepositories!!) - assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()); - assertCurrentBranch("master"); - for (GitRepository repository : myRepositories) { + assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()) + assertCurrentBranch("master") + for (repository in myRepositories!!) { assertFalse("Branch 'newBranch' should have been deleted on rollback", - ContainerUtil.exists(git(repository, "branch").split("\n"), new Condition() { - @Override - public boolean value(String s) { - return s.contains("newBranch"); - } - })); + ContainerUtil.exists( + git(repository, "branch").split(("\n").toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray(), + object : Condition { + override fun value(s: String): Boolean { + return s.contains("newBranch") + } + })) } } - public void test_delete_branch_that_is_fully_merged_should_go_without_problems() { - for (GitRepository repository : myRepositories) { - git(repository, "branch todelete"); + fun test_delete_branch_that_is_fully_merged() { + for (repository in myRepositories) { + git(repository, "branch todelete") } - deleteBranch("todelete", new TestUiHandler()); + deleteBranch("todelete", TestUiHandler()) - assertNotNull("Successful notification was not shown", myVcsNotifier.getLastNotification()); - assertEquals("Successful notification is incorrect", "Deleted branch " + bcode("todelete"), - myVcsNotifier.getLastNotification().getContent()); + assertNotNull("Successful notification was not shown", myVcsNotifier.lastNotification) + assertEquals("Successful notification is incorrect", + "Deleted branch " + bcode("todelete") + "
Restore", + myVcsNotifier.lastNotification.content) } - public void test_delete_unmerged_branch_should_show_dialog() { - prepareUnmergedBranch(myCommunity); - - final Ref dialogShown = Ref.create(false); - deleteBranch("todelete", new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - dialogShown.set(true); - return false; - } + fun test_delete_unmerged_branch_should_mention_this_in_notification() { + prepareUnmergedBranch(myCommunity) - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal) { - return false; + var dialogShown = false + val brancher = GitBranchWorker(myProject, myGit, object : TestUiHandler() { + override fun showBranchIsNotFullyMergedDialog(project: Project, + history: Map>, + baseBranches: Map, + removedBranch: String): Boolean { + dialogShown = true + return false } - }); + }) - assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown.get()); + brancher.deleteBranch("todelete", listOf(myCommunity)) + val notification = assertSuccessfulNotification( + """ + Deleted branch ${bcode("todelete")}
+ Restore
Some commits were not merged and could be lost + """.trimIndent()) + assertFalse("'Branch is not fully merged' dialog shouldn't be shown yet", dialogShown) + val clickEvent = HyperlinkEvent(this, HyperlinkEvent.EventType.ACTIVATED, null, GitDeleteBranchOperation.VIEW_UNMERGED_LINK) + notification.listener!!.hyperlinkUpdate(notification, clickEvent) + assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown) } - public void test_ok_in_unmerged_branch_dialog_should_force_delete_branch() { - prepareUnmergedBranch(myUltimate); - deleteBranch("todelete", new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - return true; - } - }); - assertBranchDeleted("todelete"); - } - - public void test_cancel_in_unmerged_branch_dialog_in_not_first_repository_should_show_rollback_proposal() { - prepareUnmergedBranch(myCommunity); - - final Ref rollbackMsg = Ref.create(); - deleteBranch("todelete", new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - return false; - } - - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal) { - rollbackMsg.set(message); - return false; + fun test_ok_in_unmerged_branch_dialog_should_force_delete_branch() { + prepareUnmergedBranch(myUltimate) + deleteBranch("todelete", object : TestUiHandler() { + override fun showBranchIsNotFullyMergedDialog(project: Project, + history: Map>, + baseBranches: Map, + removedBranch: String): Boolean { + return true } - }); - - assertNotNull("Rollback messages was not shown", rollbackMsg.get()); + }) + assertBranchDeleted("todelete") } - public void test_rollback_delete_branch_should_recreate_branches() { - prepareUnmergedBranch(myCommunity); + fun test_rollback_delete_branch_should_recreate_branches() { + prepare_delete_branch_failure_in_2nd_repo() - final Ref rollbackMsg = Ref.create(); - deleteBranch("todelete", new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - return false; + var rollbackMsg: String? = null + deleteBranch("todelete", object : TestUiHandler() { + override fun notifyErrorWithRollbackProposal(title: String, message: String, rollbackProposal: String): Boolean { + rollbackMsg = message + return true } + }) - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal) { - rollbackMsg.set(message); - return true; - } - }); - - assertNotNull("Rollback messages was not shown", rollbackMsg.get()); - assertBranchExists(myUltimate, "todelete"); - assertBranchExists(myCommunity, "todelete"); - assertBranchExists(myContrib, "todelete"); - } - - public void test_deny_rollback_delete_branch_should_do_nothing() { - prepareUnmergedBranch(myCommunity); - - final Ref rollbackMsg = Ref.create(); - deleteBranch("todelete", new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - return false; - } + assertNotNull("Rollback messages was not shown", rollbackMsg) + assertBranchExists(myUltimate, "todelete") + assertBranchExists(myCommunity, "todelete") + assertBranchExists(myContrib, "todelete") + } - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal) { - rollbackMsg.set(message); - return false; - } - }); + fun test_deny_rollback_delete_branch_should_do_nothing() { + prepare_delete_branch_failure_in_2nd_repo() - assertNotNull("Rollback messages was not shown", rollbackMsg.get()); + var rollbackMsg: String? = null + deleteBranch("todelete", object : TestUiHandler() { + override fun notifyErrorWithRollbackProposal(title: String, message: String, rollbackProposal: String): Boolean { + rollbackMsg = message + return false + } + }) - assertBranchDeleted(myUltimate, "todelete"); - assertBranchExists(myCommunity, "todelete"); - assertBranchExists(myContrib, "todelete"); + assertNotNull("Rollback messages was not shown", rollbackMsg) + assertBranchDeleted(myUltimate, "todelete") + assertBranchExists(myCommunity, "todelete") + assertBranchExists(myContrib, "todelete") } - public void test_delete_branch_merged_to_head_but_unmerged_to_upstream_should_show_dialog() { + fun test_delete_branch_merged_to_head_but_unmerged_to_upstream_should_mention_this_in_notification() { // inspired by IDEA-83604 // for the sake of simplicity we deal with a single myCommunity repository for remote operations - prepareRemoteRepo(myCommunity); - cd(myCommunity); - git("checkout -b feature"); - git("push -u origin feature"); + prepareRemoteRepo(myCommunity) + cd(myCommunity) + git("checkout -b feature") + git("push -u origin feature") // create a commit and merge it to master, but not to feature's upstream - touch("feature.txt", "feature content"); - git("add feature.txt"); - git("commit -m feature_branch"); - git("checkout master"); - git("merge feature"); + Executor.touch("feature.txt", "feature content") + git("add feature.txt") + git("commit -m feature_branch") + git("checkout master") + git("merge feature") // delete feature fully merged to current HEAD, but not to the upstream - final Ref dialogShown = Ref.create(false); - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, new TestUiHandler() { - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - dialogShown.set(true); - return false; - } - }); - brancher.deleteBranch("feature", Arrays.asList(myCommunity)); - - assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown.get()); + var dialogShown = false + val brancher = GitBranchWorker(myProject, myGit, object : TestUiHandler() { + override fun showBranchIsNotFullyMergedDialog(project: Project, + history: Map>, + baseBranches: Map, + removedBranch: String): Boolean { + dialogShown = true + return false + } + }) + + brancher.deleteBranch("feature", listOf(myCommunity)) + val notification = assertSuccessfulNotification( + """ + Deleted branch ${bcode("feature")}
+ Restore + Delete tracked remote branch
Some commits were not merged and could be lost + """.trimIndent()) + assertFalse("'Branch is not fully merged' dialog shouldn't be shown yet", dialogShown) + val clickEvent = HyperlinkEvent(this, HyperlinkEvent.EventType.ACTIVATED, null, GitDeleteBranchOperation.VIEW_UNMERGED_LINK) + notification.listener!!.hyperlinkUpdate(notification, clickEvent) + assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown) + } + + private fun prepare_delete_branch_failure_in_2nd_repo() { + for (repository in myRepositories) { + git(repository, "branch todelete") + } + myGit.onBranchDelete { + if (myCommunity == it) GitCommandResult(false, 1, listOf("Couldn't remove branch"), listOf(), null) + else null + } } - public void test_simple_merge_without_problems() throws IOException { - branchWithCommit(myRepositories, "master2", "branch_file.txt", "branch content"); + fun test_simple_merge_without_problems() { + branchWithCommit(myRepositories, "master2", "branch_file.txt", "branch content") - mergeBranch("master2", new TestUiHandler()); + mergeBranch("master2", TestUiHandler()) - assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()); + assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()) assertEquals("Success message is incorrect", - "Merged " + bcode("master2") + " to " + bcode("master") + "
Delete master2", - myVcsNotifier.getLastNotification().getContent()); - assertFile(myUltimate, "branch_file.txt", "branch content"); - assertFile(myCommunity, "branch_file.txt", "branch content"); - assertFile(myContrib, "branch_file.txt", "branch content"); + "Merged " + bcode("master2") + " to " + bcode("master") + "
Delete master2", + myVcsNotifier.getLastNotification().getContent()) + assertFile(myUltimate, "branch_file.txt", "branch content") + assertFile(myCommunity, "branch_file.txt", "branch content") + assertFile(myContrib, "branch_file.txt", "branch content") } - public void test_merge_branch_that_is_up_to_date() { - for (GitRepository repository : myRepositories) { - git(repository, "branch master2"); + fun test_merge_branch_that_is_up_to_date() { + for (repository in myRepositories!!) { + git(repository, "branch master2") } - mergeBranch("master2", new TestUiHandler()); + mergeBranch("master2", TestUiHandler()) - assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()); + assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()) assertEquals("Success message is incorrect", "Already up-to-date
Delete master2", - myVcsNotifier.getLastNotification().getContent()); + myVcsNotifier.getLastNotification().getContent()) } - public void test_merge_one_simple_and_other_up_to_date() throws IOException { - branchWithCommit(myCommunity, "master2", "branch_file.txt", "branch content"); - git(myUltimate, "branch master2"); - git(myContrib, "branch master2"); + fun test_merge_one_simple_and_other_up_to_date() { + branchWithCommit(myCommunity, "master2", "branch_file.txt", "branch content") + git(myUltimate, "branch master2") + git(myContrib, "branch master2") - mergeBranch("master2", new TestUiHandler()); + mergeBranch("master2", TestUiHandler()) - assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()); + assertNotNull("Success message wasn't shown", myVcsNotifier.getLastNotification()) assertEquals("Success message is incorrect", "Merged " + bcode("master2") + " to " + bcode("master") + "
Delete master2", - myVcsNotifier.getLastNotification().getContent()); - assertFile(myCommunity, "branch_file.txt", "branch content"); - } - - public void test_merge_with_unmerged_files_in_first_repo_should_show_notification() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myUltimate); - - final Ref notificationShown = Ref.create(false); - mergeBranch("feature", new TestUiHandler() { - @Override - public void showUnmergedFilesNotification(@NotNull String operationName, - @NotNull Collection repositories) { - notificationShown.set(true); - } - }); - assertTrue("Unmerged files notification was not shown", notificationShown.get()); - } - - public void test_merge_with_unmerged_files_in_second_repo_should_propose_to_rollback() { - branchWithCommit(myRepositories, "feature"); - unmergedFiles(myCommunity); - - final Ref rollbackProposed = Ref.create(false); - mergeBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - rollbackProposed.set(true); - return false; - } - }); - assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()); + myVcsNotifier.getLastNotification().getContent()) + assertFile(myCommunity, "branch_file.txt", "branch content") } - public void test_rollback_merge_should_reset_merge() { - branchWithCommit(myRepositories, "feature"); - String ultimateTip = tip(myUltimate); - unmergedFiles(myCommunity); + fun test_merge_with_unmerged_files_in_first_repo_should_show_notification() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myUltimate) - mergeBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return true; + val notificationShown = Ref.create(false) + mergeBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesNotification(operationName: String, + repositories: Collection) { + notificationShown.set(true) } - }); - - assertEquals("Merge in ultimate should have been reset", ultimateTip, tip(myUltimate)); + }) + assertTrue("Unmerged files notification was not shown", notificationShown.get()) } - private static String tip(GitRepository repo) { - cd(repo); - return git("rev-list -1 HEAD"); + fun test_merge_with_unmerged_files_in_second_repo_should_propose_to_rollback() { + branchWithCommit(myRepositories, "feature") + unmergedFiles(myCommunity) + + val rollbackProposed = Ref.create(false) + mergeBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + rollbackProposed.set(true) + return false + } + }) + assertTrue("Rollback was not proposed if unmerged files prevented checkout in the second repository", rollbackProposed.get()) } - public void test_deny_rollback_merge_should_leave_as_is() { - branchWithCommit(myRepositories, "feature"); - cd(myUltimate); - String ultimateTipAfterMerge = git("rev-list -1 feature"); - unmergedFiles(myCommunity); + fun test_rollback_merge_should_reset_merge() { + branchWithCommit(myRepositories, "feature") + val ultimateTip = tip(myUltimate) + unmergedFiles(myCommunity) - mergeBranch("feature", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return false; + mergeBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return true } - }); + }) - assertEquals("Merge in ultimate should have been reset", ultimateTipAfterMerge, tip(myUltimate)); + assertEquals("Merge in ultimate should have been reset", ultimateTip, tip(myUltimate)) } - public void test_checkout_in_detached_head() { - cd(myCommunity); - touch("file.txt", "some content"); - add("file.txt"); - commit("msg"); - git(myCommunity, "checkout HEAD^"); - - checkoutBranch("master", new TestUiHandler()); - assertCurrentBranch("master"); - } + fun test_deny_rollback_merge_should_leave_as_is() { + branchWithCommit(myRepositories, "feature") + cd(myUltimate) + val ultimateTipAfterMerge = git("rev-list -1 feature") + unmergedFiles(myCommunity) - // inspired by IDEA-127472 - public void test_checkout_to_common_branch_when_branches_have_diverged() { - branchWithCommit(myUltimate, "feature", "feature-file.txt", "feature_content", false); - branchWithCommit(myCommunity, "newbranch", "newbranch-file.txt", "newbranch_content", false); - checkoutBranch("master", new TestUiHandler()); - assertCurrentBranch("master"); - } - - public void test_rollback_checkout_from_diverged_branches_should_return_to_proper_branches() { - branchWithCommit(myUltimate, "feature", "feature-file.txt", "feature_content", false); - branchWithCommit(myCommunity, "newbranch", "newbranch-file.txt", "newbranch_content", false); - unmergedFiles(myContrib); - - checkoutBranch("master", new TestUiHandler() { - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - return true; + mergeBranch("feature", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return false } - }); + }) - assertCurrentBranch(myUltimate, "feature"); - assertCurrentBranch(myCommunity, "newbranch"); - assertCurrentBranch(myContrib, "master"); + assertEquals("Merge in ultimate should have been reset", ultimateTipAfterMerge, tip(myUltimate)) } - static private void assertDetachedState(GitRepository repository, String reference) { - assertCurrentRevision(repository, reference); + fun test_checkout_in_detached_head() { + cd(myCommunity) + Executor.touch("file.txt", "some content") + add("file.txt") + commit("msg") + git(myCommunity, "checkout HEAD^") - String curBranch = getCurrentBranch(repository); - boolean isDetached = curBranch.contains("detached"); - assertTrue("Current branch is not detached in ${repository} - " + curBranch, isDetached); + checkoutBranch("master", TestUiHandler()) + assertCurrentBranch("master") } - static private void assertCurrentBranch(GitRepository repository, String name) { - String curBranch = getCurrentBranch(repository); - assertEquals("Current branch is incorrect in ${repository}", name, curBranch); + // inspired by IDEA-127472 + fun test_checkout_to_common_branch_when_branches_have_diverged() { + branchWithCommit(myUltimate, "feature", "feature-file.txt", "feature_content", false) + branchWithCommit(myCommunity, "newbranch", "newbranch-file.txt", "newbranch_content", false) + checkoutBranch("master", TestUiHandler()) + assertCurrentBranch("master") } - @NotNull - private static String getCurrentBranch(GitRepository repository) { - return ObjectUtils.assertNotNull(ContainerUtil.find(git(repository, "branch").split("\n"), new Condition() { - @Override - public boolean value(String s) { - return s.contains("*"); - } - })).replace('*', ' ').trim(); - } + fun test_rollback_checkout_from_diverged_branches_should_return_to_proper_branches() { + branchWithCommit(myUltimate, "feature", "feature-file.txt", "feature_content", false) + branchWithCommit(myCommunity, "newbranch", "newbranch-file.txt", "newbranch_content", false) + unmergedFiles(myContrib) - static private void assertCurrentRevision(GitRepository repository, String reference) { - String expectedRef = git(repository, "rev-parse " + "HEAD"); - String currentRef = git(repository, "rev-parse " + reference); + checkoutBranch("master", object : TestUiHandler() { + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + return true + } + }) - assertEquals("Current revision is incorrect in ${repository}", expectedRef, currentRef); + assertCurrentBranch(myUltimate, "feature") + assertCurrentBranch(myCommunity, "newbranch") + assertCurrentBranch(myContrib, "master") } - private void assertDetachedState(String reference) { - for (GitRepository repository : myRepositories) { - assertDetachedState(repository, reference); + private fun assertDetachedState(reference: String) { + for (repository in myRepositories!!) { + assertDetachedState(repository, reference) } } - private void assertCurrentBranch(String name) { - for (GitRepository repository : myRepositories) { - assertCurrentBranch(repository, name); + private fun assertCurrentBranch(name: String) { + for (repository in myRepositories!!) { + assertCurrentBranch(repository, name) } } - private void assertCurrentRevision(String reference) { - for (GitRepository repository : myRepositories) { - assertCurrentRevision(repository, reference); + private fun assertCurrentRevision(reference: String) { + for (repository in myRepositories!!) { + assertCurrentRevision(repository, reference) } } - private void checkoutNewBranch(String name, GitBranchUiHandler uiHandler) { - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, uiHandler); - brancher.checkoutNewBranch(name, myRepositories); + private fun checkoutNewBranch(name: String, uiHandler: GitBranchUiHandler) { + val brancher = GitBranchWorker(myProject, myGit, uiHandler) + brancher.checkoutNewBranch(name, myRepositories!!) } - private void checkoutBranch(String name, GitBranchUiHandler uiHandler) { - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, uiHandler); - brancher.checkout(name, false, myRepositories); + private fun checkoutBranch(name: String, uiHandler: GitBranchUiHandler) { + val brancher = GitBranchWorker(myProject, myGit, uiHandler) + brancher.checkout(name, false, myRepositories!!) } - private void checkoutRevision(String reference, GitBranchUiHandler uiHandler) { - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, uiHandler); - brancher.checkout(reference, true, myRepositories); + private fun checkoutRevision(reference: String, uiHandler: GitBranchUiHandler) { + val brancher = GitBranchWorker(myProject, myGit, uiHandler) + brancher.checkout(reference, true, myRepositories) } - private void mergeBranch(String name, GitBranchUiHandler uiHandler) { - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, uiHandler); - brancher.merge(name, GitBrancher.DeleteOnMergeOption.PROPOSE, myRepositories); + private fun mergeBranch(name: String, uiHandler: GitBranchUiHandler) { + val brancher = GitBranchWorker(myProject, myGit, uiHandler) + brancher.merge(name, GitBrancher.DeleteOnMergeOption.PROPOSE, myRepositories) } - private void deleteBranch(String name, GitBranchUiHandler uiHandler) { - GitBranchWorker brancher = new GitBranchWorker(myProject, myGit, uiHandler); - brancher.deleteBranch(name, myRepositories); + private fun deleteBranch(name: String, uiHandler: GitBranchUiHandler) { + val brancher = GitBranchWorker(myProject, myGit, uiHandler) + brancher.deleteBranch(name, myRepositories) } - private void checkoutOrMerge(String operation, String name, GitBranchUiHandler uiHandler) { - if (operation.equals("checkout")) { - checkoutBranch(name, uiHandler); + private fun checkoutOrMerge(operation: String, name: String, uiHandler: GitBranchUiHandler) { + if (operation == "checkout") { + checkoutBranch(name, uiHandler) } else { - mergeBranch(name, uiHandler); + mergeBranch(name, uiHandler) } } - private void prepareUnmergedBranch(GitRepository unmergedRepo) { - for (GitRepository repository : myRepositories) { - git(repository, "branch todelete"); + private fun prepareUnmergedBranch(unmergedRepo: GitRepository) { + for (repository in myRepositories) { + git(repository, "branch todelete") } - cd(unmergedRepo); - git("checkout todelete"); - touch("afile.txt", "content"); - git("add afile.txt"); - git("commit -m unmerged_commit"); - git("checkout master"); + cd(unmergedRepo) + git("checkout todelete") + Executor.touch("afile.txt", "content") + git("add afile.txt") + git("commit -m unmerged_commit") + git("checkout master") } - void assertBranchDeleted(String name) { - for (GitRepository repository : myRepositories) { - assertBranchDeleted(repository, name); + internal fun assertBranchDeleted(name: String) { + for (repository in myRepositories) { + assertBranchDeleted(repository, name) } } - static private void assertBranchDeleted(GitRepository repo, String branch) { - assertFalse("Branch $branch should have been deleted from $repo", git(repo, "branch").contains(branch)); + private open class TestUiHandler : GitBranchUiHandler { + + override fun getProgressIndicator(): ProgressIndicator { + return EmptyProgressIndicator() + } + + override fun showSmartOperationDialog(project: Project, + changes: List, + paths: Collection, + operation: String, + forceButton: String?): Int { + return GitSmartOperationDialog.SMART_EXIT_CODE + } + + override fun showBranchIsNotFullyMergedDialog(project: Project, + history: Map>, + baseBranches: Map, + removedBranch: String): Boolean { + throw UnsupportedOperationException() + } + + override fun notifyErrorWithRollbackProposal(title: String, message: String, rollbackProposal: String): Boolean { + throw UnsupportedOperationException() + } + + override fun showUnmergedFilesNotification(operationName: String, repositories: Collection) { + throw UnsupportedOperationException() + } + + override fun showUnmergedFilesMessageWithRollback(operationName: String, rollbackProposal: String): Boolean { + throw UnsupportedOperationException() + } + + override fun showUntrackedFilesNotification(operationName: String, root: VirtualFile, relativePaths: Collection) { + throw UnsupportedOperationException() + } + + override fun showUntrackedFilesDialogWithRollback(operationName: String, + rollbackProposal: String, + root: VirtualFile, + relativePaths: Collection): Boolean { + throw UnsupportedOperationException() + } } - static private void assertBranchExists(GitRepository repo, String branch) { - assertTrue("Branch $branch should exist in $repo", branchExists(repo, branch)); + private fun bcode(s: String): String { + return "$s" } - private static void assertFile(GitRepository repository, String path, String content) throws IOException { - cd(repository); - assertEquals("Content doesn't match", content, cat(path)); + private fun newGitVersion(): Boolean { + return !GitVersionSpecialty.OLD_STYLE_OF_UNTRACKED_AND_LOCAL_CHANGES_WOULD_BE_OVERWRITTEN.existsIn(GitVersion.parse(git("version"))) } - private static void assertContent(String expectedContent, String actual) { - expectedContent = StringUtil.convertLineSeparators(expectedContent, detectLineSeparators(actual).getSeparatorString()).trim(); - actual = actual.trim(); - assertEquals(String.format("Content doesn't match.%nExpected:%n%s%nActual:%n%s%n", - substWhitespaces(expectedContent), substWhitespaces(actual)), expectedContent, actual); + private fun tip(repo: GitRepository): String { + cd(repo) + return git("rev-list -1 HEAD") } - private static LineSeparator detectLineSeparators(String actual) { - char[] chars = CharArrayUtil.fromSequence(actual); - for (char c : chars) { - if (c == '\r') { - return LineSeparator.CRLF; - } - else if (c == '\n') { // if we are here, there was no \r before - return LineSeparator.LF; - } - } - return LineSeparator.LF; + private fun assertDetachedState(repository: GitRepository, reference: String) { + assertCurrentRevision(repository, reference) + + val curBranch = getCurrentBranch(repository) + val isDetached = curBranch.contains("detached") + assertTrue("Current branch is not detached in \${repository} - " + curBranch, isDetached) } - private static String substWhitespaces(String s) { - return s.replaceAll("\r", Matcher.quoteReplacement("\\r")).replaceAll("\n", Matcher.quoteReplacement("\\n")).replaceAll(" ", "_"); + private fun assertCurrentBranch(repository: GitRepository, name: String) { + val curBranch = getCurrentBranch(repository) + assertEquals("Current branch is incorrect in \${repository}", name, curBranch) } - private static class TestUiHandler implements GitBranchUiHandler { + private fun getCurrentBranch(repository: GitRepository): String { + return ObjectUtils.assertNotNull( + ContainerUtil.find(git(repository, "branch").split(("\n").toRegex()).dropLastWhile({ it.isEmpty() }).toTypedArray(), + object : Condition { + override fun value(s: String): Boolean { + return s.contains("*") + } + })).replace('*', ' ').trim({ it <= ' ' }) + } - @NotNull - @Override - public ProgressIndicator getProgressIndicator() { - return new EmptyProgressIndicator(); - } + private fun assertCurrentRevision(repository: GitRepository, reference: String) { + val expectedRef = git(repository, "rev-parse " + "HEAD") + val currentRef = git(repository, "rev-parse " + reference) - @Override - public int showSmartOperationDialog(@NotNull Project project, - @NotNull List changes, - @NotNull Collection paths, - @NotNull String operation, - @Nullable String forceButton) { - return GitSmartOperationDialog.SMART_EXIT_CODE; - } + assertEquals("Current revision is incorrect in \${repository}", expectedRef, currentRef) + } - @Override - public boolean showBranchIsNotFullyMergedDialog(@NotNull Project project, - @NotNull Map> history, - @NotNull String unmergedBranch, - @NotNull List mergedToBranches, - @NotNull String baseBranch) { - throw new UnsupportedOperationException(); - } + private fun assertBranchDeleted(repo: GitRepository, branch: String) { + assertFalse("Branch \$branch should have been deleted from \$repo", git(repo, "branch").contains(branch)) + } - @Override - public boolean notifyErrorWithRollbackProposal(@NotNull String title, @NotNull String message, @NotNull String rollbackProposal) { - throw new UnsupportedOperationException(); - } + private fun assertBranchExists(repo: GitRepository, branch: String) { + assertTrue("Branch \$branch should exist in \$repo", branchExists(repo, branch)) + } - @Override - public void showUnmergedFilesNotification(@NotNull String operationName, @NotNull Collection repositories) { - throw new UnsupportedOperationException(); - } + private fun assertFile(repository: GitRepository, path: String, content: String) { + cd(repository) + assertEquals("Content doesn't match", content, Executor.cat(path)) + } - @Override - public boolean showUnmergedFilesMessageWithRollback(@NotNull String operationName, @NotNull String rollbackProposal) { - throw new UnsupportedOperationException(); - } + private fun assertContent(expectedContent: String, actual: String) { + var expectedContent = expectedContent + var actual = actual + expectedContent = StringUtil.convertLineSeparators(expectedContent, detectLineSeparators(actual).getSeparatorString()).trim( + { it <= ' ' }) + actual = actual.trim({ it <= ' ' }) + assertEquals(String.format("Content doesn't match.%nExpected:%n%s%nActual:%n%s%n", + substWhitespaces(expectedContent), substWhitespaces(actual)), expectedContent, actual) + } - @Override - public void showUntrackedFilesNotification(@NotNull String operationName, - @NotNull VirtualFile root, - @NotNull Collection relativePaths) { - throw new UnsupportedOperationException(); + private fun detectLineSeparators(actual: String): LineSeparator { + val chars = CharArrayUtil.fromSequence(actual) + for (c in chars) { + if (c == '\r') { + return LineSeparator.CRLF + } + else if (c == '\n') { // if we are here, there was no \r before + return LineSeparator.LF + } } + return LineSeparator.LF + } - @Override - public boolean showUntrackedFilesDialogWithRollback(@NotNull String operationName, - @NotNull String rollbackProposal, - @NotNull VirtualFile root, - @NotNull Collection relativePaths) { - throw new UnsupportedOperationException(); - } + private fun substWhitespaces(s: String): String { + return s.replace(("\r").toRegex(), Matcher.quoteReplacement("\\r")).replace(("\n").toRegex(), + Matcher.quoteReplacement("\\n")).replace((" ").toRegex(), + "_") } } diff --git a/plugins/git4idea/tests/git4idea/test/TestGit.kt b/plugins/git4idea/tests/git4idea/test/TestGit.kt index 69605b12f7d74..122bf9ff4b462 100644 --- a/plugins/git4idea/tests/git4idea/test/TestGit.kt +++ b/plugins/git4idea/tests/git4idea/test/TestGit.kt @@ -40,6 +40,7 @@ class TestGitImpl : GitImpl() { @Volatile private var myRebaseShouldFail: (GitRepository) -> Boolean = { false } @Volatile private var myPushHandler: (GitRepository) -> GitCommandResult? = { null } + @Volatile private var myBranchDeleteHandler: (GitRepository) -> GitCommandResult? = { null } @Volatile private var myInteractiveRebaseEditor: ((String) -> String)? = null override fun push(repository: GitRepository, @@ -53,6 +54,13 @@ class TestGitImpl : GitImpl() { super.push(repository, remote, spec, force, updateTracking, tagMode, *listeners) } + override fun branchDelete(repository: GitRepository, + branchName: String, + force: Boolean, + vararg listeners: GitLineHandlerListener?): GitCommandResult { + return myBranchDeleteHandler(repository) ?: super.branchDelete(repository, branchName, force, *listeners) + } + override fun rebase(repository: GitRepository, params: GitRebaseParams, vararg listeners: GitLineHandlerListener): GitCommandResult { return failOrCall(repository) { super.rebase(repository, params, *listeners) @@ -107,6 +115,10 @@ class TestGitImpl : GitImpl() { myPushHandler = pushHandler; } + fun onBranchDelete(branchDeleteHandler: (GitRepository) -> GitCommandResult?) { + myBranchDeleteHandler = branchDeleteHandler + } + fun setInteractiveRebaseEditor(editor: (String) -> String) { myInteractiveRebaseEditor = editor } From 57da5f6dd7a8e82da826f25e0a1967c1cdf395fe Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 11 Jul 2016 18:46:45 +0300 Subject: [PATCH 31/74] git delete branch notification UI Use standard notification position & new notification UI with actions. --- .../com/intellij/openapi/vcs/VcsNotifier.java | 21 ++- .../intellij/openapi/vcs/TestVcsNotifier.java | 8 +- .../branch/GitDeleteBranchOperation.java | 122 ++++++++++-------- .../git4idea/branch/GitBranchWorkerTest.kt | 111 ++++++++++------ 4 files changed, 162 insertions(+), 100 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java index 900f15352b3ab..96c0fe770d92a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsNotifier.java @@ -46,9 +46,11 @@ public VcsNotifier(@NotNull Project project) { } @NotNull - private static Notification createNotification(@NotNull NotificationGroup notificationGroup, - @NotNull String title, @NotNull String message, @NotNull NotificationType type, - @Nullable NotificationListener listener) { + public static Notification createNotification(@NotNull NotificationGroup notificationGroup, + @NotNull String title, + @NotNull String message, + @NotNull NotificationType type, + @Nullable NotificationListener listener) { // title can be empty; message can't be neither null, nor empty if (StringUtil.isEmptyOrSpaces(message)) { message = title; @@ -59,13 +61,22 @@ private static Notification createNotification(@NotNull NotificationGroup notifi } @NotNull - protected Notification notify(@NotNull NotificationGroup notificationGroup, @NotNull String title, @NotNull String message, - @NotNull NotificationType type, @Nullable NotificationListener listener) { + public Notification notify(@NotNull NotificationGroup notificationGroup, + @NotNull String title, + @NotNull String message, + @NotNull NotificationType type, + @Nullable NotificationListener listener) { Notification notification = createNotification(notificationGroup, title, message, type, listener); notification.notify(myProject); return notification; } + @NotNull + public Notification notify(@NotNull Notification notification) { + notification.notify(myProject); + return notification; + } + @NotNull public Notification notifyError(@NotNull String title, @NotNull String message) { return notifyError(title, message, null); diff --git a/platform/vcs-tests/src/com/intellij/openapi/vcs/TestVcsNotifier.java b/platform/vcs-tests/src/com/intellij/openapi/vcs/TestVcsNotifier.java index d69395e7437a6..32a1db9a53f3c 100644 --- a/platform/vcs-tests/src/com/intellij/openapi/vcs/TestVcsNotifier.java +++ b/platform/vcs-tests/src/com/intellij/openapi/vcs/TestVcsNotifier.java @@ -25,7 +25,7 @@ public class TestVcsNotifier extends VcsNotifier { - public static final String TEST_NOTIFICATION_GROUP = "Test"; + private static final String TEST_NOTIFICATION_GROUP = "Test"; private Notification myLastNotification; @@ -45,6 +45,12 @@ public Notification notify(@NotNull NotificationGroup notificationGroup, @NotNul return myLastNotification; } + @NotNull + public Notification notify(@NotNull Notification notification) { + myLastNotification = notification; + return myLastNotification; + } + public void cleanup() { myLastNotification = null; } diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 415ddc0bd8806..e80e508cd1530 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -17,7 +17,9 @@ import com.google.common.collect.Maps; import com.intellij.notification.Notification; -import com.intellij.notification.NotificationListener; +import com.intellij.notification.NotificationAction; +import com.intellij.notification.NotificationType; +import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; @@ -36,12 +38,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.event.HyperlinkEvent; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import static com.intellij.dvcs.DvcsUtil.getShortRepositoryName; +import static com.intellij.openapi.vcs.VcsNotifier.STANDARD_NOTIFICATION; import static com.intellij.util.ObjectUtils.assertNotNull; /** @@ -52,9 +54,10 @@ class GitDeleteBranchOperation extends GitBranchOperation { private static final Logger LOG = Logger.getInstance(GitDeleteBranchOperation.class); - private static final String UNDO_LINK = "undo"; - private static final String DELETE_REMOTE_LINK = "delete_remote"; - static final String VIEW_UNMERGED_LINK = "view"; + + static final String RESTORE = "Restore"; + static final String VIEW_COMMITS = "View Commits"; + static final String DELETE_TRACKED_BRANCH = "Delete Tracked Branch"; @NotNull private final String myBranchName; @NotNull private final VcsNotifier myNotifier; @@ -120,15 +123,33 @@ else if (notFullyMergedDetector.hasHappened()) { @Override protected void notifySuccess() { - String message = String.format("Deleted branch %s", formatBranchName(myBranchName)); - message += "
Restore"; - if (!myTrackedBranches.isEmpty()) { - message += "
Delete tracked remote branch"; + boolean unmergedCommits = !myUnmergedToBranches.isEmpty(); + String message = "Deleted Branch: " + myBranchName; + if (unmergedCommits) message += "
Unmerged commits were discarded"; + Notification notification = STANDARD_NOTIFICATION.createNotification("", message, NotificationType.INFORMATION, null); + notification.addAction(new NotificationAction(RESTORE) { + @Override + public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { + restoreInBackground(); + } + }); + if (unmergedCommits) { + notification.addAction(new NotificationAction(VIEW_COMMITS) { + @Override + public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { + viewUnmergedCommitsInBackground(); + } + }); } - if (!myUnmergedToBranches.isEmpty()) { - message += "
Some commits were not merged and could be lost"; + if (!myTrackedBranches.isEmpty()) { + notification.addAction(new NotificationAction(DELETE_TRACKED_BRANCH) { + @Override + public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { + deleteTrackedBranchInBackground(); + } + }); } - myNotifier.notifySuccess("", message, new SuccessNotificationLinkListener()); + myNotifier.notify(notification); } private static void refresh(@NotNull GitRepository... repositories) { @@ -274,51 +295,46 @@ public UnmergedBranchInfo(@NotNull String tipOfDeletedUnmergedBranch, @NotNull S } } - private class SuccessNotificationLinkListener extends NotificationListener.Adapter { - - @Override - protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { - notification.hideBalloon(); - if (e.getDescription().equals(UNDO_LINK)) { - new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { - @Override - public void run(@NotNull ProgressIndicator indicator) { - rollbackBranchDeletion(); - } - }.queue(); - } - else if (e.getDescription().equals(DELETE_REMOTE_LINK)) { - new Task.Backgroundable(myProject, "Deleting Remote Branch " + myBranchName + "...") { - @Override - public void run(@NotNull ProgressIndicator indicator) { - GitBrancher brancher = ServiceManager.getService(getProject(), GitBrancher.class); - for (String remoteBranch : myTrackedBranches.keySet()) { - brancher.deleteRemoteBranch(remoteBranch, new ArrayList<>(myTrackedBranches.get(remoteBranch))); - } - } - }.queue(); + private void deleteTrackedBranchInBackground() { + new Task.Backgroundable(myProject, "Deleting Remote Branch " + myBranchName + "...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + GitBrancher brancher = ServiceManager.getService(getProject(), GitBrancher.class); + for (String remoteBranch : myTrackedBranches.keySet()) { + brancher.deleteRemoteBranch(remoteBranch, new ArrayList<>(myTrackedBranches.get(remoteBranch))); + } } - else if (e.getDescription().equals(VIEW_UNMERGED_LINK)) { - new Task.Backgroundable(myProject, "Collecting Unmerged Commits...") { - @Override - public void run(@NotNull ProgressIndicator indicator) { - boolean restore = showNotFullyMergedDialog(myUnmergedToBranches); - if (restore) { - rollback(); - } - } - }.queue(); + }.queue(); + } + + private void restoreInBackground() { + new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + rollbackBranchDeletion(); } + }.queue(); + } + + private void rollbackBranchDeletion() { + GitCompoundResult result = doRollback(); + if (result.totalSuccess()) { + myNotifier.notifySuccess("Restored " + formatBranchName(myBranchName)); + } + else { + myNotifier.notifyError("Couldn't Restore " + formatBranchName(myBranchName), result.getErrorOutputWithReposIndication()); } + } - private void rollbackBranchDeletion() { - GitCompoundResult result = doRollback(); - if (result.totalSuccess()) { - myNotifier.notifySuccess("Restored " + formatBranchName(myBranchName)); - } - else { - myNotifier.notifyError("Couldn't Restore " + formatBranchName(myBranchName), result.getErrorOutputWithReposIndication()); + private void viewUnmergedCommitsInBackground() { + new Task.Backgroundable(myProject, "Collecting Unmerged Commits...") { + @Override + public void run(@NotNull ProgressIndicator indicator) { + boolean restore = showNotFullyMergedDialog(myUnmergedToBranches); + if (restore) { + rollback(); + } } - } + }.queue(); } } diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 4e85f9ee51da0..440a33a2a6e61 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -15,6 +15,7 @@ */ package git4idea.branch +import com.intellij.notification.Notification import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.project.Project @@ -32,6 +33,8 @@ import com.intellij.util.ObjectUtils import com.intellij.util.containers.ContainerUtil import com.intellij.util.text.CharArrayUtil import git4idea.GitCommit +import git4idea.branch.GitBranchUtil.getTrackInfoForBranch +import git4idea.branch.GitDeleteBranchOperation.* import git4idea.commands.GitCommandResult import git4idea.config.GitVersion import git4idea.config.GitVersionSpecialty @@ -41,7 +44,6 @@ import git4idea.test.GitPlatformTest import git4idea.test.GitScenarios.* import java.util.* import java.util.regex.Matcher -import javax.swing.event.HyperlinkEvent class GitBranchWorkerTest : GitPlatformTest() { @@ -512,44 +514,48 @@ class GitBranchWorkerTest : GitPlatformTest() { } fun test_delete_branch_that_is_fully_merged() { + val todelete = "todelete" for (repository in myRepositories) { - git(repository, "branch todelete") + git(repository, "branch $todelete") } - deleteBranch("todelete", TestUiHandler()) + deleteBranch(todelete, TestUiHandler()) - assertNotNull("Successful notification was not shown", myVcsNotifier.lastNotification) - assertEquals("Successful notification is incorrect", - "Deleted branch " + bcode("todelete") + "
Restore", - myVcsNotifier.lastNotification.content) + `assert successful deleted branch notification`(todelete, false, RESTORE) } - fun test_delete_unmerged_branch_should_mention_this_in_notification() { + fun test_delete_unmerged_branch_should_restore_on_link_click() { prepareUnmergedBranch(myCommunity) - var dialogShown = false - val brancher = GitBranchWorker(myProject, myGit, object : TestUiHandler() { - override fun showBranchIsNotFullyMergedDialog(project: Project, - history: Map>, - baseBranches: Map, - removedBranch: String): Boolean { - dialogShown = true - return false - } - }) + myCommunity.deleteBranch("todelete") + val notification = `assert successful deleted branch notification`("todelete", true, RESTORE, VIEW_COMMITS); + val restoreAction = findAction(notification, RESTORE) + Notification.fire(notification, restoreAction) + assertBranchExists(myCommunity, "todelete") + } - brancher.deleteBranch("todelete", listOf(myCommunity)) - val notification = assertSuccessfulNotification( - """ - Deleted branch ${bcode("todelete")}
- Restore
Some commits were not merged and could be lost - """.trimIndent()) - assertFalse("'Branch is not fully merged' dialog shouldn't be shown yet", dialogShown) - val clickEvent = HyperlinkEvent(this, HyperlinkEvent.EventType.ACTIVATED, null, GitDeleteBranchOperation.VIEW_UNMERGED_LINK) - notification.listener!!.hyperlinkUpdate(notification, clickEvent) - assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown) + fun `test restore branch deletion should restore tracking`() { + prepareRemoteRepo(myCommunity) + cd(myCommunity) + val feature = "feature" + git("checkout -b $feature") + git("push -u origin $feature") + git("checkout master") + + myCommunity.deleteBranch(feature) + + val notification = `assert successful deleted branch notification`(feature, false, RESTORE, DELETE_TRACKED_BRANCH); + val restoreAction = findAction(notification, RESTORE) + Notification.fire(notification, restoreAction) + assertBranchExists(myCommunity, feature) + val trackInfo = getTrackInfoForBranch(myCommunity, myCommunity.branches.findLocalBranch(feature)!!) + assertNotNull("Track info should be preserved", trackInfo) + assertEquals("Tracked branch is incorrect", "origin/$feature", trackInfo!!.remoteBranch.nameForLocalOperations) } + private fun findAction(notification: Notification, + actionTitle: String) = notification.actions.find { it.templatePresentation.text == actionTitle }!! + fun test_ok_in_unmerged_branch_dialog_should_force_delete_branch() { prepareUnmergedBranch(myUltimate) deleteBranch("todelete", object : TestUiHandler() { @@ -600,17 +606,18 @@ class GitBranchWorkerTest : GitPlatformTest() { fun test_delete_branch_merged_to_head_but_unmerged_to_upstream_should_mention_this_in_notification() { // inspired by IDEA-83604 // for the sake of simplicity we deal with a single myCommunity repository for remote operations + val feature = "feature" prepareRemoteRepo(myCommunity) cd(myCommunity) - git("checkout -b feature") - git("push -u origin feature") + git("checkout -b $feature") + git("push -u origin $feature") // create a commit and merge it to master, but not to feature's upstream Executor.touch("feature.txt", "feature content") git("add feature.txt") git("commit -m feature_branch") git("checkout master") - git("merge feature") + git("merge $feature") // delete feature fully merged to current HEAD, but not to the upstream var dialogShown = false @@ -624,16 +631,11 @@ class GitBranchWorkerTest : GitPlatformTest() { } }) - brancher.deleteBranch("feature", listOf(myCommunity)) - val notification = assertSuccessfulNotification( - """ - Deleted branch ${bcode("feature")}
- Restore - Delete tracked remote branch
Some commits were not merged and could be lost - """.trimIndent()) + brancher.deleteBranch(feature, listOf(myCommunity)) + val notification = `assert successful deleted branch notification`(feature, true, RESTORE, VIEW_COMMITS, DELETE_TRACKED_BRANCH); + val viewAction = findAction(notification, VIEW_COMMITS) assertFalse("'Branch is not fully merged' dialog shouldn't be shown yet", dialogShown) - val clickEvent = HyperlinkEvent(this, HyperlinkEvent.EventType.ACTIVATED, null, GitDeleteBranchOperation.VIEW_UNMERGED_LINK) - notification.listener!!.hyperlinkUpdate(notification, clickEvent) + Notification.fire(notification, viewAction) assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown) } @@ -661,6 +663,19 @@ class GitBranchWorkerTest : GitPlatformTest() { assertFile(myContrib, "branch_file.txt", "branch content") } + fun `test delete branch proposes to delete its tracked branch`() { + prepareRemoteRepo(myCommunity) + cd(myCommunity) + + val todelete = "todelete" + git("branch $todelete") + git("push -u origin todelete") + + myCommunity.deleteBranch(todelete) + + `assert successful deleted branch notification`(todelete, false, RESTORE, DELETE_TRACKED_BRANCH) + } + fun test_merge_branch_that_is_up_to_date() { for (repository in myRepositories!!) { git(repository, "branch master2") @@ -843,12 +858,26 @@ class GitBranchWorkerTest : GitPlatformTest() { git("checkout master") } - internal fun assertBranchDeleted(name: String) { + private fun assertBranchDeleted(name: String) { for (repository in myRepositories) { assertBranchDeleted(repository, name) } } + private fun GitRepository.deleteBranch(branchName: String) { + GitBranchWorker(myProject, myGit, TestUiHandler()).deleteBranch(branchName, listOf(this)) + } + + private fun `assert successful deleted branch notification`(branchName: String, + unmergedWarning: Boolean = false, + vararg actions: String): Notification { + val title = """Deleted Branch: $branchName""" + val warning = if (unmergedWarning) "
Unmerged commits were discarded" else "" + val notification = assertSuccessfulNotification("$title$warning") + assertOrderedEquals("Notification actions are incorrect", notification.actions.map { it.templatePresentation.text }, *actions) + return notification + } + private open class TestUiHandler : GitBranchUiHandler { override fun getProgressIndicator(): ProgressIndicator { From 6db9f0c919c6cca5a1aaddf0ef1a7f5b05fd8137 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 11 Jul 2016 19:23:56 +0300 Subject: [PATCH 32/74] Expire git branch delete notification after restoring the deleted branch --- .../src/git4idea/branch/GitDeleteBranchOperation.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index e80e508cd1530..b21c1c41bd37e 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -130,7 +130,7 @@ protected void notifySuccess() { notification.addAction(new NotificationAction(RESTORE) { @Override public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { - restoreInBackground(); + restoreInBackground(notification); } }); if (unmergedCommits) { @@ -307,19 +307,20 @@ public void run(@NotNull ProgressIndicator indicator) { }.queue(); } - private void restoreInBackground() { + private void restoreInBackground(@NotNull Notification notification) { new Task.Backgroundable(myProject, "Restoring Branch " + myBranchName + "...") { @Override public void run(@NotNull ProgressIndicator indicator) { - rollbackBranchDeletion(); + rollbackBranchDeletion(notification); } }.queue(); } - private void rollbackBranchDeletion() { + private void rollbackBranchDeletion(@NotNull Notification notification) { GitCompoundResult result = doRollback(); if (result.totalSuccess()) { myNotifier.notifySuccess("Restored " + formatBranchName(myBranchName)); + notification.expire(); } else { myNotifier.notifyError("Couldn't Restore " + formatBranchName(myBranchName), result.getErrorOutputWithReposIndication()); From 2bdc8d319d2e4d51ea2da1943e2f78cdfa221d76 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 11 Jul 2016 20:11:06 +0300 Subject: [PATCH 33/74] Restore tracking information when branch deletion is restored There are 2 different syntaxes for setting tracked branch before Git 1.8.0 and after it with different order of arguments (the reason why --set-upstream became deprecated is the confusing order) --- .../branch/GitDeleteBranchOperation.java | 24 +++++++++++++++++++ .../git4idea/config/GitVersionSpecialty.java | 7 ++++++ .../src/git4idea/repo/GitRepository.java | 4 ++++ .../src/git4idea/repo/GitRepositoryImpl.java | 3 +-- .../git4idea/test/MockGitRepository.java | 4 ++-- 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index b21c1c41bd37e..3dea5788b3dc2 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -32,6 +32,7 @@ import com.intellij.util.containers.MultiMap; import git4idea.GitCommit; import git4idea.commands.*; +import git4idea.config.GitVersionSpecialty; import git4idea.history.GitHistoryUtils; import git4idea.repo.GitBranchTrackInfo; import git4idea.repo.GitRepository; @@ -172,11 +173,34 @@ private GitCompoundResult doRollback() { for (GitRepository repository : getSuccessfulRepositories()) { GitCommandResult res = myGit.branchCreate(repository, myBranchName, myDeletedBranchTips.get(repository)); result.append(repository, res); + + for (String trackedBranch : myTrackedBranches.keySet()) { + if (myTrackedBranches.get(trackedBranch).contains(repository)) { + GitCommandResult setTrackResult = setUpTracking(repository, myBranchName, trackedBranch); + if (!setTrackResult.success()) { + LOG.warn("Couldn't set " + myBranchName + " to track " + trackedBranch + " in " + repository.getRoot().getName() + ": " + + setTrackResult.getErrorOutputAsJoinedString()); + } + } + } + refresh(repository); } return result; } + @NotNull + private GitCommandResult setUpTracking(@NotNull GitRepository repository, @NotNull String branchName, @NotNull String trackedBranch) { + GitLineHandler handler = new GitLineHandler(myProject, repository.getRoot(), GitCommand.BRANCH); + if (GitVersionSpecialty.KNOWS_SET_UPSTREAM_TO.existsIn(repository.getVcs().getVersion())) { + handler.addParameters("--set-upstream-to", trackedBranch, branchName); + } + else { + handler.addParameters("--set-upstream", branchName, trackedBranch); + } + return myGit.runCommand(handler); + } + @NotNull private String getErrorTitle() { return String.format("Branch %s wasn't deleted", myBranchName); diff --git a/plugins/git4idea/src/git4idea/config/GitVersionSpecialty.java b/plugins/git4idea/src/git4idea/config/GitVersionSpecialty.java index 588e7fbcd717c..e77a998a5b895 100644 --- a/plugins/git4idea/src/git4idea/config/GitVersionSpecialty.java +++ b/plugins/git4idea/src/git4idea/config/GitVersionSpecialty.java @@ -147,6 +147,13 @@ public boolean existsIn(@NotNull GitVersion version) { public boolean existsIn(@NotNull GitVersion version) { return !SystemInfo.isMac || version.isLaterOrEqual(new GitVersion(1, 8, 3, 3)); } + }, + + KNOWS_SET_UPSTREAM_TO { // in Git 1.8.0 --set-upstream-to was introduced as a replacement of --set-upstream which became deprecated + @Override + public boolean existsIn(@NotNull GitVersion version) { + return version.isLaterOrEqual(new GitVersion(1, 8, 0, 0)); + } }; public abstract boolean existsIn(@NotNull GitVersion version); diff --git a/plugins/git4idea/src/git4idea/repo/GitRepository.java b/plugins/git4idea/src/git4idea/repo/GitRepository.java index 4bb18e8738220..e41b042777bf3 100644 --- a/plugins/git4idea/src/git4idea/repo/GitRepository.java +++ b/plugins/git4idea/src/git4idea/repo/GitRepository.java @@ -19,6 +19,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.messages.Topic; import git4idea.GitLocalBranch; +import git4idea.GitVcs; import git4idea.branch.GitBranchesCollection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -110,4 +111,7 @@ public interface GitRepository extends Repository { boolean isOnBranch(); + @NotNull + @Override + GitVcs getVcs(); } diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java index 5982a1e202ee6..ad3ce1122f2b2 100644 --- a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java +++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java @@ -20,7 +20,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitLocalBranch; import git4idea.GitUtil; @@ -146,7 +145,7 @@ public String getCurrentBranchName() { @NotNull @Override - public AbstractVcs getVcs() { + public GitVcs getVcs() { return myVcs; } diff --git a/plugins/git4idea/tests/git4idea/test/MockGitRepository.java b/plugins/git4idea/tests/git4idea/test/MockGitRepository.java index e5a6565125dc0..d849ceb0bf9ac 100644 --- a/plugins/git4idea/tests/git4idea/test/MockGitRepository.java +++ b/plugins/git4idea/tests/git4idea/test/MockGitRepository.java @@ -16,9 +16,9 @@ package git4idea.test; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vfs.VirtualFile; import git4idea.GitLocalBranch; +import git4idea.GitVcs; import git4idea.branch.GitBranchesCollection; import git4idea.repo.*; import org.jetbrains.annotations.NotNull; @@ -126,7 +126,7 @@ public String getCurrentBranchName() { @NotNull @Override - public AbstractVcs getVcs() { + public GitVcs getVcs() { throw new UnsupportedOperationException(); } From 81839272767febcb3af5b1e33308506cd6a71aa2 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 12 Jul 2016 10:36:05 +0300 Subject: [PATCH 34/74] git branch delete: expire notification after restoring branch from the dialog --- .../src/git4idea/branch/GitDeleteBranchOperation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 3dea5788b3dc2..939456466eeeb 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -138,7 +138,7 @@ public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification noti notification.addAction(new NotificationAction(VIEW_COMMITS) { @Override public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { - viewUnmergedCommitsInBackground(); + viewUnmergedCommitsInBackground(notification); } }); } @@ -351,13 +351,13 @@ private void rollbackBranchDeletion(@NotNull Notification notification) { } } - private void viewUnmergedCommitsInBackground() { + private void viewUnmergedCommitsInBackground(@NotNull Notification notification) { new Task.Backgroundable(myProject, "Collecting Unmerged Commits...") { @Override public void run(@NotNull ProgressIndicator indicator) { boolean restore = showNotFullyMergedDialog(myUnmergedToBranches); if (restore) { - rollback(); + rollbackBranchDeletion(notification); } } }.queue(); From 3fae506406cdab25fe109366092e280cf832bc3d Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 16 Jul 2016 00:16:34 +0300 Subject: [PATCH 35/74] git branch delete: don't propose to delete remote tracked branch if it is being tracked by some other local branch --- .../git4idea/branch/GitDeleteBranchOperation.java | 15 ++++++++++++++- .../tests/git4idea/branch/GitBranchWorkerTest.kt | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 939456466eeeb..5a3cbfa1ad12f 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -46,6 +46,7 @@ import static com.intellij.dvcs.DvcsUtil.getShortRepositoryName; import static com.intellij.openapi.vcs.VcsNotifier.STANDARD_NOTIFICATION; import static com.intellij.util.ObjectUtils.assertNotNull; +import static com.intellij.util.containers.ContainerUtil.exists; /** * Deletes a branch. @@ -142,7 +143,7 @@ public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification noti } }); } - if (!myTrackedBranches.isEmpty()) { + if (!myTrackedBranches.isEmpty() && hasOnlyTrackingBranch(myTrackedBranches, myBranchName)) { notification.addAction(new NotificationAction(DELETE_TRACKED_BRANCH) { @Override public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) { @@ -153,6 +154,18 @@ public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification noti myNotifier.notify(notification); } + private static boolean hasOnlyTrackingBranch(@NotNull MultiMap trackedBranches, @NotNull String localBranch) { + for (String remoteBranch : trackedBranches.keySet()) { + for (GitRepository repository : trackedBranches.get(remoteBranch)) { + if (exists(repository.getBranchTrackInfos(), info -> !info.getLocalBranch().getName().equals(localBranch) && + info.getRemoteBranch().getName().equals(remoteBranch))) { + return false; + } + } + } + return true; + } + private static void refresh(@NotNull GitRepository... repositories) { for (GitRepository repository : repositories) { repository.update(); diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 440a33a2a6e61..2b97aff1a49ad 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -676,6 +676,20 @@ class GitBranchWorkerTest : GitPlatformTest() { `assert successful deleted branch notification`(todelete, false, RESTORE, DELETE_TRACKED_BRANCH) } + fun `test delete branch doesn't propose to delete tracked branch, if it is also tracked by another local branch`() { + prepareRemoteRepo(myCommunity) + cd(myCommunity) + + val todelete = "todelete" + git("branch $todelete") + git("push -u origin todelete") + git("branch another origin/todelete") + + myCommunity.deleteBranch(todelete) + + `assert successful deleted branch notification`(todelete, false, RESTORE) + } + fun test_merge_branch_that_is_up_to_date() { for (repository in myRepositories!!) { git(repository, "branch master2") From 46a2db3c59a0f7c8c56b0820b533d8f1e6124184 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 17 Jul 2016 10:39:26 +0300 Subject: [PATCH 36/74] git branch delete: don't show notification on successful restore only show a notification if restore failed --- .../git4idea/src/git4idea/branch/GitDeleteBranchOperation.java | 1 - plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 5a3cbfa1ad12f..3eb3acb340e9f 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -356,7 +356,6 @@ public void run(@NotNull ProgressIndicator indicator) { private void rollbackBranchDeletion(@NotNull Notification notification) { GitCompoundResult result = doRollback(); if (result.totalSuccess()) { - myNotifier.notifySuccess("Restored " + formatBranchName(myBranchName)); notification.expire(); } else { diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 2b97aff1a49ad..922510eee8fee 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -530,8 +530,11 @@ class GitBranchWorkerTest : GitPlatformTest() { myCommunity.deleteBranch("todelete") val notification = `assert successful deleted branch notification`("todelete", true, RESTORE, VIEW_COMMITS); val restoreAction = findAction(notification, RESTORE) + + myVcsNotifier.cleanup() Notification.fire(notification, restoreAction) assertBranchExists(myCommunity, "todelete") + assertNoNotification() } fun `test restore branch deletion should restore tracking`() { From 5fabe3d305abac812673cc9b36bb21f656ca80b2 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 17 Jul 2016 10:44:22 +0300 Subject: [PATCH 37/74] git branch delete: display base branch name without refs/remotes prefix --- .../git4idea/src/git4idea/branch/GitDeleteBranchOperation.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java index 3eb3acb340e9f..bf795fe30b307 100644 --- a/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java +++ b/plugins/git4idea/src/git4idea/branch/GitDeleteBranchOperation.java @@ -100,7 +100,8 @@ else if (notFullyMergedDetector.hasHappened()) { if (baseBranch == null) { // GitBranchNotMergedToUpstreamDetector didn't happen baseBranch = myCurrentHeads.get(repository); } - myUnmergedToBranches.put(repository, new UnmergedBranchInfo(myDeletedBranchTips.get(repository), baseBranch)); + myUnmergedToBranches.put(repository, new UnmergedBranchInfo(myDeletedBranchTips.get(repository), + GitBranchUtil.stripRefsPrefix(baseBranch))); GitCommandResult forceDeleteResult = myGit.branchDelete(repository, myBranchName, true); if (forceDeleteResult.success()) { From 4aad8dd86a4e02570d4fcaf49c8504a97177ff4e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 17 Jul 2016 10:48:50 +0300 Subject: [PATCH 38/74] IDEA-105128 fix "--set-upstream-to" recommended syntax --- plugins/git4idea/src/git4idea/update/GitUpdateProcess.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java index 4be745d59c9de..54949d677c66f 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java @@ -40,6 +40,7 @@ import git4idea.branch.GitBranchUtil; import git4idea.commands.Git; import git4idea.config.GitVcsSettings; +import git4idea.config.GitVersionSpecialty; import git4idea.config.UpdateMethod; import git4idea.merge.GitConflictResolver; import git4idea.merge.GitMergeCommittingConflictResolver; @@ -317,11 +318,14 @@ private boolean checkTrackedBranchesConfigured() { if (trackInfo == null) { final String branchName = branch.getName(); LOG.info(String.format("checkTrackedBranchesConfigured: no track info for current branch %s in %s", branch, repository)); + String recommendedCommand = String.format(GitVersionSpecialty.KNOWS_SET_UPSTREAM_TO.existsIn(repository.getVcs().getVersion()) ? + "git branch --set-upstream-to origin/%1$s %1$s" : + "git branch --set-upstream %1$s origin/%1$s", branchName); notifyImportantError(myProject, "Can't update: no tracked branch", "No tracked branch configured for branch " + code(branchName) + rootStringIfNeeded(root) + "To make your branch track a remote branch call, for example,
" + - "git branch --set-upstream " + branchName + " origin/" + branchName + ""); + "" + recommendedCommand + ""); return false; } myTrackedBranches.put(root, new GitBranchPair(branch, trackInfo.getRemoteBranch())); From 0d5f60a4844f1f769e55448eef0aba236c6cc640 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 19 Jul 2016 16:17:41 +0300 Subject: [PATCH 39/74] git test: fire notification in edt --- .../git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt index 922510eee8fee..1d76b35ce7236 100644 --- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt +++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.kt @@ -27,6 +27,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vcs.Executor import com.intellij.openapi.vcs.changes.Change import com.intellij.openapi.vfs.VirtualFile +import com.intellij.testFramework.runInEdtAndWait import com.intellij.util.Function import com.intellij.util.LineSeparator import com.intellij.util.ObjectUtils @@ -532,7 +533,7 @@ class GitBranchWorkerTest : GitPlatformTest() { val restoreAction = findAction(notification, RESTORE) myVcsNotifier.cleanup() - Notification.fire(notification, restoreAction) + runInEdtAndWait { Notification.fire(notification, restoreAction) } assertBranchExists(myCommunity, "todelete") assertNoNotification() } @@ -549,7 +550,7 @@ class GitBranchWorkerTest : GitPlatformTest() { val notification = `assert successful deleted branch notification`(feature, false, RESTORE, DELETE_TRACKED_BRANCH); val restoreAction = findAction(notification, RESTORE) - Notification.fire(notification, restoreAction) + runInEdtAndWait { Notification.fire(notification, restoreAction) } assertBranchExists(myCommunity, feature) val trackInfo = getTrackInfoForBranch(myCommunity, myCommunity.branches.findLocalBranch(feature)!!) assertNotNull("Track info should be preserved", trackInfo) @@ -638,7 +639,7 @@ class GitBranchWorkerTest : GitPlatformTest() { val notification = `assert successful deleted branch notification`(feature, true, RESTORE, VIEW_COMMITS, DELETE_TRACKED_BRANCH); val viewAction = findAction(notification, VIEW_COMMITS) assertFalse("'Branch is not fully merged' dialog shouldn't be shown yet", dialogShown) - Notification.fire(notification, viewAction) + runInEdtAndWait { Notification.fire(notification, viewAction) } assertTrue("'Branch is not fully merged' dialog was not shown", dialogShown) } From c6f9d2c15b546f38911a8bec0c040301184f7208 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 19 Jul 2016 17:31:08 +0200 Subject: [PATCH 40/74] union of a GlobalSearchScope and a LocalSearchScope with no elements is the original scope (EA-82063 - AIOOBE: GlobalSearchScope.union) --- .../src/com/intellij/psi/search/GlobalSearchScope.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java index f1740da0f6d9c..5d30ba8f960cb 100644 --- a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java +++ b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,11 @@ public GlobalSearchScope union(@NotNull SearchScope scope) { @NotNull public GlobalSearchScope union(@NotNull final LocalSearchScope scope) { - return new GlobalSearchScope(scope.getScope()[0].getProject()) { + PsiElement[] localScopeElements = scope.getScope(); + if (localScopeElements.length == 0) { + return this; + } + return new GlobalSearchScope(localScopeElements[0].getProject()) { @Override public boolean contains(@NotNull VirtualFile file) { return GlobalSearchScope.this.contains(file) || scope.isInScope(file); From aa47fea8121b91bab32ec301fc16568ab441afb1 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 19 Jul 2016 17:56:36 +0200 Subject: [PATCH 41/74] [cleanup] waitUntilIndicesAreInitialized() is not needed for UnindexedFilesFinder in trunk --- .../src/com/intellij/util/indexing/FileBasedIndexImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index 0be25906c1b28..1d3a8a7bc364c 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -2003,7 +2003,6 @@ private class UnindexedFilesFinder implements CollectingContentIterator { private UnindexedFilesFinder(@Nullable ProgressIndicator indicator) { myProgressIndicator = indicator; - if (!myInitialized) waitUntilIndicesAreInitialized(); } @NotNull From eab16a4575fffca1f2fefc4aaed3d003bde6c7cb Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 19 Jul 2016 18:27:41 +0200 Subject: [PATCH 42/74] revert explicit sync after resize, to avoid freezing (IDEA-158477) --- .../intellij/util/io/PagedFileStorage.java | 62 +++++++++---------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java index cd2fe3f489f14..7da6f919d14a7 100644 --- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java +++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java @@ -27,7 +27,6 @@ import org.jetbrains.annotations.Nullable; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.RandomAccessFile; import java.lang.reflect.Field; @@ -334,43 +333,14 @@ public void resize(long newSize) throws IOException { final long started = IOStatistics.DEBUG ? System.currentTimeMillis():0; myStorageLockContext.myStorageLock.invalidateBuffer(myStorageIndex | (int)(oldSize / myPageSize)); // TODO long page - final long unmapAllFinished = IOStatistics.DEBUG ? System.currentTimeMillis():0; - mySize = -1; + resizeFile(newSize); + // it is not guaranteed that new partition will consist of null + // after resize, so we should fill it manually long delta = newSize - oldSize; - - if (delta > 0) { - // it is not guaranteed that new partition will consist of null - // after resize, so we should fill it manually - byte[] buff = new byte[MAX_FILLER_SIZE]; - Arrays.fill(buff, (byte)0); - FileOutputStream stream = new FileOutputStream(myFile, true); - - try { - while (delta > 0) { - final int filled = Math.min((int)delta, MAX_FILLER_SIZE); - stream.write(buff, 0, filled); - delta -= filled; - } - } finally { - stream.getFD().sync(); - stream.close(); - } - } - else { - RandomAccessFile raf = new RandomAccessFile(myFile, RW); - try { - raf.setLength(newSize); - raf.getFD().sync(); - } - finally { - raf.close(); - } - } - - mySize = newSize; + if (delta > 0) fillWithZeros(oldSize, delta); if (IOStatistics.DEBUG) { long finished = System.currentTimeMillis(); @@ -380,8 +350,32 @@ public void resize(long newSize) throws IOException { } } + private void resizeFile(long newSize) throws IOException { + mySize = -1; + RandomAccessFile raf = new RandomAccessFile(myFile, RW); + try { + raf.setLength(newSize); + } + finally { + raf.close(); + } + mySize = newSize; + } + private static final int MAX_FILLER_SIZE = 8192; + private void fillWithZeros(long from, long length) { + byte[] buff = new byte[MAX_FILLER_SIZE]; + Arrays.fill(buff, (byte)0); + + while (length > 0) { + final int filled = Math.min((int)length, MAX_FILLER_SIZE); + put(from, buff, 0, filled); + length -= filled; + from += filled; + } + } + public final long length() { long size = mySize; if (size == -1) { From fda66a45bd737a0d1656dc8399056ded336b3150 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 19 Jul 2016 19:18:32 +0300 Subject: [PATCH 43/74] [vcs-log] speed-up current branch highlighter by caching conditions --- .../vcs/log/ui/CurrentBranchHighlighter.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java index fa0e093fe4450..ca9d80a38d409 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java @@ -16,7 +16,10 @@ package com.intellij.vcs.log.ui; import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Conditions; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.JBColor; +import com.intellij.util.containers.ContainerUtil; import com.intellij.vcs.log.*; import com.intellij.vcs.log.data.VcsLogData; import com.intellij.vcs.log.impl.VcsLogUtil; @@ -24,12 +27,14 @@ import org.jetbrains.annotations.Nullable; import java.awt.*; +import java.util.Map; public class CurrentBranchHighlighter implements VcsLogHighlighter { private static final JBColor CURRENT_BRANCH_BG = new JBColor(new Color(228, 250, 255), new Color(63, 71, 73)); private static final String HEAD = "HEAD"; @NotNull private final VcsLogData myLogData; @NotNull private final VcsLogUi myLogUi; + @NotNull private final Map> myConditions = ContainerUtil.newHashMap(); @Nullable private String mySingleFilteredBranch; public CurrentBranchHighlighter(@NotNull VcsLogData logData, @NotNull VcsLogUi logUi) { @@ -41,14 +46,20 @@ public CurrentBranchHighlighter(@NotNull VcsLogData logData, @NotNull VcsLogUi l @Override public VcsCommitStyle getStyle(@NotNull VcsShortCommitDetails details, boolean isSelected) { if (isSelected || !myLogUi.isHighlighterEnabled(Factory.ID)) return VcsCommitStyle.DEFAULT; - VcsLogProvider provider = myLogData.getLogProvider(details.getRoot()); - String currentBranch = provider.getCurrentBranch(details.getRoot()); - if (!HEAD.equals(mySingleFilteredBranch) && currentBranch != null && !(currentBranch.equals(mySingleFilteredBranch))) { - Condition condition = - myLogData.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot()); - if (condition.value(new CommitId(details.getId(), details.getRoot()))) { - return VcsCommitStyleFactory.background(CURRENT_BRANCH_BG); + Condition condition = myConditions.get(details.getRoot()); + if (condition == null) { + VcsLogProvider provider = myLogData.getLogProvider(details.getRoot()); + String currentBranch = provider.getCurrentBranch(details.getRoot()); + if (!HEAD.equals(mySingleFilteredBranch) && currentBranch != null && !(currentBranch.equals(mySingleFilteredBranch))) { + condition = myLogData.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot()); + myConditions.put(details.getRoot(), condition); } + else { + condition = Conditions.alwaysFalse(); + } + } + if (condition != null && condition.value(new CommitId(details.getId(), details.getRoot()))) { + return VcsCommitStyleFactory.background(CURRENT_BRANCH_BG); } return VcsCommitStyle.DEFAULT; } @@ -57,6 +68,7 @@ public VcsCommitStyle getStyle(@NotNull VcsShortCommitDetails details, boolean i public void update(@NotNull VcsLogDataPack dataPack, boolean refreshHappened) { VcsLogBranchFilter branchFilter = dataPack.getFilters().getBranchFilter(); mySingleFilteredBranch = branchFilter == null ? null : VcsLogUtil.getSingleFilteredBranch(branchFilter, dataPack.getRefs()); + myConditions.clear(); } public static class Factory implements VcsLogHighlighterFactory { From ba6555a7be08f689658732029024e27633353bcf Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 19 Jul 2016 19:37:50 +0300 Subject: [PATCH 44/74] [vcs-log] do not unnecessary find branchRef by name when there is condition in cache with the same name --- .../com/intellij/vcs/log/data/ContainingBranchesGetter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java index 2c227a7235d64..e6b47f7c32c16 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/ContainingBranchesGetter.java @@ -134,11 +134,11 @@ public Condition getContainedInBranchCondition(@NotNull final String b PermanentGraph graph = dataPack.getPermanentGraph(); VcsLogRefs refs = dataPack.getRefsModel(); - VcsRef branchRef = ContainerUtil.find(refs.getBranches(), - vcsRef -> vcsRef.getRoot().equals(root) && vcsRef.getName().equals(branchName)); - if (branchRef == null) return Conditions.alwaysFalse(); ContainedInBranchCondition condition = myConditions.get(root); if (condition == null || !condition.getBranch().equals(branchName)) { + VcsRef branchRef = ContainerUtil.find(refs.getBranches(), + vcsRef -> vcsRef.getRoot().equals(root) && vcsRef.getName().equals(branchName)); + if (branchRef == null) return Conditions.alwaysFalse(); condition = new ContainedInBranchCondition(graph.getContainedInBranchCondition( Collections.singleton(myLogData.getCommitIndex(branchRef.getCommitHash(), branchRef.getRoot()))), branchName); myConditions.put(root, condition); From c8049a3fe21983ecf93b4959b6176075a7644134 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 19 Jul 2016 19:46:26 +0300 Subject: [PATCH 45/74] [vcs-log] remove usage of int in api, use hash and root to get refsToCommit; cast to implementation in UI code --- .../api/src/com/intellij/vcs/log/VcsLogRefs.java | 3 ++- .../impl/src/com/intellij/vcs/log/data/RefsModel.java | 11 +++++++---- .../com/intellij/vcs/log/ui/frame/DetailsPanel.java | 3 ++- .../intellij/vcs/log/ui/tables/GraphTableModel.java | 7 ++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogRefs.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogRefs.java index 5cbbab3826334..0834a00a530ba 100644 --- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogRefs.java +++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogRefs.java @@ -15,6 +15,7 @@ */ package com.intellij.vcs.log; +import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -31,7 +32,7 @@ public interface VcsLogRefs { Collection getBranches(); @NotNull - Collection refsToCommit(int commit); + Collection refsToCommit(@NotNull Hash hash, @NotNull VirtualFile root); @NotNull Collection getAllRefs(); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java index 8cc73c9715328..552b7bcdd9ca9 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java @@ -5,10 +5,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; -import com.intellij.vcs.log.CommitId; -import com.intellij.vcs.log.VcsLogHashMap; -import com.intellij.vcs.log.VcsLogRefs; -import com.intellij.vcs.log.VcsRef; +import com.intellij.vcs.log.*; import gnu.trove.TIntObjectHashMap; import org.jetbrains.annotations.NotNull; @@ -18,6 +15,7 @@ public class RefsModel implements VcsLogRefs { @NotNull private final Collection myBranches; @NotNull private final Map> myRefs; + @NotNull private final VcsLogHashMap myHashMap; @NotNull private final TIntObjectHashMap> myRefsToHashes; @NotNull private final TIntObjectHashMap myRootsToHeadIndices; @@ -25,6 +23,7 @@ public RefsModel(@NotNull Map> refsByRoot, @NotNull final Set heads, @NotNull final VcsLogHashMap hashMap) { myRefs = refsByRoot; + myHashMap = hashMap; Iterable allRefs = Iterables.concat(refsByRoot.values()); @@ -82,6 +81,10 @@ public Map> getAllRefsByRoot() { @NotNull @Override + public Collection refsToCommit(@NotNull Hash hash, @NotNull VirtualFile root) { + return refsToCommit(myHashMap.getCommitIndex(hash, root)); + } + public Collection refsToCommit(int index) { if (myRefsToHashes.containsKey(index)) { return myRefsToHashes.get(index); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java index 26a7f412e372c..8bd3f3d67b466 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java @@ -33,6 +33,7 @@ import com.intellij.util.ui.JBUI; import com.intellij.util.ui.StatusText; import com.intellij.vcs.log.VcsFullCommitDetails; +import com.intellij.vcs.log.data.RefsModel; import com.intellij.vcs.log.data.VcsLogData; import com.intellij.vcs.log.data.VisiblePack; import com.intellij.vcs.log.ui.VcsLogColorManager; @@ -222,7 +223,7 @@ protected void onDetailsLoaded(@NotNull List detailsList) for (int i = 0; i < mySelection.size(); i++) { CommitPanel commitPanel = getCommitPanel(i); Integer commit = myDataPack.getVisibleGraph().getRowInfo(mySelection.get(i)).getCommit(); - commitPanel.setCommit(detailsList.get(i), myDataPack.getRefs().refsToCommit(commit)); + commitPanel.setCommit(detailsList.get(i), ((RefsModel)myDataPack.getRefs()).refsToCommit(commit)); } if (!ContainerUtil.intersects(myCommitDetails, newCommitDetails)) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java index f2caff73d23c5..05ff746652315 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java @@ -7,10 +7,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.DateFormatUtil; import com.intellij.vcs.log.*; -import com.intellij.vcs.log.data.CommitIdByStringCondition; -import com.intellij.vcs.log.data.DataGetter; -import com.intellij.vcs.log.data.VcsLogData; -import com.intellij.vcs.log.data.VisiblePack; +import com.intellij.vcs.log.data.*; import com.intellij.vcs.log.impl.VcsLogUtil; import com.intellij.vcs.log.ui.VcsLogUiImpl; import com.intellij.vcs.log.ui.render.GraphCommitCell; @@ -186,7 +183,7 @@ private T getDetails(int row, @NotNull DataGet @NotNull private Collection getRefsAtRow(int row) { - return myDataPack.getRefs().refsToCommit(getIdAtRow(row)); + return ((RefsModel)myDataPack.getRefs()).refsToCommit(getIdAtRow(row)); } @NotNull From 5fe4d0489e374cdce87273f8b0c0728192a69855 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 19 Jul 2016 19:47:31 +0300 Subject: [PATCH 46/74] [vcs-log] use Iterators.concat(iterators.iterator()) --- .../vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java index 552b7bcdd9ca9..475759cef9b52 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java @@ -105,7 +105,7 @@ public Collection getAllRefs() { @Override public Iterator iterator() { List> iterators = myRefs.values().stream().map(Set::iterator).collect(Collectors.toList()); - return Iterators.concat(iterators.toArray(new Iterator[iterators.size()])); + return Iterators.concat(iterators.iterator()); } @Override From 997c4dd18559ab10cbca28047250ecd16aa1aaa6 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 19 Jul 2016 19:48:41 +0300 Subject: [PATCH 47/74] [vcs-log] use ContainerUtil.filter instead of streams --- .../vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java index 475759cef9b52..671181ce3e54c 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java @@ -66,7 +66,7 @@ private static TIntObjectHashMap> prepareRefsToIndicesMap(@Not @NotNull public Collection branchesToCommit(int index) { Collection refs = refsToCommit(index); - return refs.stream().filter(ref -> ref.getType().isBranch()).collect(Collectors.toList()); + return ContainerUtil.filter(refs, ref -> ref.getType().isBranch()); } @NotNull From ac5a08d4c084c8016ff31b0e5f3054d227bf1d53 Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Tue, 19 Jul 2016 19:51:50 +0300 Subject: [PATCH 48/74] Enable TestScope-specific color in WebStorm and PhpStorm --- .../lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java index 719b0eef93546..d01b7d8a3255b 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsModel.java @@ -57,7 +57,8 @@ public class FileColorsModel implements Cloneable { static { predefinedScopeNameToPropertyKey = new THashMap(); predefinedScopeNameToPropertyKey.put(NonProjectFilesScope.NAME, "file.colors.enable.non.project"); - if (PlatformUtils.isIntelliJ() || PlatformUtils.isRubyMine()) { + // These IDEs have TestScope registered (via PackagesScopesProvider or TestScopeProvider) + if (PlatformUtils.isIntelliJ() || PlatformUtils.isRubyMine() || PlatformUtils.isPhpStorm() || PlatformUtils.isWebStorm()) { predefinedScopeNameToPropertyKey.put(TestsScope.NAME, "file.colors.enable.tests"); } From bf47f4323d45f4344a8a9af98a2edf7e6a8777bc Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Tue, 19 Jul 2016 19:54:51 +0300 Subject: [PATCH 49/74] IDEA-156735 Bookmarks causing typing slowness (after-review iteration) --- .../com/intellij/ide/bookmarks/Bookmark.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java index 6782c8cc545e8..683b0e2557abe 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java @@ -54,7 +54,6 @@ import com.intellij.ui.JBColor; import com.intellij.ui.RetrievableIcon; import com.intellij.util.PlatformIcons; -import com.intellij.util.containers.WeakHashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -69,7 +68,7 @@ public class Bookmark implements Navigatable, Comparable { private final VirtualFile myFile; @NotNull private OpenFileDescriptor myTarget; private final Project myProject; - private WeakHashMap> myHighlighterRefs; + private Reference myHighlighterRef; private String myDescription; private char myMnemonic = 0; @@ -135,10 +134,7 @@ public RangeHighlighter createHighlighter(@NotNull MarkupModelEx markup) { else { highlighter = null; } - if (myHighlighterRefs == null) myHighlighterRefs = new WeakHashMap<>(); - if (highlighter != null) { - myHighlighterRefs.put(markup.getDocument(), new WeakReference(highlighter)); - } + myHighlighterRef = highlighter == null ? null : new WeakReference(highlighter); return highlighter; } @@ -148,7 +144,6 @@ public Document getDocument() { } public void release() { - try { int line = getLine(); if (line < 0) { return; @@ -160,18 +155,15 @@ public void release() { if (markupDocument.getLineCount() <= line) return; RangeHighlighterEx highlighter = findMyHighlighter(); if (highlighter != null) { + myHighlighterRef = null; highlighter.dispose(); } - } finally { - myHighlighterRefs = null; - } } private RangeHighlighterEx findMyHighlighter() { final Document document = getDocument(); if (document == null) return null; - Reference reference = myHighlighterRefs != null ? myHighlighterRefs.get(document) : null; - RangeHighlighterEx result = SoftReference.dereference(reference); + RangeHighlighterEx result = SoftReference.dereference(myHighlighterRef); if (result != null) { return result; } @@ -190,10 +182,7 @@ private RangeHighlighterEx findMyHighlighter() { return true; }); result = found.get(); - if (result != null) { - if (myHighlighterRefs == null) myHighlighterRefs = new WeakHashMap<>(); - myHighlighterRefs.put(document, new WeakReference(result)); - } + myHighlighterRef = result == null ? null : new WeakReference(result); return result; } From b65dcdc5de4a088fd98db5d4400aa403fbdc494f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Jul 2016 19:02:29 +0200 Subject: [PATCH 50/74] [platform] update compatibility info in the dialog (ZD-723058) --- .../impl/AbstractUpdateDialog.java | 2 -- .../openapi/updateSettings/impl/UpdateInfo.kt | 1 + .../updateSettings/impl/UpdateInfoDialog.java | 26 ++++++++++++++----- .../src/com/intellij/ui/LicensingFacade.java | 2 ++ .../src/messages/IdeBundle.properties | 4 ++- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java index a719954e09204..a0bc57dfa76cd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/AbstractUpdateDialog.java @@ -38,8 +38,6 @@ public abstract class AbstractUpdateDialog extends DialogWrapper { private final boolean myEnableLink; - protected String myLicenseInfo = null; - protected AbstractUpdateDialog(boolean enableLink) { super(true); myEnableLink = enableLink; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt index c02f38318e61c..936b5c5dd6963 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfo.kt @@ -48,6 +48,7 @@ class UpdateChannel(node: Element) { val status: ChannelStatus = ChannelStatus.fromCode(node.getAttributeValue("status")) val licensing: String = node.getAttributeValue("licensing", LICENSING_PRODUCTION) val homePageUrl: String? = node.getAttributeValue("url") + val evalDays: Int = node.getAttributeValue("evalDays")?.toInt() ?: 30 val builds: List = node.getChildren("build").map { BuildInfo(it) } override fun toString() = id diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index c99e04ce2c841..8c946311e3a01 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -37,6 +37,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.io.File; import java.io.IOException; @@ -56,6 +57,9 @@ class UpdateInfoDialog extends AbstractUpdateDialog { private final PatchInfo myPatch; private final boolean myWriteProtected; + private String myLicenseInfo = null; + private Color myLicenseInfoColor = null; + UpdateInfoDialog(@NotNull UpdateChannel channel, @NotNull BuildInfo newBuild, @Nullable PatchInfo patch, @@ -88,12 +92,20 @@ private void initLicensingInfo(@NotNull UpdateChannel channel, @NotNull BuildInf } else { Date buildDate = build.getReleaseDate(); - Date expiration = facade.getLicenseExpirationDate(); - if (buildDate != null && facade.isPerpetualForProduct(buildDate)) { - myLicenseInfo = IdeBundle.message("updates.fallback.build"); - } - else if (expiration != null && expiration.after(new Date())) { - myLicenseInfo = IdeBundle.message("updates.subscription.active.till", DateFormatUtil.formatAboutDialogDate(expiration)); + if (buildDate != null) { + if (!facade.isApplicableForProduct(buildDate)) { + myLicenseInfo = IdeBundle.message("updates.paid.upgrade", channel.getEvalDays()); + myLicenseInfoColor = JBColor.RED; + } + else if (facade.isPerpetualForProduct(buildDate)) { + myLicenseInfo = IdeBundle.message("updates.fallback.build"); + } + else { + Date expiration = facade.getLicenseExpirationDate(); + myLicenseInfo = expiration != null + ? IdeBundle.message("updates.interim.build", DateFormatUtil.formatAboutDialogDate(expiration)) + : IdeBundle.message("updates.interim.build.endless"); + } } } } @@ -255,7 +267,7 @@ public UpdateInfoPanel() { } if (myLicenseInfo != null) { - configureMessageArea(myLicenseArea, myLicenseInfo, null, null); + configureMessageArea(myLicenseArea, myLicenseInfo, myLicenseInfoColor, null); } } } diff --git a/platform/platform-impl/src/com/intellij/ui/LicensingFacade.java b/platform/platform-impl/src/com/intellij/ui/LicensingFacade.java index 4cc49749ac9be..377dd050371f8 100644 --- a/platform/platform-impl/src/com/intellij/ui/LicensingFacade.java +++ b/platform/platform-impl/src/com/intellij/ui/LicensingFacade.java @@ -38,6 +38,8 @@ public static LicensingFacade getInstance() { public abstract boolean isEvaluationLicense(); + public abstract boolean isApplicableForProduct(@NotNull Date productBuildDate); + public abstract boolean isPerpetualForProduct(@NotNull Date productBuildDate); @Nullable diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 4d0415780810d..7377f305ada4f 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -913,8 +913,10 @@ updates.error.plugin.description.failed=Failed to load plugin descriptions from: update.notifications.title=Platform and Plugin Updates update.notifications.group=Platform and Plugin Updates updates.channel.bundled.key=The new version has an expiration date and does not require a license key. +updates.paid.upgrade=You can evaluate the new version for {0} days, or buy an upgrade online. updates.fallback.build=You have perpetual fallback license for the new version. -updates.subscription.active.till=Your subscription is active until {0}. +updates.interim.build=You can use the new version until your subscription expires on {0}. +updates.interim.build.endless=You can use the new version until your subscription expires. updates.ready.message={0} is ready to update. updates.external.progress=Fetching available updates for external components updates.external.ready.message=The following component{0,choice,1# is|2#s are} ready to update: {1} From 5a6a62050ae6039b9bd096f953727d26c1196471 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 19 Jul 2016 19:15:37 +0200 Subject: [PATCH 51/74] IDEA-158776 Do not show 'Non-Project file protection' dialog when deleting/safe deleting files --- .../src/com/intellij/ide/util/DeleteHandler.java | 6 ++++-- .../refactoring/safeDelete/SafeDeleteDialog.java | 14 +++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java index ecca89f356790..99fca776c2747 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteHandler.java @@ -29,6 +29,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.command.CommandProcessor; +import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider; import com.intellij.openapi.project.DumbModePermission; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -189,13 +190,14 @@ protected boolean isDelete() { } } - CommandProcessor.getInstance().executeCommand(project, () -> { + CommandProcessor.getInstance().executeCommand(project, () -> NonProjectFileWritingAccessProvider.disableChecksDuring(() -> { Collection directories = ContainerUtil.newSmartList(); for (PsiElement e : elements) { if (e instanceof PsiFileSystemItem && e.getParent() != null) { directories.add(e.getParent()); } } + if (!CommonRefactoringUtil.checkReadOnlyStatus(project, Arrays.asList(elements), directories, false)) { return; } @@ -263,7 +265,7 @@ else if (!elementToDelete.isWritable() && } }); } - }, RefactoringBundle.message("safe.delete.command", RefactoringUIUtil.calculatePsiElementDescriptionList(elements)), null); + }), RefactoringBundle.message("safe.delete.command", RefactoringUIUtil.calculatePsiElementDescriptionList(elements)), null); } private static boolean clearReadOnlyFlag(final VirtualFile virtualFile, final Project project) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java index 2e3883f9e1c6e..c9b4f8710d7a4 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java @@ -19,6 +19,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.util.DeleteUtil; import com.intellij.openapi.extensions.Extensions; +import com.intellij.openapi.fileEditor.impl.NonProjectFileWritingAccessProvider; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.DumbModePermission; import com.intellij.openapi.project.DumbService; @@ -201,11 +202,14 @@ protected void doOKAction() { } DumbService.allowStartingDumbModeInside(DumbModePermission.MAY_START_BACKGROUND, () -> { - if (myCallback != null && isSafeDelete()) { - myCallback.run(SafeDeleteDialog.this); - } else { - SafeDeleteDialog.super.doOKAction(); - } + NonProjectFileWritingAccessProvider.disableChecksDuring(() -> { + if (myCallback != null && isSafeDelete()) { + myCallback.run(SafeDeleteDialog.this); + } + else { + SafeDeleteDialog.super.doOKAction(); + } + }); }); final RefactoringSettings refactoringSettings = RefactoringSettings.getInstance(); From de78e4f305c96d2134c01b1da1859ec2dc9589ee Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 19 Jul 2016 19:25:56 +0200 Subject: [PATCH 52/74] default XLocalAttachDebuggerProvider#getAttachGroup --- .../xdebugger/attach/XLocalAttachDebuggerProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java index 6989c93290398..a3bf2bb0c29bb 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/attach/XLocalAttachDebuggerProvider.java @@ -32,7 +32,9 @@ public interface XLocalAttachDebuggerProvider { * */ @NotNull - XLocalAttachGroup getAttachGroup(); + default XLocalAttachGroup getAttachGroup() { + return XLocalAttachGroup.DEFAULT; + } /** * Attach to Local Process action invokes {@link #getAvailableDebuggers} method for every running process. From 33ebe42ad765ea77d9068f340bcc653bb492cb7f Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 19 Jul 2016 20:12:58 +0300 Subject: [PATCH 53/74] move to subclass to prevent deadlock --- .../daemon/impl/analysis/XmlHighlightVisitor.java | 7 ++----- .../daemon/impl/analysis/XmlUnusedNamespaceInspection.java | 4 ++-- .../src/com/intellij/xml/DefaultXmlExtension.java | 1 + xml/xml-psi-impl/src/com/intellij/xml/XmlExtension.java | 4 +--- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java index ea7dd208fb28b..484b279e8be5c 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitor.java @@ -48,10 +48,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; -import com.intellij.xml.XmlAttributeDescriptor; -import com.intellij.xml.XmlElementDescriptor; -import com.intellij.xml.XmlExtension; -import com.intellij.xml.XmlUndefinedElementFixProvider; +import com.intellij.xml.*; import com.intellij.xml.impl.schema.AnyXmlElementDescriptor; import com.intellij.xml.util.AnchorReference; import com.intellij.xml.util.HtmlUtil; @@ -519,7 +516,7 @@ private void checkDuplicateAttribute(XmlTag tag, final XmlAttribute attribute) { final PsiFile containingFile = tag.getContainingFile(); final XmlExtension extension = containingFile instanceof XmlFile ? XmlExtension.getExtension(containingFile) : - XmlExtension.DEFAULT_EXTENSION; + DefaultXmlExtension.DEFAULT_EXTENSION; for (XmlAttribute tagAttribute : attributes) { ProgressManager.checkCanceled(); if (attribute != tagAttribute && Comparing.strEqual(attribute.getName(), tagAttribute.getName())) { diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java index b98f0252bc34b..c0b676dc89703 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlUnusedNamespaceInspection.java @@ -33,8 +33,8 @@ import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.ArrayUtil; +import com.intellij.xml.DefaultXmlExtension; import com.intellij.xml.XmlBundle; -import com.intellij.xml.XmlExtension; import com.intellij.xml.util.XmlRefCountHolder; import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.Nls; @@ -295,7 +295,7 @@ public static void reformatStartTag(Project project, SmartPsiElementPointer EP_NAME = new ExtensionPointName("com.intellij.xml.xmlExtension"); - public static final XmlExtension DEFAULT_EXTENSION = new DefaultXmlExtension(); - public static XmlExtension getExtension(@NotNull final PsiFile file) { return CachedValuesManager.getCachedValue(file, () -> CachedValueProvider.Result.create(calcExtension(file), PsiModificationTracker.MODIFICATION_COUNT)); } @@ -56,7 +54,7 @@ private static XmlExtension calcExtension(PsiFile file) { return extension; } } - return DEFAULT_EXTENSION; + return DefaultXmlExtension.DEFAULT_EXTENSION; } @SuppressWarnings("ConstantConditions") From 23ecee19c13ff396d94d5792080b9b79f3f98145 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 19 Jul 2016 19:57:19 +0200 Subject: [PATCH 54/74] sort keywords for stable order --- .../custom/impl/CustomFileTypeEditor.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java index ca0d41c73428c..c554aae210f70 100644 --- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java @@ -24,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; import com.intellij.ui.components.JBList; +import com.intellij.util.ArrayUtil; import com.intellij.util.ui.FormBuilder; import com.intellij.util.ui.GridBag; import com.intellij.util.ui.UIUtil; @@ -33,6 +34,8 @@ import javax.swing.event.DocumentEvent; import java.awt.*; import java.awt.event.MouseEvent; +import java.util.Arrays; +import java.util.Set; /** * @author Yura Cangea, dsl @@ -92,21 +95,27 @@ public void resetEditorFrom(AbstractFileType fileType) { mySupportParens.setSelected(table.isHasParens()); mySupportEscapes.setSelected(table.isHasStringEscapes()); - for (String s : table.getKeywords1()) { + for (String s : sorted(table.getKeywords1())) { myKeywordModels[0].addElement(s); } - for (String s : table.getKeywords2()) { + for (String s : sorted(table.getKeywords2())) { myKeywordModels[1].addElement(s); } - for (String s : table.getKeywords3()) { + for (String s : sorted(table.getKeywords3())) { myKeywordModels[2].addElement(s); } - for (String s : table.getKeywords4()) { + for (String s : sorted(table.getKeywords4())) { myKeywordModels[3].addElement(s); } } } + private static String[] sorted(Set keywords) { + String[] strings = ArrayUtil.toStringArray(keywords); + Arrays.sort(strings); + return strings; + } + @Override public void applyEditorTo(AbstractFileType type) throws ConfigurationException { if (myFileTypeName.getText().trim().length() == 0) { From eecc29427a4275e9d684e95517ea1e0bb3477284 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Tue, 19 Jul 2016 19:51:21 +0300 Subject: [PATCH 55/74] add update of one task on stepic --- .../resources/META-INF/plugin.xml | 1 + .../edu/coursecreator/actions/CCPushTask.java | 81 +++++++++++++++++++ .../edu/learning/StudySerializationUtils.java | 4 +- .../edu/learning/checker/StudyCheckTask.java | 1 - .../learning/stepic/EduStepicConnector.java | 44 +++++++++- 5 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushTask.java diff --git a/python/educational-core/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml index 94c1704c04294..6fcf9ff9d11f6 100644 --- a/python/educational-core/course-creator/resources/META-INF/plugin.xml +++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml @@ -63,6 +63,7 @@ + diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushTask.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushTask.java new file mode 100644 index 0000000000000..d9649dafe74bd --- /dev/null +++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushTask.java @@ -0,0 +1,81 @@ +package com.jetbrains.edu.coursecreator.actions; + +import com.intellij.ide.IdeView; +import com.intellij.ide.util.DirectoryChooserUtil; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; +import com.intellij.openapi.actionSystem.LangDataKeys; +import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.Task; +import com.intellij.openapi.project.DumbAwareAction; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiDirectory; +import com.jetbrains.edu.learning.StudyTaskManager; +import com.jetbrains.edu.learning.courseFormat.Course; +import com.jetbrains.edu.learning.courseFormat.Lesson; +import com.jetbrains.edu.learning.stepic.EduStepicConnector; +import org.jetbrains.annotations.NotNull; + +public class CCPushTask extends DumbAwareAction { + public CCPushTask() { + super("Update Task on Stepic", "Update Task on Stepic", null); + } + + @Override + public void update(@NotNull AnActionEvent e) { + e.getPresentation().setEnabledAndVisible(false); + final IdeView view = e.getData(LangDataKeys.IDE_VIEW); + final Project project = e.getData(CommonDataKeys.PROJECT); + if (view == null || project == null) { + return; + } + final Course course = StudyTaskManager.getInstance(project).getCourse(); + if (course == null) { + return; + } + PsiDirectory taskDir = DirectoryChooserUtil.getOrChooseDirectory(view); + if (taskDir == null || !taskDir.getName().contains("task")) { + return; + } + final PsiDirectory lessonDir = taskDir.getParentDirectory(); + if (lessonDir == null) return; + final Lesson lesson = course.getLesson(lessonDir.getName()); + if (lesson != null && lesson.getId() > 0) { + e.getPresentation().setEnabledAndVisible(true); + } + } + + @Override + public void actionPerformed(@NotNull AnActionEvent e) { + final IdeView view = e.getData(LangDataKeys.IDE_VIEW); + final Project project = e.getData(CommonDataKeys.PROJECT); + if (view == null || project == null) { + return; + } + final Course course = StudyTaskManager.getInstance(project).getCourse(); + if (course == null) { + return; + } + PsiDirectory taskDir = DirectoryChooserUtil.getOrChooseDirectory(view); + if (taskDir == null || !taskDir.getName().contains("task")) { + return; + } + final PsiDirectory lessonDir = taskDir.getParentDirectory(); + if (lessonDir == null) return; + final Lesson lesson = course.getLesson(lessonDir.getName()); + if (lesson == null) return; + + final com.jetbrains.edu.learning.courseFormat.Task task = lesson.getTask(taskDir.getName()); + if (task == null) return; + + ProgressManager.getInstance().run(new Task.Modal(project, "Uploading Task", true) { + @Override + public void run(@NotNull ProgressIndicator indicator) { + indicator.setText("Uploading task to http://stepic.org"); + EduStepicConnector.updateTask(project, task); + } + }); + } + +} \ No newline at end of file diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java index 436ef8f3ebaad..6926cb3796546 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudySerializationUtils.java @@ -423,10 +423,12 @@ public JsonElement serialize(AnswerPlaceholder src, Type typeOfSrc, JsonSerializ final int length = src.getLength(); final int start = src.getOffset(); final String possibleAnswer = src.getPossibleAnswer(); + int line = -1; final Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); final JsonObject answerPlaceholder = new JsonObject(); - answerPlaceholder.addProperty(OFFSET, start); + answerPlaceholder.addProperty(LINE, line); + answerPlaceholder.addProperty(START, start); answerPlaceholder.addProperty(LENGTH, length); answerPlaceholder.addProperty(POSSIBLE_ANSWER, possibleAnswer); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java index ddfea35c6925c..ced92c91afb8c 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java @@ -240,7 +240,6 @@ private void runAfterTaskCheckedActions() { protected void postAttemptToStepic(@NotNull StudyTestsOutputParser.TestsOutput testsOutput) { final StudyTaskManager studySettings = StudyTaskManager.getInstance(myProject); final StepicUser user = studySettings.getUser(); - if (user == null) return; final String login = user.getEmail(); final String password = StringUtil.isEmptyOrSpaces(login) ? "" : user.getPassword(); EduStepicConnector.postAttempt(myTask, testsOutput.isSuccess(), login, password); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java index 2698f74871776..931e7ca5bd400 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java @@ -3,6 +3,7 @@ import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; @@ -631,6 +632,41 @@ private static int postModule(int courseId, int position, @NotNull final String return -1; } + public static int updateTask(@NotNull final Project project, @NotNull final Task task) { + final Lesson lesson = task.getLesson(); + final int lessonId = lesson.getId(); + + final HttpPut request = new HttpPut(EduStepicNames.STEPIC_API_URL + "/step-sources/" + String.valueOf(task.getStepicId())); + setHeaders(request, "application/json"); + if (ourClient == null) { + if (!login(project)) { + LOG.error("Failed to update task"); + return 0; + } + } + + final Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation(). + registerTypeAdapter(AnswerPlaceholder.class, new StudySerializationUtils.Json.StepicAnswerPlaceholderAdapter()).create(); + ApplicationManager.getApplication().invokeLater(() -> { + final String requestBody = gson.toJson(new StepicWrappers.StepSourceWrapper(project, task, lessonId)); + request.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON)); + + try { + final CloseableHttpResponse response = ourClient.execute(request); + final StatusLine line = response.getStatusLine(); + if (line.getStatusCode() != HttpStatus.SC_OK) { + final HttpEntity responseEntity = response.getEntity(); + final String responseString = responseEntity != null ? EntityUtils.toString(responseEntity) : ""; + LOG.error("Failed to push " + responseString); + } + } + catch (IOException e) { + LOG.error(e.getMessage()); + } + }); + return -1; + } + public static int updateLesson(@NotNull final Project project, @NotNull final Lesson lesson, ProgressIndicator indicator) { final HttpPut request = new HttpPut(EduStepicNames.STEPIC_API_URL + EduStepicNames.LESSONS + String.valueOf(lesson.getId())); if (ourClient == null) { @@ -735,11 +771,15 @@ public static void postTask(final Project project, @NotNull final Task task, fin try { final CloseableHttpResponse response = ourClient.execute(request); final StatusLine line = response.getStatusLine(); + final HttpEntity responseEntity = response.getEntity(); + final String responseString = responseEntity != null ? EntityUtils.toString(responseEntity) : ""; if (line.getStatusCode() != HttpStatus.SC_CREATED) { - final HttpEntity responseEntity = response.getEntity(); - final String responseString = responseEntity != null ? EntityUtils.toString(responseEntity) : ""; LOG.error("Failed to push " + responseString); } + + final JsonObject postedTask = new Gson().fromJson(responseString, JsonObject.class); + final JsonObject stepSource = postedTask.getAsJsonArray("step-sources").get(0).getAsJsonObject(); + task.setStepicId(stepSource.getAsJsonPrimitive("id").getAsInt()); } catch (IOException e) { LOG.error(e.getMessage()); From 206e075349ecbb0c546a179b9c2bdcbe8262fbd3 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 19 Jul 2016 22:27:15 +0300 Subject: [PATCH 56/74] IDEA-145540 Issues with tool window in "windowed mode" --- .../wm/impl/commands/RequestFocusInToolWindowCmd.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java index a274e91f9fd30..acc83f362be01 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java @@ -28,11 +28,14 @@ import com.intellij.openapi.wm.impl.WindowManagerImpl; import com.intellij.openapi.wm.impl.WindowWatcher; import com.intellij.util.Alarm; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; +import static com.intellij.openapi.wm.ToolWindowType.WINDOWED; + /** * Requests focus for the specified tool window. * @@ -153,6 +156,13 @@ public void run() { return; } if (c.isShowing()) { + if (WINDOWED == myToolWindow.getType()) { + Window window = UIUtil.getWindow(c); + if (window instanceof Frame) { + Frame frame = (Frame)window; + frame.setState(Frame.NORMAL); + } + } final Component owner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getPermanentFocusOwner(); if (owner != null && owner == c) { myManager.getFocusManager().requestFocus(new FocusCommand() { From 36a95cac1044b14f38114f0bafa378cf22107a89 Mon Sep 17 00:00:00 2001 From: Valentin Fondaratov Date: Tue, 19 Jul 2016 20:55:54 +0300 Subject: [PATCH 57/74] Respect possible whitespace line with content --- .../yaml/psi/impl/YAMLBlockScalarImpl.java | 9 ++++----- .../yaml/psi/YAMLScalarContentTest.java | 8 ++++++++ .../org/jetbrains/yaml/psi/data/foldedStyle5.txt | 5 +++++ .../org/jetbrains/yaml/psi/data/foldedStyle5.yml | 16 ++++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.txt create mode 100644 plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.yml diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.java index 57ec25d7116d3..f550c10ea3783 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLBlockScalarImpl.java @@ -3,6 +3,7 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.tree.IElementType; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLTokenTypes; import org.jetbrains.yaml.YAMLUtil; @@ -46,10 +47,6 @@ public List getContentRanges() { assert thisLineStart != -1; result.add(TextRange.create(thisLineStart, child.getTextRange().getEndOffset()).shiftRight(-myStart)); thisLineStart = -1; - - if (node.findChildByType(getContentType(), child.getTreeNext()) == null) { - break; - } } else if (child.getElementType() == YAMLTokenTypes.INDENT) { thisLineStart = child.getStartOffset() + Math.min(indent, child.getTextLength()); @@ -62,7 +59,9 @@ else if (child.getElementType() == YAMLTokenTypes.INDENT) { } } - return result; + final int lastNonEmpty = ContainerUtil.lastIndexOf(result, range -> range.getLength() != 0); + + return lastNonEmpty == -1 ? result : result.subList(0, lastNonEmpty + 1); } protected int locateIndent() { diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java index 14d8054ab3080..d5d529003d704 100644 --- a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/YAMLScalarContentTest.java @@ -57,6 +57,14 @@ public void testFoldedStyle3() { public void testFoldedStyle4() { doTest(); } + + public void testFoldedStyle5() { + doTest(); + } + + public void testFoldedStyle6() { + doTest(); + } public void testSingleQuote1() { doTest(); diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.txt b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.txt new file mode 100644 index 0000000000000..42dd5ade042f4 --- /dev/null +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.txt @@ -0,0 +1,5 @@ +foo = bar + + + + diff --git a/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.yml b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.yml new file mode 100644 index 0000000000000..b77b62ad36746 --- /dev/null +++ b/plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle5.yml @@ -0,0 +1,16 @@ +> + foo = bar + + + + + + + + + + + + + + From 95afd568c8ce0a143bc26bd029514148f823d3ed Mon Sep 17 00:00:00 2001 From: Valentin Fondaratov Date: Tue, 19 Jul 2016 21:54:55 +0300 Subject: [PATCH 58/74] Refactoring: replace strategy API a little --- .../yaml/psi/impl/YAMLPlainTextImpl.java | 8 ++++++-- .../yaml/psi/impl/YAMLQuotedTextImpl.java | 7 ++++--- .../yaml/psi/impl/YAMLScalarImpl.java | 16 +++++----------- .../yaml/psi/impl/YAMLScalarListImpl.java | 2 +- .../yaml/psi/impl/YAMLScalarTextImpl.java | 19 ++++++++++++++----- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLPlainTextImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLPlainTextImpl.java index 8bb943348e170..a2fa88c564fbf 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLPlainTextImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLPlainTextImpl.java @@ -44,14 +44,18 @@ else if (child.getElementType() == YAMLTokenTypes.EOL) { @NotNull @Override - protected String getRangesJoiner(@NotNull CharSequence leftString, @NotNull CharSequence rightString) { - if (leftString.equals("\n") || rightString.equals("\n")) { + protected String getRangesJoiner(@NotNull CharSequence text, @NotNull List contentRanges, int indexBefore) { + if (isNewline(text, contentRanges.get(indexBefore)) || isNewline(text, contentRanges.get(indexBefore + 1))) { return ""; } else { return " "; } } + + private static boolean isNewline(@NotNull CharSequence text, @NotNull TextRange range) { + return range.getLength() == 1 && text.charAt(range.getStartOffset()) == '\n'; + } @Override protected List> getEncodeReplacements(@NotNull CharSequence input) throws IllegalArgumentException { diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLQuotedTextImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLQuotedTextImpl.java index f055bfbe070aa..2d2db1ec9909a 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLQuotedTextImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLQuotedTextImpl.java @@ -65,11 +65,12 @@ public List getContentRanges() { @NotNull @Override - protected String getRangesJoiner(@NotNull CharSequence leftString, @NotNull CharSequence rightString) { - if (leftString.length() == 0 || !isSingleQuote() && leftString.charAt(leftString.length() - 1) == '\\') { + protected String getRangesJoiner(@NotNull CharSequence text, @NotNull List contentRanges, int indexBefore) { + final TextRange leftRange = contentRanges.get(indexBefore); + if (leftRange.isEmpty() || !isSingleQuote() && text.charAt(leftRange.getEndOffset() - 1) == '\\') { return "\n"; } - else if (rightString.length() == 0) { + else if (contentRanges.get(indexBefore + 1).isEmpty()) { return ""; } else { diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarImpl.java index 6e61089df4b62..54134b8ad2008 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarImpl.java @@ -27,7 +27,7 @@ public YAMLScalarImpl(@NotNull ASTNode node) { public abstract List getContentRanges(); @NotNull - protected abstract String getRangesJoiner(@NotNull CharSequence leftString, @NotNull CharSequence rightString); + protected abstract String getRangesJoiner(@NotNull CharSequence text, @NotNull List contentRanges, int indexBefore); protected List> getDecodeReplacements(@NotNull CharSequence input) { return Collections.emptyList(); @@ -44,18 +44,15 @@ public String getTextValue() { final List contentRanges = getContentRanges(); final StringBuilder builder = new StringBuilder(); - CharSequence nextString = null; for (int i = 0; i < contentRanges.size(); i++) { final TextRange range = contentRanges.get(i); - final CharSequence curString = i == 0 ? range.subSequence(text) : nextString; - assert curString != null; + final CharSequence curString = range.subSequence(text); builder.append(curString); if (i + 1 != contentRanges.size()) { - nextString = contentRanges.get(i + 1).subSequence(text); - builder.append(getRangesJoiner(curString, nextString)); + builder.append(getRangesJoiner(text, contentRanges, i)); } } return processReplacements(builder, getDecodeReplacements(builder)); @@ -125,17 +122,14 @@ public int getOffsetInHost(int offsetInDecoded, @NotNull TextRange rangeInsideHo final List contentRanges = myHost.getContentRanges(); int currentOffsetInDecoded = 0; - String nextString = null; for (int i = 0; i < contentRanges.size(); i++) { final TextRange range = contentRanges.get(i); - String curString = i == 0 ? range.subSequence(text).toString() : nextString; - assert curString != null; + String curString = range.subSequence(text).toString(); if (i + 1 != contentRanges.size()) { - nextString = contentRanges.get(i + 1).subSequence(text).toString(); - final String joiner = myHost.getRangesJoiner(curString, nextString); + final String joiner = myHost.getRangesJoiner(text, contentRanges, i); curString += joiner; } diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarListImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarListImpl.java index afd51978c52b4..9354e692dc7cd 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarListImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarListImpl.java @@ -36,7 +36,7 @@ public String getTextValue() { @NotNull @Override - protected String getRangesJoiner(@NotNull CharSequence leftString, @NotNull CharSequence rightString) { + protected String getRangesJoiner(@NotNull CharSequence text, @NotNull List contentRanges, int indexBefore) { return "\n"; } diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java index 526bc224b639f..0400c893e977c 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java @@ -30,19 +30,28 @@ protected IElementType getContentType() { @NotNull @Override - protected String getRangesJoiner(@NotNull CharSequence leftString, @NotNull CharSequence rightString) { - if (StringUtil.isEmptyOrSpaces(leftString)) { + protected String getRangesJoiner(@NotNull CharSequence text, @NotNull List contentRanges, int indexBefore) { + final TextRange leftRange = contentRanges.get(indexBefore); + final TextRange rightRange = contentRanges.get(indexBefore + 1); + if (leftRange.isEmpty()) { return "\n"; } - if (StringUtil.startsWithChar(leftString, ' ') || StringUtil.startsWithChar(leftString, '\t') - || StringUtil.startsWithChar(rightString, ' ') || StringUtil.startsWithChar(rightString, '\t')) { + if (startsWithWhitespace(text, leftRange) || startsWithWhitespace(text, rightRange)) { return "\n"; } - if (StringUtil.isEmptyOrSpaces(rightString)) { + if (rightRange.isEmpty()) { return ""; } return " "; } + + private static boolean startsWithWhitespace(@NotNull CharSequence text, @NotNull TextRange range) { + if (range.isEmpty()) { + return false; + } + final char c = text.charAt(range.getStartOffset()); + return c == ' ' || c == '\t'; + } @Override protected List> getEncodeReplacements(@NotNull CharSequence input) throws IllegalArgumentException { From f5c643884b9543a564c793041469366722b021bd Mon Sep 17 00:00:00 2001 From: Valentin Fondaratov Date: Tue, 19 Jul 2016 22:44:27 +0300 Subject: [PATCH 59/74] Fix text value generation for folded scalars This fixes the problem with newlines and over-indented lines spanned across several-EOLs sequences. See test for the example. --- .../yaml/psi/impl/YAMLScalarTextImpl.java | 13 ++++++++++++- .../org/jetbrains/yaml/psi/data/foldedStyle6.txt | 13 +++++++++++++ .../org/jetbrains/yaml/psi/data/foldedStyle6.yml | 14 ++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle6.txt create mode 100644 plugins/yaml/testSrc/org/jetbrains/yaml/psi/data/foldedStyle6.yml diff --git a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java index 0400c893e977c..82901157ec078 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java +++ b/plugins/yaml/src/org/jetbrains/yaml/psi/impl/YAMLScalarTextImpl.java @@ -40,7 +40,18 @@ protected String getRangesJoiner(@NotNull CharSequence text, @NotNull List + a + b + a + + b + + a + + + b + + + a From 1d3733a2ce88707b9e1dd3888f75134960615137 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Tue, 19 Jul 2016 23:43:09 +0200 Subject: [PATCH 60/74] memory optimization --- .../intellij/util/containers/CharTrie.java | 117 ++++++++++++------ 1 file changed, 76 insertions(+), 41 deletions(-) diff --git a/platform/util/src/com/intellij/util/containers/CharTrie.java b/platform/util/src/com/intellij/util/containers/CharTrie.java index 6023eea89f706..c7b6d8aa2d58e 100644 --- a/platform/util/src/com/intellij/util/containers/CharTrie.java +++ b/platform/util/src/com/intellij/util/containers/CharTrie.java @@ -15,36 +15,53 @@ */ package com.intellij.util.containers; +import com.intellij.util.ArrayFactory; +import com.intellij.util.ArrayUtil; import com.intellij.util.text.StringFactory; - -import java.util.ArrayList; +import org.jetbrains.annotations.NotNull; public class CharTrie { - private ArrayList myAllNodes; - - private static class Node { - private final char myChar; - private final int myParent; - private IntArrayList myChildren; - - Node(int parent, char c) { - myChar = c; - myParent = parent; - } - } + private int myAllNodesSize; + private char[] myAllNodesChars; + private char[] myAllNodesParents; // unsigned short + private char[][] myAllNodesChildren; // unsigned short public CharTrie() { init(); } private void init() { - myAllNodes = new ArrayList(); - final Node root = new Node(-1, (char)0); - myAllNodes.add(root); + myAllNodesChars = null; + myAllNodesParents = null; + myAllNodesChildren = null; + myAllNodesSize = 0; + addNode(-1, (char)0); + } + + private void addNode(int parentIndex, char ch) { + if (myAllNodesSize == 0) { + int initialCapacity = 10; + myAllNodesChars = new char[initialCapacity]; + myAllNodesParents = new char[initialCapacity]; + myAllNodesChildren = new char[initialCapacity][]; + } else if (myAllNodesSize >= myAllNodesChars.length) { + int increment = Math.max(myAllNodesSize >> 2, 10); + + int newSize = myAllNodesSize + increment; + myAllNodesChars = ArrayUtil.realloc(myAllNodesChars, newSize); + myAllNodesParents = ArrayUtil.realloc(myAllNodesParents, newSize); + myAllNodesChildren = ArrayUtil.realloc(myAllNodesChildren, newSize, FACTORY); + } + + myAllNodesChars[myAllNodesSize] = ch; + myAllNodesParents[myAllNodesSize] = (char)parentIndex; + myAllNodesChildren[myAllNodesSize] = null; + ++myAllNodesSize; + assert myAllNodesSize < Character.MAX_VALUE; } public int size() { - return myAllNodes.size(); + return myAllNodesSize; } /** @@ -98,18 +115,16 @@ public char[] getChars(int hashCode) { int length = 0; int run = hashCode; while (run > 0) { - final CharTrie.Node node = myAllNodes.get(run); length++; - run = node.myParent; + run = myAllNodesParents[run]; } char[] result = new char[length]; run = hashCode; for (int i = 0; i < length; i++) { assert run > 0; - final CharTrie.Node node = myAllNodes.get(run); - result[length - i - 1] = node.myChar; - run = node.myParent; + result[length - i - 1] = myAllNodesChars[run]; + run = myAllNodesParents[run]; } return result; @@ -131,18 +146,16 @@ public char[] getReversedChars(final int hashCode) { int length = 0; int run = hashCode; while (run > 0) { - final CharTrie.Node node = myAllNodes.get(run); length++; - run = node.myParent; + run = myAllNodesParents[run]; } char[] result = new char[length]; run = hashCode; for (int i = 0; i < length; i++) { assert run > 0; - final CharTrie.Node node = myAllNodes.get(run); - result[i] = node.myChar; - run = node.myParent; + result[i] = myAllNodesChars[run]; + run = myAllNodesParents[run]; } return result; @@ -151,23 +164,26 @@ public char[] getReversedChars(final int hashCode) { public int findSubNode(int parentIndex, char c) { return getSubNode(parentIndex, c, false); } - + + private static final int LENGTH_SLOT_LENGTH = 1; + private int getSubNode(int parentIndex, char c, boolean createIfNotExists) { - CharTrie.Node parentNode = myAllNodes.get(parentIndex); - if (parentNode.myChildren == null) { + if (myAllNodesChildren[parentIndex] == null) { if (!createIfNotExists) { return 0; } - parentNode.myChildren = new IntArrayList(1); + char[] chars = new char[1 + LENGTH_SLOT_LENGTH]; + myAllNodesChildren[parentIndex] = chars; } - IntArrayList children = parentNode.myChildren; + + char[] children = myAllNodesChildren[parentIndex]; + char childrenCount = children[children.length - LENGTH_SLOT_LENGTH]; int left = 0; - int right = children.size() - 1; + int right = childrenCount - 1; while (left <= right) { int middle = (left + right) >> 1; - int index = children.get(middle); - CharTrie.Node node = myAllNodes.get(index); - int comp = node.myChar - c; + int index = children[middle]; + int comp = myAllNodesChars[index] - c; if (comp == 0) { return index; } @@ -181,14 +197,33 @@ private int getSubNode(int parentIndex, char c, boolean createIfNotExists) { if (!createIfNotExists) { return 0; } - - int index = myAllNodes.size(); - children.add(left, index); - myAllNodes.add(new CharTrie.Node(parentIndex, c)); + + if (childrenCount == children.length - LENGTH_SLOT_LENGTH) { + children = myAllNodesChildren[parentIndex] = ArrayUtil.realloc(children, (children.length * 3 / 2 + 1) + LENGTH_SLOT_LENGTH); + } + + if (left != childrenCount) { + System.arraycopy(children, left, children, left + 1, childrenCount - left); + } + + int index = myAllNodesSize; + children[left] = (char)index; + assert childrenCount + 1 < Character.MAX_VALUE; + children[children.length - LENGTH_SLOT_LENGTH] = (char)(childrenCount + 1); + + addNode(parentIndex, c); return index; } public void clear() { init(); } + + private static final ArrayFactory FACTORY = new ArrayFactory() { + @NotNull + @Override + public char[][] create(int count) { + return new char[count][]; + } + }; } From a088e310dca3d32d3a475f1614295473aae68921 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 20 Jul 2016 01:33:29 +0300 Subject: [PATCH 61/74] [patch]: IDEA-158750 "Apply Patch" adds spurious newline at the end of file, tests added * existence of new line should be inherited by result from base content (before) if no hunks override it; * if some hunk overrides last line - it should be inherited from this hunk (after content); --- .../impl/patch/apply/GenericPatchApplier.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java index cd1ec959c12bb..9db55395370b2 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java @@ -43,6 +43,7 @@ public class GenericPatchApplier { private final TreeMap myTransformations; private final List myLines; private final List myHunks; + private final boolean myBaseFileEndsWithNewLine; private boolean myHadAlreadyAppliedMet; private final ArrayList myNotBound; @@ -61,6 +62,7 @@ public GenericPatchApplier(final CharSequence text, List hunks) { debug("GenericPatchApplier created, hunks: " + hunks.size()); myLines = new ArrayList(); Collections.addAll(myLines, LineTokenizer.tokenize(text, false)); + myBaseFileEndsWithNewLine = StringUtil.endsWithLineBreak(text); myHunks = hunks; final Comparator textRangeComparator = (o1, o2) -> new Integer(o1.getStartOffset()).compareTo(new Integer(o2.getStartOffset())); @@ -1041,16 +1043,25 @@ public String getAfter() { for (SplitHunk hunk : myNotBound) { linesToSb(sb, hunk.getAfterAll()); } - iterateTransformations(range -> linesToSb(sb, myLines.subList(range.getStartOffset(), range.getEndOffset() + 1)), range -> { + iterateTransformations(range -> { + linesToSb(sb, myLines.subList(range.getStartOffset(), range.getEndOffset() + 1)); + if (containsLastLine(range) && myBaseFileEndsWithNewLine) { + sb.append('\n'); + } + }, range -> { final MyAppliedData appliedData = myTransformations.get(range); linesToSb(sb, appliedData.getList()); + if (containsLastLine(range) && !mySuppressNewLineInEnd) { + sb.append('\n'); + } }); - if (! mySuppressNewLineInEnd) { - sb.append('\n'); - } return sb.toString(); } + private boolean containsLastLine(@NotNull TextRange range) { + return range.getEndOffset() == myLines.size() - 1; + } + private static void linesToSb(final StringBuilder sb, final List list) { if (sb.length() > 0 && !list.isEmpty()) { sb.append("\n"); From ada6a530c8faefe365b176a02d79839fa14c7998 Mon Sep 17 00:00:00 2001 From: Sergey Simonchik Date: Wed, 20 Jul 2016 02:21:51 +0300 Subject: [PATCH 62/74] add broken NodeJS plugins --- platform/platform-resources/src/brokenPlugins.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-resources/src/brokenPlugins.txt b/platform/platform-resources/src/brokenPlugins.txt index 162113e6a5bd3..8b29d64ddb4f5 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -1,7 +1,7 @@ // This file contains list of broken plugins. // Each line contains plugin ID and list of versions that are broken. // If plugin name or version contains a space you can quote it like in command line. -NodeJS 163.1479 163.1374.5 144.2986 144.2925.4 144.2911 144.2562 144.2131 144.988 143.1138 143.1088 143.769 143.751 143.516 143.381.8 143.380.6 143.381.11 143.380.8 143.444 143.379.15 143.21 143.110 143.250 142.4426 142.4100 142.3858 142.3224 142.2650 142.2492 142.2481 142.2064 141.1108 140.2045 140.1669 140.642 139.173 139.105 139.496 139.1 139.8 138.2196 138.2254 138.1684 138.1744 138.1879 138.2051 138.1367 138.1495 138.1189 138.1145 138.937 138.1013 138.921 138.447 138.172 138.317 138.21 138.35 138.96 138.85 136.1205 134.1276 134.1163 134.1145 134.1081 134.1039 134.985 134.680 134.31 134.307 134.262 134.198 134.125 136.1141 +NodeJS 163.1616 163.1479 163.1374.5 163.1105 163.1059 163.607 163.198 144.2986 144.2925.4 144.2911 144.2562 144.2131 144.988 143.1138 143.1088 143.769 143.751 143.516 143.381.8 143.380.6 143.381.11 143.380.8 143.444 143.379.15 143.21 143.110 143.250 142.4426 142.4100 142.3858 142.3224 142.2650 142.2492 142.2481 142.2064 141.1108 140.2045 140.1669 140.642 139.173 139.105 139.496 139.1 139.8 138.2196 138.2254 138.1684 138.1744 138.1879 138.2051 138.1367 138.1495 138.1189 138.1145 138.937 138.1013 138.921 138.447 138.172 138.317 138.21 138.35 138.96 138.85 136.1205 134.1276 134.1163 134.1145 134.1081 134.1039 134.985 134.680 134.31 134.307 134.262 134.198 134.125 136.1141 com.jetbrains.php 145.258.2 144.4199.11 144.3891.12 144.3656 144.3168 143.790 143.1770 143.1184.87 143.382.38 143.279 143.381.48 143.129 142.5282 142.2716 142.3969 142.4491 140.2765 141.332 139.732 139.659 139.496 139.173 139.105 138.2502 138.2000.2262 138.1751 138.1806 138.1505 138.1161 138.826 136.1768 136.1672 134.1456 133.982 133.679 133.51 133.326 131.98 131.374 131.332 131.235 131.205 130.1639 130.1481 130.1176 129.91 129.814 129.672 129.362 127.67 127.100 126.334 123.66 122.875 121.62 121.390 121.215 121.12 com.intellij.phing 133.51 131.374 129.672 127.67 124.347 121.62 121.390 121.215 121.12 117.746 117.694 117.501 117.257 117.222 117.132 114.282 114.158 com.intellij.plugins.html.instantEditing 162.5 0.4.1 0.4 0.3.9 0.3.8 0.3.7 0.3.6 0.3.5 0.3.3 0.3.2 0.3.10 0.3.1 0.3 0.2.27 0.2.25 0.2.24 0.2.23 From 28d9656870256073fd8e55e5d36b89a769249570 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 20 Jul 2016 08:41:30 +0200 Subject: [PATCH 63/74] prepare anonymous base context calculation to the coming of lambda stubs --- .../psi/impl/source/PsiClassImpl.java | 79 +++++++++---------- .../com/intellij/psi/StubAstSwitchTest.groovy | 3 + 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java index cb33d967c737c..8b090449e12fc 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java @@ -557,23 +557,23 @@ private static boolean isAnonymousOrLocal(PsiClass aClass) { } @Nullable - private static PsiElement calcBasesResolveContext(PsiClass aClass, - String className, + private static PsiElement calcBasesResolveContext(PsiElement scope, + String baseClassName, boolean isInitialClass, final PsiElement defaultResolveContext) { - final PsiClassStub stub = ((PsiClassImpl)aClass).getStub(); - if (stub == null || stub.isAnonymousInQualifiedNew()) { - return aClass.getParent(); + final StubElement stub = ((StubBasedPsiElementBase)scope).getStub(); + if (stub == null || stub instanceof PsiClassStub && ((PsiClassStub)stub).isAnonymousInQualifiedNew()) { + return scope.getParent(); } - boolean isAnonOrLocal = isAnonymousOrLocal(aClass); - - if (!isAnonOrLocal) { - return isInitialClass ? defaultResolveContext : aClass; - } + if (scope instanceof PsiClass) { + if (!isAnonymousOrLocal((PsiClass)scope)) { + return isInitialClass ? defaultResolveContext : scope; + } - if (!isInitialClass) { - if (aClass.findInnerClassByName(className, true) != null) return aClass; + if (!isInitialClass) { + if (((PsiClass)scope).findInnerClassByName(baseClassName, true) != null) return scope; + } } final StubElement parentStub = stub.getParentStub(); @@ -582,43 +582,38 @@ private static PsiElement calcBasesResolveContext(PsiClass aClass, LOG.error(stub + " parent is " + parentStub); return null; } - final StubBasedPsiElementBase context = (StubBasedPsiElementBase)psi; - @SuppressWarnings("unchecked") - PsiClass[] classesInScope = (PsiClass[])parentStub.getChildrenByType(Constants.CLASS_BIT_SET, PsiClass.ARRAY_FACTORY); - boolean needPreciseContext = false; - if (classesInScope.length > 1) { - for (PsiClass scopeClass : classesInScope) { - if (scopeClass == aClass) continue; - String className1 = scopeClass.getName(); - if (className.equals(className1)) { - needPreciseContext = true; - break; - } - } - } - else { - if (classesInScope.length != 1) { - LOG.error("Parent stub: " + parentStub.getStubType() + "; children: " + parentStub.getChildrenStubs() + "; \ntext:" + context.getText()); - } - LOG.assertTrue(classesInScope[0] == aClass); + if (hasChildClassStub(parentStub, baseClassName, scope)) { + return scope.getParent(); } - if (needPreciseContext) { - return aClass.getParent(); + if (psi instanceof PsiClass || psi instanceof PsiLambdaExpression) { + return calcBasesResolveContext(psi, baseClassName, false, defaultResolveContext); } - else { - if (context instanceof PsiClass) { - return calcBasesResolveContext((PsiClass)context, className, false, defaultResolveContext); - } - else if (context instanceof PsiMember) { - return calcBasesResolveContext(((PsiMember)context).getContainingClass(), className, false, defaultResolveContext); + if (psi instanceof PsiMember) { + return calcBasesResolveContext(((PsiMember)psi).getContainingClass(), baseClassName, false, defaultResolveContext); + } + LOG.error(parentStub); + return psi; + } + + private static boolean hasChildClassStub(StubElement parentStub, String className, PsiElement place) { + PsiClass[] classesInScope = (PsiClass[])parentStub.getChildrenByType(Constants.CLASS_BIT_SET, PsiClass.ARRAY_FACTORY); + + for (PsiClass scopeClass : classesInScope) { + if (scopeClass == place) continue; + if (className.equals(scopeClass.getName())) { + return true; } - else { - LOG.assertTrue(false); - return context; + } + + if (place instanceof PsiClass) { + if (classesInScope.length == 0) { + LOG.error("Parent stub: " + parentStub.getStubType() + "; children: " + parentStub.getChildrenStubs() + "; \ntext:" + parentStub.getPsi().getText()); } + LOG.assertTrue(Arrays.asList(classesInScope).contains(place)); } + return false; } @Override diff --git a/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy b/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy index 7de0d9894a060..ee93409993482 100644 --- a/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy +++ b/java/java-tests/testSrc/com/intellij/psi/StubAstSwitchTest.groovy @@ -21,6 +21,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.vfs.VfsUtil import com.intellij.psi.impl.source.PsiFileImpl import com.intellij.psi.search.GlobalSearchScope +import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.psi.util.PsiTreeUtil import com.intellij.reference.SoftReference @@ -119,6 +120,7 @@ class A { class MyInner extends Inner {} }; + Runnable r = () -> { new B() {}; }; } class B { @@ -128,6 +130,7 @@ class B { """) assert !file.contentsLoaded PsiClass bClass = ((PsiJavaFile) file).classes[1] + assert DirectClassInheritorsSearch.search(bClass).findAll().size() == 2 assert !file.contentsLoaded def fooMethod = bClass.methods[0] From e7b814c5496468630cd040f24954f01fc3d8d434 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 20 Jul 2016 09:01:21 +0200 Subject: [PATCH 64/74] stub hierarchy: serialize qualified names already hashed to win some space and time --- .../psi/stubsHierarchy/impl/Imports.java | 30 ++-- .../stubsHierarchy/impl/NameEnvironment.java | 65 ++++---- .../stubsHierarchy/impl/SerializedUnit.java | 51 +++--- .../psi/stubsHierarchy/impl/StubEnter.java | 14 +- .../impl/StubHierarchyConnector.java | 8 +- .../impl/StubHierarchyIndex.java | 2 +- .../psi/stubsHierarchy/impl/StubResolver.java | 32 +++- .../psi/stubsHierarchy/impl/Symbols.java | 1 - .../psi/stubsHierarchy/impl/Translator.java | 74 --------- .../psi/stubsHierarchy/impl/annotations.java | 4 +- .../impl/java/stubs/hierarchy/IndexTree.java | 147 ++---------------- 11 files changed, 119 insertions(+), 309 deletions(-) delete mode 100644 java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Translator.java diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Imports.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Imports.java index 639a8ea07db8f..67210ee46d7a1 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Imports.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Imports.java @@ -49,40 +49,28 @@ Import[] readImports(UnitInputStream in) throws IOException { } private static void writeImport(@NotNull DataOutput out, IndexTree.Import anImport) throws IOException { - SerializedUnit.writeQualifiedName(out, anImport.myFullname); - boolean hasAlias = anImport.myAlias != 0; + out.writeInt(NameEnvironment.fromString(anImport.myQualifier)); + boolean hasAlias = anImport.myAlias != null; int flags = 0; flags = BitUtil.set(flags, IS_STATIC, anImport.myStaticImport); flags = BitUtil.set(flags, IS_ON_DEMAND, anImport.myOnDemand); flags = BitUtil.set(flags, HAS_ALIAS, hasAlias); out.writeByte(flags); + if (anImport.myImportedName != null) { + out.writeInt(NameEnvironment.hashIdentifier(anImport.myImportedName)); + } if (hasAlias) { - out.writeInt(anImport.myAlias); + out.writeInt(NameEnvironment.hashIdentifier(anImport.myAlias)); } } private Import readImport(UnitInputStream in) throws IOException { - int qualifier = 0; - int len = DataInputOutputUtil.readINT(in); - for (int i = 0; i < len - 1; i++) { - qualifier = in.names.qualifiedName(qualifier, in.readInt()); - } - int lastId = in.readInt(); + int qualifier = in.readInt(); int flags = in.readByte(); + int shortName = BitUtil.isSet(flags, IS_ON_DEMAND) ? 0 : in.readInt(); int alias = BitUtil.isSet(flags, HAS_ALIAS) ? in.readInt() : 0; - boolean onDemand = BitUtil.isSet(flags, IS_ON_DEMAND); - boolean isStatic = BitUtil.isSet(flags, IS_STATIC); - - int shortName; - if (onDemand) { - shortName = 0; - qualifier = in.names.qualifiedName(qualifier, lastId); - } else { - shortName = lastId; - } - - return obtainImport(qualifier, shortName, alias, isStatic); + return obtainImport(qualifier, shortName, alias, BitUtil.isSet(flags, IS_STATIC)); } private Import obtainImport(int qualifier, int shortName, int alias, boolean isStatic) { diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/NameEnvironment.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/NameEnvironment.java index ab943317b08d9..e64a6d74f88ca 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/NameEnvironment.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/NameEnvironment.java @@ -16,52 +16,59 @@ package com.intellij.psi.stubsHierarchy.impl; import com.intellij.openapi.util.UserDataHolderBase; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.CommonClassNames; -import com.intellij.psi.impl.java.stubs.hierarchy.IndexTree; -import com.intellij.util.io.DataInputOutputUtil; +import com.intellij.psi.PsiNameHelper; +import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; +import java.util.List; class NameEnvironment extends UserDataHolderBase { - public static final int OBJECT_NAME = IndexTree.hashIdentifier("Object"); - public static final int NO_NAME = 0; - @QNameHash final int java_lang; - public final QualifiedName java_lang_Enum; - public final QualifiedName java_lang_annotation_Annotation; + static final int OBJECT_NAME = hashIdentifier("Object"); + static final int NO_NAME = 0; + @QNameHash final static int java_lang = fromString("java.lang"); + static final QualifiedName java_lang_Enum = new QualifiedName.Interned(fromString(CommonClassNames.JAVA_LANG_ENUM)); + static final QualifiedName java_lang_annotation_Annotation = + new QualifiedName.Interned(fromString(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION)); - NameEnvironment() { - java_lang = fromString("java.lang"); - java_lang_Enum = new QualifiedName.Interned(fromString(CommonClassNames.JAVA_LANG_ENUM)); - java_lang_annotation_Annotation = new QualifiedName.Interned(fromString(CommonClassNames.JAVA_LANG_ANNOTATION_ANNOTATION)); - } - - @QNameHash int fromString(String s) { + static @QNameHash int fromString(String s) { int id = 0; - for (int shortName : IndexTree.hashQualifiedName(s)) { + for (int shortName : hashQualifiedName(s)) { id = qualifiedName(id, shortName); } return id; } - /** - * @see SerializedUnit#writeQualifiedName(DataOutput, int[]) - */ - @QNameHash int readQualifiedName(DataInput in) throws IOException { - int id = 0; - int len = DataInputOutputUtil.readINT(in); - for (int i = 0; i < len; i++) { - id = qualifiedName(id, in.readInt()); + static int hashIdentifier(@Nullable String s) { + if (StringUtil.isEmpty(s)) return 0; + + // not using String.hashCode because this way there's less collisions for short package names like 'com' + int hash = 0; + for (int i = 0; i < s.length(); i++) { + hash = hash * 239 + s.charAt(i); } - return id; + return hash == 0 ? 1 : hash; + } + + static int[] hashQualifiedName(@NotNull String qName) { + qName = PsiNameHelper.getQualifiedClassName(qName, true); + if (qName.isEmpty()) return ArrayUtil.EMPTY_INT_ARRAY; + + List components = StringUtil.split(qName, "."); + int[] result = new int[components.size()]; + for (int i = 0; i < components.size(); i++) { + result[i] = hashIdentifier(components.get(i)); + } + return result; } - int memberQualifiedName(@QNameHash int ownerName, @ShortName int name) { + static int memberQualifiedName(@QNameHash int ownerName, @ShortName int name) { return name == NO_NAME || ownerName == 0 ? 0 : qualifiedName(ownerName, name); } - @QNameHash int qualifiedName(@QNameHash int prefix, @ShortName int shortName) { + static @QNameHash int qualifiedName(@QNameHash int prefix, @ShortName int shortName) { int hash = prefix * 31 + shortName; return hash == 0 ? 1 : hash; } diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SerializedUnit.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SerializedUnit.java index db9a6353f8b9d..ef5067fc6e4ef 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SerializedUnit.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SerializedUnit.java @@ -66,10 +66,8 @@ void readUnit(StubEnter stubEnter, int fileId) { } } - /** - * @see NameEnvironment#readQualifiedName(DataInput) - */ - static void writeQualifiedName(DataOutput out, @QNameHash int[] array) throws IOException { + private static void writeNameComponents(DataOutput out, String qName) throws IOException { + int[] array = NameEnvironment.hashQualifiedName(qName); DataInputOutputUtil.writeINT(out, array.length); for (int i : array) { out.writeInt(i); @@ -90,15 +88,16 @@ static QualifiedName readNameComponents(DataInput in) throws IOException { // unit private static void writeUnit(@NotNull DataOutput out, IndexTree.Unit value) throws IOException { - writeQualifiedName(out, value.myPackageName); + writeNameComponents(out, value.myPackageName); out.writeByte(value.myUnitType); - if (value.myUnitType != IndexTree.BYTECODE) { + boolean compiled = value.myUnitType == IndexTree.BYTECODE; + if (!compiled) { Imports.writeImports(out, value); } // class Declaration DataInputOutputUtil.writeINT(out, value.myDecls.length); for (IndexTree.ClassDecl def : value.myDecls) { - saveClassDecl(out, def); + saveClassDecl(out, def, compiled); } } @@ -116,12 +115,12 @@ private static void enterUnit(UnitInputStream in) throws IOException { // class - private static void saveClassDecl(@NotNull DataOutput out, IndexTree.ClassDecl value) throws IOException { + private static void saveClassDecl(@NotNull DataOutput out, IndexTree.ClassDecl value, boolean compiled) throws IOException { DataInputOutputUtil.writeINT(out, value.myStubId); DataInputOutputUtil.writeINT(out, value.myMods); - out.writeInt(value.myName); - writeSupers(out, value); - writeMembers(out, value.myDecls); + out.writeInt(NameEnvironment.hashIdentifier(value.myName)); + writeSupers(out, value, compiled); + writeMembers(out, value.myDecls, compiled); } private static ClassSymbol readClassDecl(UnitInputStream in, UnitInfo info, Symbol owner, @QNameHash int ownerName) throws IOException { @@ -130,7 +129,7 @@ private static ClassSymbol readClassDecl(UnitInputStream in, UnitInfo info, Symb @ShortName int name = in.readInt(); @CompactArray(QualifiedName.class) Object superNames = readSupers(in, info.isCompiled()); - @QNameHash int qname = in.names.memberQualifiedName(ownerName, name); + @QNameHash int qname = NameEnvironment.memberQualifiedName(ownerName, name); ClassSymbol symbol = in.stubEnter.classEnter(info, owner, stubId, mods, name, superNames, qname, in.fileId); readMembers(in, info, qname, symbol); @@ -139,10 +138,10 @@ private static ClassSymbol readClassDecl(UnitInputStream in, UnitInfo info, Symb // supers - private static void writeSupers(@NotNull DataOutput out, IndexTree.ClassDecl value) throws IOException { + private static void writeSupers(@NotNull DataOutput out, IndexTree.ClassDecl value, boolean interned) throws IOException { DataInputOutputUtil.writeINT(out, value.mySupers.length); - for (int[] aSuper : value.mySupers) { - writeQualifiedName(out, aSuper); + for (String aSuper : value.mySupers) { + writeSuperName(out, interned, aSuper); } } @@ -158,16 +157,24 @@ private static void writeSupers(@NotNull DataOutput out, IndexTree.ClassDecl val return superNames; } + private static void writeSuperName(@NotNull DataOutput out, boolean interned, String aSuper) throws IOException { + if (interned) { + out.writeInt(NameEnvironment.fromString(aSuper)); + } else { + writeNameComponents(out, aSuper); + } + } + private static QualifiedName readSuperName(UnitInputStream in, boolean intern) throws IOException { - return intern ? new QualifiedName.Interned(in.names.readQualifiedName(in)) : readNameComponents(in); + return intern ? new QualifiedName.Interned(in.readInt()) : readNameComponents(in); } // members - private static void writeMembers(@NotNull DataOutput out, IndexTree.Decl[] decls) throws IOException { + private static void writeMembers(@NotNull DataOutput out, IndexTree.Decl[] decls, boolean compiled) throws IOException { DataInputOutputUtil.writeINT(out, decls.length); for (IndexTree.Decl def : decls) { - saveDecl(out, def); + saveDecl(out, def, compiled); } } @@ -187,13 +194,13 @@ private static void readMembers(UnitInputStream in, // decl: class or member - private static void saveDecl(@NotNull DataOutput out, IndexTree.Decl value) throws IOException { + private static void saveDecl(@NotNull DataOutput out, IndexTree.Decl value, boolean compiled) throws IOException { if (value instanceof IndexTree.ClassDecl) { out.writeBoolean(true); - saveClassDecl(out, (IndexTree.ClassDecl)value); + saveClassDecl(out, (IndexTree.ClassDecl)value, compiled); } else if (value instanceof IndexTree.MemberDecl) { out.writeBoolean(false); - writeMembers(out, ((IndexTree.MemberDecl)value).myDecls); + writeMembers(out, ((IndexTree.MemberDecl)value).myDecls, compiled); } } @@ -225,12 +232,10 @@ public int hashCode() { class UnitInputStream extends DataInputStream { final int fileId; final StubEnter stubEnter; - final NameEnvironment names; UnitInputStream(InputStream in, int fileId, StubEnter stubEnter) { super(in); this.fileId = fileId; this.stubEnter = stubEnter; - this.names = stubEnter.myNameEnvironment; } } diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubEnter.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubEnter.java index cc4cc55a2d7cb..2bd07184d4b81 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubEnter.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubEnter.java @@ -29,7 +29,6 @@ import static com.intellij.psi.stubsHierarchy.impl.Symbol.PackageSymbol; public class StubEnter { - final NameEnvironment myNameEnvironment; final Imports imports = new Imports(); private final Symbols mySymbols; private final StubHierarchyConnector myStubHierarchyConnector; @@ -37,9 +36,8 @@ public class StubEnter { private ArrayList uncompleted = new ArrayList(); StubEnter(Symbols symbols) { - myNameEnvironment = symbols.myNameEnvironment; mySymbols = symbols; - myStubHierarchyConnector = new StubHierarchyConnector(myNameEnvironment, symbols); + myStubHierarchyConnector = new StubHierarchyConnector(symbols); } PackageSymbol readPackageName(DataInput in) throws IOException { @@ -48,7 +46,7 @@ PackageSymbol readPackageName(DataInput in) throws IOException { int len = DataInputOutputUtil.readINT(in); for (int i = 0; i < len; i++) { int shortName = in.readInt(); - qname = myNameEnvironment.qualifiedName(qname, shortName); + qname = NameEnvironment.qualifiedName(qname, shortName); pkg = mySymbols.enterPackage(qname, shortName, pkg); } return pkg; @@ -75,13 +73,13 @@ ClassSymbol classEnter(UnitInfo info, @CompactArray(QualifiedName.class) Object handleSpecialSupers(int flags, @CompactArray(QualifiedName.class) Object superNames) { if (BitUtil.isSet(flags, IndexTree.ANNOTATION)) { - return myNameEnvironment.java_lang_annotation_Annotation; + return NameEnvironment.java_lang_annotation_Annotation; } if (BitUtil.isSet(flags, IndexTree.ENUM)) { - if (superNames == null) return myNameEnvironment.java_lang_Enum; - if (superNames instanceof QualifiedName) return new QualifiedName[]{(QualifiedName)superNames, myNameEnvironment.java_lang_Enum}; - return ArrayUtil.append((QualifiedName[])superNames, myNameEnvironment.java_lang_Enum); + if (superNames == null) return NameEnvironment.java_lang_Enum; + if (superNames instanceof QualifiedName) return new QualifiedName[]{(QualifiedName)superNames, NameEnvironment.java_lang_Enum}; + return ArrayUtil.append((QualifiedName[])superNames, NameEnvironment.java_lang_Enum); } return superNames; diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyConnector.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyConnector.java index 8d8112ddec82f..5a3c1f58c85a4 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyConnector.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyConnector.java @@ -21,11 +21,9 @@ import java.util.Set; public class StubHierarchyConnector { - private final NameEnvironment myNameEnvironment; private final StubResolver myResolve; - protected StubHierarchyConnector(NameEnvironment nameEnvironment, Symbols symbols) { - this.myNameEnvironment = nameEnvironment; + protected StubHierarchyConnector(Symbols symbols) { myResolve = new StubResolver(symbols, this); } @@ -67,9 +65,9 @@ void connect(Symbol sym) { c.setSupers(supertypes); } - private boolean isJavaLangObject(Symbol s) { + private static boolean isJavaLangObject(Symbol s) { return s.myShortName == NameEnvironment.OBJECT_NAME && s.myOwner instanceof Symbol.PackageSymbol && - ((Symbol.PackageSymbol)s.myOwner).myQualifiedName == myNameEnvironment.java_lang; + ((Symbol.PackageSymbol)s.myOwner).myQualifiedName == NameEnvironment.java_lang; } } diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java index 1e94cad878a35..e6019223e13ba 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubHierarchyIndex.java @@ -96,7 +96,7 @@ public SerializedUnit read(@NotNull DataInput in) throws IOException { @Override public int getVersion() { - return IndexTree.STUB_HIERARCHY_ENABLED ? 7 + Arrays.stream(ourIndexers).mapToInt(StubHierarchyIndexer::getVersion).sum() : 0; + return IndexTree.STUB_HIERARCHY_ENABLED ? 8 + Arrays.stream(ourIndexers).mapToInt(StubHierarchyIndexer::getVersion).sum() : 0; } @NotNull diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubResolver.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubResolver.java index 9e3c7520d0320..0375ce909ff63 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubResolver.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/StubResolver.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.stubsHierarchy.impl; +import com.intellij.psi.impl.java.stubs.hierarchy.IndexTree; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -24,16 +25,35 @@ import java.util.Set; public class StubResolver { + private static final Import[] DEFAULT_JAVA_IMPORTS = {importPackage("java.lang")}; + private static final Import[] DEFAULT_GROOVY_IMPORTS = { + importPackage("java.lang"), + importPackage("java.util"), + importPackage("java.io"), + importPackage("java.net"), + importPackage("groovy.lang"), + importPackage("groovy.util"), + new Import(NameEnvironment.fromString("java.math"), NameEnvironment.hashIdentifier("BigInteger"), false), + new Import(NameEnvironment.fromString("java.math"), NameEnvironment.hashIdentifier("BigDecimal"), false), + }; private final Symbols mySymbols; - private final NameEnvironment myNameEnvironment; private final StubHierarchyConnector myConnector; public StubResolver(Symbols symbols, StubHierarchyConnector connector) { this.mySymbols = symbols; - this.myNameEnvironment = symbols.myNameEnvironment; myConnector = connector; } + private static Import importPackage(String qname) { + return new Import(NameEnvironment.fromString(qname), 0, false); + } + + private static Import[] getDefaultImports(byte type) { + if (type == IndexTree.JAVA) return DEFAULT_JAVA_IMPORTS; + if (type == IndexTree.GROOVY) return DEFAULT_GROOVY_IMPORTS; + return Imports.EMPTY_ARRAY; + } + // resolve class `sym` extends/implements `baseId` Set resolveBase(Symbol.ClassSymbol sym, @ShortName int[] qname) throws IncompleteHierarchyException { Set result = resolveUnqualified(sym, qname[0], qname.length > 1); @@ -91,7 +111,7 @@ private void selectSym(Symbol receiver, @ShortName int name, boolean processPack } private void findIdentInPackage(Symbol.PackageSymbol pck, @ShortName int name, boolean processPackages, Set symbols) { - @QNameHash int fullname = mySymbols.myNameEnvironment.qualifiedName(pck.myQualifiedName, name); + @QNameHash int fullname = NameEnvironment.qualifiedName(pck.myQualifiedName, name); if (processPackages) { ContainerUtil.addIfNotNull(symbols, mySymbols.getPackage(fullname)); } @@ -132,7 +152,7 @@ public Symbol.ClassSymbol[] findGlobalType(@QNameHash int nameId) { } private void findGlobalType(UnitInfo info, @ShortName int name, Set symbols) throws IncompleteHierarchyException { - for (Import anImport : Translator.getDefaultImports(info.type, myNameEnvironment)) + for (Import anImport : getDefaultImports(info.type)) handleImport(anImport, name, symbols); for (Import anImport : info.imports) handleImport(anImport, name, symbols); @@ -157,14 +177,14 @@ public void handleImport(Import anImport, @ShortName int name, Set symbo importNamedStatic(s, anImport.importedName, symbols); } else { - Collections.addAll(symbols, findGlobalType(myNameEnvironment.qualifiedName(anImport.qualifier, anImport.importedName))); + Collections.addAll(symbols, findGlobalType(NameEnvironment.qualifiedName(anImport.qualifier, anImport.importedName))); } } } // handling of `import prefix.*` private void importAll(@QNameHash int prefix, @ShortName int suffix, final Set symbols) { - Collections.addAll(symbols, findGlobalType(myNameEnvironment.qualifiedName(prefix, suffix))); + Collections.addAll(symbols, findGlobalType(NameEnvironment.qualifiedName(prefix, suffix))); } // handling of import static `tsym.name` as diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbols.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbols.java index f74d19c06a142..beb8cd346a6ed 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbols.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Symbols.java @@ -12,7 +12,6 @@ public class Symbols { public final PackageSymbol myRootPackage = new PackageSymbol(null, 0, NameEnvironment.NO_NAME); - protected final NameEnvironment myNameEnvironment = new NameEnvironment(); private final AnchorRepository myClassAnchors = new AnchorRepository(); private List myClassSymbols = new ArrayList<>(0x8000); diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Translator.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Translator.java deleted file mode 100644 index 107ec71ded999..0000000000000 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/Translator.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2000-2016 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.psi.stubsHierarchy.impl; - -import com.intellij.openapi.util.Key; -import com.intellij.psi.impl.java.stubs.hierarchy.IndexTree; - -public class Translator { - private static final Key DEFAULT_JAVA_IMPORTS_KEY = Key.create("java_imports"); - private static final Key DEFAULT_GROOVY_IMPORTS_KEY = Key.create("groovy_imports"); - - private static Import[] getDefaultJavaImports(NameEnvironment nameEnvironment) { - Import[] imports = nameEnvironment.getUserData(DEFAULT_JAVA_IMPORTS_KEY); - if (imports == null) { - imports = createDefaultJavaImports(nameEnvironment); - nameEnvironment.putUserData(DEFAULT_JAVA_IMPORTS_KEY, imports); - } - return imports; - } - - private static Import[] createDefaultJavaImports(NameEnvironment nameEnvironment) { - return new Import[]{ - importPackage(nameEnvironment, "java.lang") - }; - } - - private static Import[] getDefaultGroovyImports(NameEnvironment nameEnvironment) { - Import[] imports = nameEnvironment.getUserData(DEFAULT_GROOVY_IMPORTS_KEY); - if (imports == null) { - imports = createDefaultGroovyImports(nameEnvironment); - nameEnvironment.putUserData(DEFAULT_GROOVY_IMPORTS_KEY, imports); - } - return imports; - } - - private static Import[] createDefaultGroovyImports(NameEnvironment nameEnvironment) { - return new Import[] { - importPackage(nameEnvironment, "java.lang"), - importPackage(nameEnvironment, "java.util"), - importPackage(nameEnvironment, "java.io"), - importPackage(nameEnvironment, "java.net"), - importPackage(nameEnvironment, "groovy.lang"), - importPackage(nameEnvironment, "groovy.util"), - new Import(nameEnvironment.fromString("java.math"), IndexTree.hashIdentifier("BigInteger"), false), - new Import(nameEnvironment.fromString("java.math"), IndexTree.hashIdentifier("BigDecimal"), false), - }; - } - - private static Import importPackage(NameEnvironment nameEnvironment, String qname) { - return new Import(nameEnvironment.fromString(qname), 0, false); - } - - public static Import[] getDefaultImports(byte type, NameEnvironment nameEnvironment) { - if (type == IndexTree.JAVA) - return getDefaultJavaImports(nameEnvironment); - if (type == IndexTree.GROOVY) - return getDefaultGroovyImports(nameEnvironment); - return Imports.EMPTY_ARRAY; - } - -} diff --git a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/annotations.java b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/annotations.java index 9727110a24115..f2c613e57a78c 100644 --- a/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/annotations.java +++ b/java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/annotations.java @@ -15,8 +15,6 @@ */ package com.intellij.psi.stubsHierarchy.impl; -import com.intellij.psi.impl.java.stubs.hierarchy.IndexTree; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -43,7 +41,7 @@ @interface QNameHash { } /** - * int hash of a qualified name part, produced by {@link IndexTree#hashIdentifier(String)} + * int hash of a qualified name part, produced by {@link NameEnvironment#hashIdentifier(String)} */ @Retention(RetentionPolicy.SOURCE) @Target(ElementType.TYPE_USE) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/IndexTree.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/IndexTree.java index 2ac4457938822..708b7e609b874 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/IndexTree.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/hierarchy/IndexTree.java @@ -18,14 +18,9 @@ import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.psi.PsiNameHelper; -import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Arrays; -import java.util.List; - public class IndexTree { public static final boolean STUB_HIERARCHY_ENABLED = Registry.is("java.hierarchy.service"); @@ -41,123 +36,37 @@ public class IndexTree { public static final byte JAVA = 1; public static final byte GROOVY = 2; - public static int hashIdentifier(@Nullable String s) { - if (StringUtil.isEmpty(s)) return 0; - - // not using String.hashCode because this way there's less collisions for short package names like 'com' - int hash = 0; - for (int i = 0; i < s.length(); i++) { - hash = hash * 239 + s.charAt(i); - } - return hash == 0 ? 1 : hash; - } - - public static int[] hashQualifiedName(@NotNull String qName) { - qName = PsiNameHelper.getQualifiedClassName(qName, true); - if (qName.isEmpty()) return ArrayUtil.EMPTY_INT_ARRAY; - - List components = StringUtil.split(qName, "."); - int[] result = new int[components.size()]; - for (int i = 0; i < components.size(); i++) { - result[i] = hashIdentifier(components.get(i)); - } - return result; - } - - private static int[][] hashQualifiedNameArray(String[] supers) { - int[][] superHashes = new int[supers.length][]; - for (int i = 0; i < supers.length; i++) { - superHashes[i] = hashQualifiedName(supers[i]); - } - return superHashes; - } - public static class Unit { - @NotNull public final int[] myPackageName; + @NotNull public final String myPackageName; public final byte myUnitType; public final Import[] imports; public final ClassDecl[] myDecls; public Unit(@Nullable String packageName, byte unitType, Import[] imports, ClassDecl[] decls) { - this(hashQualifiedName(StringUtil.notNullize(packageName)), unitType, imports, decls); - } - - public Unit(@NotNull int[] packageName, byte unitType, Import[] imports, ClassDecl[] decls) { - myPackageName = packageName; + myPackageName = StringUtil.notNullize(packageName); myUnitType = unitType; this.imports = imports; myDecls = decls; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Unit unit = (Unit)o; - - if (myUnitType != unit.myUnitType) return false; - if (!Arrays.equals(myPackageName, unit.myPackageName)) return false; - if (!Arrays.equals(imports, unit.imports)) return false; - if (!Arrays.equals(myDecls, unit.myDecls)) return false; - - return true; - } - - @Override - public int hashCode() { - int hash = myUnitType * 31 + Arrays.hashCode(myPackageName); - for (ClassDecl decl : myDecls) { - int name = decl.myName; - if (name != 0) { - return hash * 31 + name; - } - } - return hash; - } } public static class Import { public static final Import[] EMPTY_ARRAY = new Import[0]; - public final int[] myFullname; + @NotNull public final String myQualifier; + @Nullable public final String myImportedName; public final boolean myStaticImport; public final boolean myOnDemand; - public final int myAlias; + @Nullable public final String myAlias; public Import(String fullname, boolean staticImport, boolean onDemand, @Nullable String alias) { - this(hashQualifiedName(fullname), staticImport, onDemand, hashIdentifier(alias)); - } - - public Import(int[] fullname, boolean staticImport, boolean onDemand, int alias) { - myFullname = fullname; + myQualifier = onDemand ? fullname : StringUtil.getPackageName(fullname); + myImportedName = onDemand ? null : StringUtil.getShortName(fullname); myStaticImport = staticImport; myOnDemand = onDemand; myAlias = alias; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Import anImport = (Import)o; - - if (myStaticImport != anImport.myStaticImport) return false; - if (myOnDemand != anImport.myOnDemand) return false; - if (!Arrays.equals(myFullname, anImport.myFullname)) return false; - if (myAlias != anImport.myAlias) return false; - - return true; - } - - @Override - public int hashCode() { - int result = Arrays.hashCode(myFullname); - result = 31 * result + (myStaticImport ? 1 : 0); - result = 31 * result + (myOnDemand ? 1 : 0); - result = 31 * result + myAlias; - return result; - } } public static abstract class Decl { @@ -173,14 +82,10 @@ public static class ClassDecl extends Decl { public static final ClassDecl[] EMPTY_ARRAY = new ClassDecl[0]; public final int myStubId; public final int myMods; - public final int myName; - public final int[][] mySupers; + public final String myName; + public final String[] mySupers; public ClassDecl(int stubId, int mods, @Nullable String name, String[] supers, Decl[] decls) { - this(stubId, mods, hashIdentifier(name), hashQualifiedNameArray(supers), decls); - } - - public ClassDecl(int stubId, int mods, int name, int[][] supers, Decl[] decls) { super(decls); assert stubId > 0; myStubId = stubId; @@ -189,27 +94,6 @@ public ClassDecl(int stubId, int mods, int name, int[][] supers, Decl[] decls) { mySupers = supers; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - ClassDecl classDecl = (ClassDecl)o; - if (myStubId != classDecl.myStubId) return false; - if (myMods != classDecl.myMods) return false; - if (myName != classDecl.myName) return false; - if (!Arrays.deepEquals(mySupers, classDecl.mySupers)) return false; - if (!Arrays.equals(myDecls, classDecl.myDecls)) return false; - return true; - } - - @Override - public int hashCode() { - int result = myStubId; - result = 31 * result + myMods; - result = 31 * result + myName; - return result; - } } public static class MemberDecl extends Decl { @@ -218,19 +102,6 @@ public MemberDecl(Decl[] decls) { super(decls); } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - MemberDecl that = (MemberDecl)o; - if (!Arrays.equals(myDecls, that.myDecls)) return false; - return true; - } - - @Override - public int hashCode() { - return Arrays.hashCode(myDecls); - } } } From a1b30986afffd969bcecdb6261177fabfe3b0bdf Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 10:58:28 +0200 Subject: [PATCH 65/74] alternative suppress id for global inspections (IDEA-154071) --- .../unusedSymbol/UnusedSymbolLocalInspectionBase.java | 3 ++- .../unusedParameters/UnusedParametersInspection.java | 4 ++-- .../unusedMethodParameter/suppressedParameter/src/Test.java | 4 ++++ .../codeInspection/ex/GlobalInspectionContextBase.java | 2 +- .../codeInspection/ex/GlobalInspectionContextUtil.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java index f9525dc0a2683..f9f0e5e88008e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspectionBase.java @@ -32,6 +32,7 @@ public class UnusedSymbolLocalInspectionBase extends BaseJavaLocalInspectionTool @NonNls public static final String SHORT_NAME = HighlightInfoType.UNUSED_SYMBOL_SHORT_NAME; @NonNls public static final String DISPLAY_NAME = HighlightInfoType.UNUSED_SYMBOL_DISPLAY_NAME; @NonNls public static final String UNUSED_PARAMETERS_SHORT_NAME = "UnusedParameters"; + @NonNls public static final String UNUSED_ID = "unused"; public boolean LOCAL_VARIABLE = true; public boolean FIELD = true; @@ -126,7 +127,7 @@ public String getShortName() { @NotNull @NonNls public String getID() { - return "unused"; + return UNUSED_ID; } @Override diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java index 6abd0970c83ab..9ef81a9729040 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -193,7 +193,7 @@ public static ArrayList getUnusedParameters(RefMethod refMethod) { clearUsedParameters(refMethod, result, checkDeep); for (RefParameter parameter : result) { - if (parameter != null && !((RefElementImpl)parameter).isSuppressed(UnusedSymbolLocalInspectionBase.UNUSED_PARAMETERS_SHORT_NAME)) { + if (parameter != null && !((RefElementImpl)parameter).isSuppressed(UnusedSymbolLocalInspectionBase.UNUSED_PARAMETERS_SHORT_NAME, UnusedSymbolLocalInspectionBase.UNUSED_ID)) { res.add(parameter); } } @@ -315,6 +315,6 @@ private static void removeUnusedParameterViaChangeSignature(final PsiMethod psiM @Nullable @Override public String getAlternativeID() { - return "unused"; + return UnusedSymbolLocalInspectionBase.UNUSED_ID; } } diff --git a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java index f2b5752b9eef7..1897fa90b9206 100644 --- a/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java +++ b/java/java-tests/testData/inspection/unusedMethodParameter/suppressedParameter/src/Test.java @@ -2,4 +2,8 @@ public class Test { public void foo(@SuppressWarnings("UnusedParameters") boolean b) { } + + public void foo(@SuppressWarnings("unused") boolean b) { + + } } diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java index 18a48944f420b..d2fc4a61fe524 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java @@ -209,7 +209,7 @@ public RefManagerImpl compute() { } public boolean isToCheckMember(@NotNull RefElement owner, @NotNull InspectionProfileEntry tool) { - return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool) && !((RefElementImpl)owner).isSuppressed(tool.getShortName()); + return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool) && !((RefElementImpl)owner).isSuppressed(tool.getShortName(), tool.getAlternativeID()); } public boolean isToCheckFile(PsiFile file, @NotNull InspectionProfileEntry tool) { diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java index 44ea4a205a38a..4ab2c77092cce 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextUtil.java @@ -42,7 +42,7 @@ public static RefElement retrieveRefElement(@NotNull PsiElement element, @NotNul public static boolean isToCheckMember(@NotNull RefElement owner, @NotNull InspectionProfileEntry tool, Tools tools, ProfileManager profileManager) { - return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool, tools, profileManager) && !((RefElementImpl)owner).isSuppressed(tool.getShortName()); + return isToCheckFile(((RefElementImpl)owner).getContainingFile(), tool, tools, profileManager) && !((RefElementImpl)owner).isSuppressed(tool.getShortName(), tool.getAlternativeID()); } public static boolean isToCheckFile(PsiFile file, @NotNull InspectionProfileEntry tool, Tools tools, ProfileManager profileManager) { From 1e5372292b054f7b4ea79b899952798e7339e173 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 15:46:16 +0200 Subject: [PATCH 66/74] java stub for literal expression to ensure parenthesis --- .../psi/impl/source/tree/java/PsiLiteralExpressionImpl.java | 3 ++- .../refactoring/inlineLocal/ParenthesisAroundCast.java | 6 ++++++ .../inlineLocal/ParenthesisAroundCast.java.after | 5 +++++ .../com/intellij/refactoring/inline/InlineLocalTest.java | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java create mode 100644 java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java.after diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java index fe910bde5fb6b..1967a50f68ff4 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java @@ -24,6 +24,7 @@ import com.intellij.psi.impl.ResolveScopeManager; import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; import com.intellij.psi.impl.java.stubs.impl.PsiLiteralStub; +import com.intellij.psi.impl.source.JavaStubPsiElement; import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.psi.impl.source.tree.LeafElement; import com.intellij.psi.impl.source.tree.injected.StringLiteralEscaper; @@ -38,7 +39,7 @@ import java.util.Locale; public class PsiLiteralExpressionImpl - extends StubBasedPsiElementBase + extends JavaStubPsiElement implements PsiLiteralExpression, PsiLanguageInjectionHost, ContributedReferenceHost { @NonNls private static final String QUOT = """; diff --git a/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java b/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java new file mode 100644 index 0000000000000..5b581ce4ce425 --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java @@ -0,0 +1,6 @@ +class Test { + { + Double d = 1.0; + d.byteValue(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java.after b/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java.after new file mode 100644 index 0000000000000..d210d8aa1c1aa --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineLocal/ParenthesisAroundCast.java.after @@ -0,0 +1,5 @@ +class Test { + { + ((Double) 1.0).byteValue(); + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java index 40be3a539aa35..dfae3086b5055 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java @@ -276,6 +276,10 @@ public void testOperationPrecedenceWhenInlineToStringConcatenation() throws Exce doTest(false); } + public void testParenthesisAroundCast() throws Exception { + doTest(false); + } + public void testLocalVarInsideLambdaBodyWriteUsage() throws Exception { doTest(true, "Cannot perform refactoring.\n" + "Variable 'hello' is accessed for writing"); From 2d36e419ebedf8fc98dbd674c3d950f26525ac42 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 15:46:28 +0200 Subject: [PATCH 67/74] empty stubs for functional expressions (^peter) --- .../psi/formatter/java/AbstractJavaBlock.java | 6 +- .../java/stubs/FunctionalExpressionStub.java | 28 +++++ .../impl/java/stubs/JavaStubElementTypes.java | 4 +- .../stubs/LambdaExpressionElementType.java | 97 ++++++++++++++++ .../stubs/MethodReferenceElementType.java | 99 ++++++++++++++++ .../psi/impl/source/JavaFileElementType.java | 4 +- .../psi/impl/source/JavaLightStubBuilder.java | 9 +- .../psi/impl/source/tree/JavaElementType.java | 6 +- .../tree/java/PsiLambdaExpressionImpl.java | 30 +++-- .../PsiMethodReferenceExpressionImpl.java | 109 ++++++++++++++---- .../com/intellij/psi/JavaStubBuilderTest.java | 8 +- 11 files changed, 346 insertions(+), 54 deletions(-) create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/LambdaExpressionElementType.java create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/MethodReferenceElementType.java diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java index 372aa1f881a32..a3f0c17d764ed 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java @@ -301,9 +301,9 @@ private static Indent getDefaultSubtreeIndent(@NotNull ASTNode child, @NotNull C if (parent != null) { final Indent defaultChildIndent = getChildIndent(parent, indentOptions); if (defaultChildIndent != null) return defaultChildIndent; - } - if (child.getTreeParent() instanceof PsiLambdaExpression && child instanceof PsiCodeBlock) { - return Indent.getNoneIndent(); + if (parent.getPsi() instanceof PsiLambdaExpression && child instanceof PsiCodeBlock) { + return Indent.getNoneIndent(); + } } return null; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java new file mode 100644 index 0000000000000..b926e4631d3f6 --- /dev/null +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/FunctionalExpressionStub.java @@ -0,0 +1,28 @@ +/* + * Copyright 2000-2016 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.psi.impl.java.stubs; + +import com.intellij.psi.PsiFunctionalExpression; +import com.intellij.psi.stubs.IStubElementType; +import com.intellij.psi.stubs.StubBase; +import com.intellij.psi.stubs.StubElement; + +public class FunctionalExpressionStub extends StubBase { + protected FunctionalExpressionStub(StubElement parent, + IStubElementType elementType) { + super(parent, elementType); + } +} \ No newline at end of file diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java index 03591f90e27e7..981e99112707c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaStubElementTypes.java @@ -30,6 +30,8 @@ public interface JavaStubElementTypes { JavaAnnotationParameterListType ANNOTATION_PARAMETER_LIST = new JavaAnnotationParameterListType(); JavaNameValuePairType NAME_VALUE_PAIR = new JavaNameValuePairType(); JavaLiteralExpressionElementType LITERAL_EXPRESSION = new JavaLiteralExpressionElementType(); + LambdaExpressionElementType LAMBDA_EXPRESSION = new LambdaExpressionElementType(); + MethodReferenceElementType METHOD_REFERENCE = new MethodReferenceElementType(); JavaParameterListElementType PARAMETER_LIST = new JavaParameterListElementType(); JavaParameterElementType PARAMETER = new JavaParameterElementType(); JavaTypeParameterElementType TYPE_PARAMETER = new JavaTypeParameterElementType(); @@ -135,4 +137,4 @@ public ASTNode createCompositeNode() { }; IStubFileElementType JAVA_FILE = new JavaFileElementType(); -} \ No newline at end of file +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/LambdaExpressionElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/LambdaExpressionElementType.java new file mode 100644 index 0000000000000..8cab424d6e5d9 --- /dev/null +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/LambdaExpressionElementType.java @@ -0,0 +1,97 @@ +/* + * Copyright 2000-2016 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.psi.impl.java.stubs; + +import com.intellij.lang.ASTNode; +import com.intellij.lang.LighterAST; +import com.intellij.lang.LighterASTNode; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiLambdaExpression; +import com.intellij.psi.impl.source.tree.*; +import com.intellij.psi.impl.source.tree.java.PsiLambdaExpressionImpl; +import com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil; +import com.intellij.psi.stubs.*; +import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; + +public class LambdaExpressionElementType extends JavaStubElementType,PsiLambdaExpression> { + public LambdaExpressionElementType() { + super("LAMBDA_EXPRESSION"); + } + + @Override + public PsiLambdaExpression createPsi(@NotNull ASTNode node) { + return new PsiLambdaExpressionImpl(node); + } + + @Override + public FunctionalExpressionStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) { + return new FunctionalExpressionStub(parentStub, this); + } + + @Override + public PsiLambdaExpression createPsi(@NotNull FunctionalExpressionStub stub) { + return new PsiLambdaExpressionImpl(stub); + } + + @Override + public void serialize(@NotNull FunctionalExpressionStub stub, @NotNull StubOutputStream dataStream) throws IOException { + } + + @NotNull + @Override + public FunctionalExpressionStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { + return new FunctionalExpressionStub(parentStub, this); + } + + @Override + public void indexStub(@NotNull FunctionalExpressionStub stub, @NotNull IndexSink sink) { + } + + @NotNull + @Override + public ASTNode createCompositeNode() { + return new CompositeElement(this) { + @Override + public void replaceChildInternal(@NotNull ASTNode child, @NotNull TreeElement newElement) { + if (ElementType.EXPRESSION_BIT_SET.contains(child.getElementType()) && + ElementType.EXPRESSION_BIT_SET.contains(newElement.getElementType())) { + boolean needParenth = ReplaceExpressionUtil.isNeedParenthesis(child, newElement); + if (needParenth) { + newElement = JavaSourceUtil.addParenthToReplacedChild(JavaElementType.PARENTH_EXPRESSION, newElement, getManager()); + } + } + super.replaceChildInternal(child, newElement); + } + + @Override + public int getChildRole(ASTNode child) { + final IElementType elType = child.getElementType(); + if (elType == JavaTokenType.ARROW) { + return ChildRole.ARROW; + } else if (elType == JavaElementType.PARAMETER_LIST) { + return ChildRole.PARAMETER_LIST; + } else if (elType == JavaElementType.CODE_BLOCK) { + return ChildRole.LBRACE; + } else { + return ChildRole.EXPRESSION; + } + } + }; + } +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/MethodReferenceElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/MethodReferenceElementType.java new file mode 100644 index 0000000000000..41cb46f0236cf --- /dev/null +++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/MethodReferenceElementType.java @@ -0,0 +1,99 @@ +/* + * Copyright 2000-2016 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.psi.impl.java.stubs; + +import com.intellij.lang.ASTNode; +import com.intellij.lang.LighterAST; +import com.intellij.lang.LighterASTNode; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiMethodReferenceExpression; +import com.intellij.psi.impl.source.tree.*; +import com.intellij.psi.impl.source.tree.java.PsiMethodReferenceExpressionImpl; +import com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil; +import com.intellij.psi.stubs.*; +import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; + +public class MethodReferenceElementType extends + JavaStubElementType, PsiMethodReferenceExpression> { + public MethodReferenceElementType() { + super("METHOD_REF_EXPRESSION"); + } + + @Override + public PsiMethodReferenceExpression createPsi(@NotNull ASTNode node) { + return new PsiMethodReferenceExpressionImpl(node); + } + + @Override + public FunctionalExpressionStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) { + return new FunctionalExpressionStub(parentStub, this); + } + + @Override + public PsiMethodReferenceExpression createPsi(@NotNull FunctionalExpressionStub stub) { + return new PsiMethodReferenceExpressionImpl(stub); + } + + @Override + public void serialize(@NotNull FunctionalExpressionStub stub, @NotNull StubOutputStream dataStream) throws IOException { + } + + @NotNull + @Override + public FunctionalExpressionStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException { + return new FunctionalExpressionStub(parentStub, this); + } + + @Override + public void indexStub(@NotNull FunctionalExpressionStub stub, @NotNull IndexSink sink) { + } + + @NotNull + @Override + public ASTNode createCompositeNode() { + return new CompositeElement(this) { + @Override + public void replaceChildInternal(@NotNull ASTNode child, @NotNull TreeElement newElement) { + if (ElementType.EXPRESSION_BIT_SET.contains(child.getElementType()) && + ElementType.EXPRESSION_BIT_SET.contains(newElement.getElementType())) { + boolean needParenth = ReplaceExpressionUtil.isNeedParenthesis(child, newElement); + if (needParenth) { + newElement = JavaSourceUtil.addParenthToReplacedChild(JavaElementType.PARENTH_EXPRESSION, newElement, getManager()); + } + } + super.replaceChildInternal(child, newElement); + } + + + @Override + public int getChildRole(ASTNode child) { + final IElementType elType = child.getElementType(); + if (elType == JavaTokenType.DOUBLE_COLON) { + return ChildRole.DOUBLE_COLON; + } else if (elType == JavaTokenType.IDENTIFIER) { + return ChildRole.REFERENCE_NAME; + } else if (elType == JavaElementType.REFERENCE_EXPRESSION) { + return ChildRole.CLASS_REFERENCE; + } + return ChildRole.EXPRESSION; + } + + }; + } +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java index 324c86edf580f..85fbce060fb70 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java @@ -38,7 +38,7 @@ * @author max */ public class JavaFileElementType extends ILightStubFileElementType { - public static final int STUB_VERSION = 26; + public static final int STUB_VERSION = 27; public JavaFileElementType() { super("java.FILE", JavaLanguage.INSTANCE); @@ -111,4 +111,4 @@ public PsiJavaFileStub deserialize(@NotNull StubInputStream dataStream, StubElem @Override @SuppressWarnings("LambdaUnfriendlyMethodOverload") public void indexStub(@NotNull PsiJavaFileStub stub, @NotNull IndexSink sink) { } -} \ No newline at end of file +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java index 3f6b9309f86c1..b13629f0ac2c1 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java @@ -103,7 +103,8 @@ private static boolean checkByTypes(IElementType parentType, IElementType nodeTy private static class CodeBlockVisitor extends RecursiveTreeElementWalkingVisitor implements LighterLazyParseableNode.Visitor { private static final TokenSet BLOCK_ELEMENTS = TokenSet.create( - JavaElementType.ANNOTATION, JavaElementType.CLASS, JavaElementType.ANONYMOUS_CLASS); + JavaElementType.ANNOTATION, JavaElementType.CLASS, JavaElementType.ANONYMOUS_CLASS, + JavaElementType.LAMBDA_EXPRESSION, JavaElementType.METHOD_REF_EXPRESSION); private boolean result = true; @@ -127,8 +128,8 @@ public boolean visit(IElementType type) { return true; } - // annotations - if (type == JavaTokenType.AT) { + // annotations, method refs & lambdas + if (type == JavaTokenType.AT || type == JavaTokenType.ARROW || type == JavaTokenType.DOUBLE_COLON) { return (result = false); } // anonymous classes @@ -150,4 +151,4 @@ else if (type == JavaTokenType.CLASS_KEYWORD && last != JavaTokenType.DOT) { return true; } } -} \ No newline at end of file +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java index f1e0f2e083ca8..89497290f92db 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java @@ -84,6 +84,8 @@ public ASTNode createCompositeNode() { IElementType EXTENDS_BOUND_LIST = JavaStubElementTypes.EXTENDS_BOUND_LIST; IElementType THROWS_LIST = JavaStubElementTypes.THROWS_LIST; IElementType MODULE = JavaStubElementTypes.MODULE; + IElementType LAMBDA_EXPRESSION = JavaStubElementTypes.LAMBDA_EXPRESSION; + IElementType METHOD_REF_EXPRESSION = JavaStubElementTypes.METHOD_REFERENCE; IElementType IMPORT_STATIC_REFERENCE = new JavaCompositeElementType("IMPORT_STATIC_REFERENCE", PsiImportStaticReferenceElementImpl.class); IElementType TYPE = new JavaCompositeElementType("TYPE", PsiTypeElementImpl.class); @@ -110,8 +112,6 @@ public ASTNode createCompositeNode() { IElementType INSTANCE_OF_EXPRESSION = new JavaCompositeElementType("INSTANCE_OF_EXPRESSION", PsiInstanceOfExpressionImpl.class); IElementType CLASS_OBJECT_ACCESS_EXPRESSION = new JavaCompositeElementType("CLASS_OBJECT_ACCESS_EXPRESSION", PsiClassObjectAccessExpressionImpl.class); IElementType EMPTY_EXPRESSION = new JavaCompositeElementType("EMPTY_EXPRESSION", PsiEmptyExpressionImpl.class, true); - IElementType METHOD_REF_EXPRESSION = new JavaCompositeElementType("METHOD_REF_EXPRESSION", PsiMethodReferenceExpressionImpl.class); - IElementType LAMBDA_EXPRESSION = new JavaCompositeElementType("LAMBDA_EXPRESSION", PsiLambdaExpressionImpl.class); IElementType EXPRESSION_LIST = new JavaCompositeElementType("EXPRESSION_LIST", PsiExpressionListImpl.class, true); IElementType EMPTY_STATEMENT = new JavaCompositeElementType("EMPTY_STATEMENT", PsiEmptyStatementImpl.class); IElementType BLOCK_STATEMENT = new JavaCompositeElementType("BLOCK_STATEMENT", PsiBlockStatementImpl.class); @@ -294,4 +294,4 @@ public ASTNode parseContents(final ASTNode chameleon) { } } IElementType DUMMY_ELEMENT = new JavaDummyElementType(); -} \ No newline at end of file +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java index cdb71a7419e2f..649a0a63f05da 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java @@ -21,13 +21,13 @@ import com.intellij.psi.*; import com.intellij.psi.controlFlow.*; import com.intellij.psi.impl.PsiImplUtil; +import com.intellij.psi.impl.java.stubs.FunctionalExpressionStub; +import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; +import com.intellij.psi.impl.source.JavaStubPsiElement; import com.intellij.psi.impl.source.resolve.graphInference.FunctionalInterfaceParameterizationUtil; import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession; -import com.intellij.psi.impl.source.tree.ChildRole; -import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.infos.MethodCandidateInfo; import com.intellij.psi.scope.PsiScopeProcessor; -import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; @@ -36,7 +36,8 @@ import javax.swing.*; import java.util.Map; -public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements PsiLambdaExpression { +public class PsiLambdaExpressionImpl extends JavaStubPsiElement> + implements PsiLambdaExpression { private static final ControlFlowPolicy ourPolicy = new ControlFlowPolicy() { @Nullable @@ -56,8 +57,12 @@ public boolean isLocalVariableAccepted(@NotNull PsiLocalVariable psiVariable) { } }; - public PsiLambdaExpressionImpl() { - super(JavaElementType.LAMBDA_EXPRESSION); + public PsiLambdaExpressionImpl(@NotNull FunctionalExpressionStub stub) { + super(stub, JavaStubElementTypes.LAMBDA_EXPRESSION); + } + + public PsiLambdaExpressionImpl(@NotNull ASTNode node) { + super(node); } @NotNull @@ -67,17 +72,8 @@ public PsiParameterList getParameterList() { } @Override - public int getChildRole(ASTNode child) { - final IElementType elType = child.getElementType(); - if (elType == JavaTokenType.ARROW) { - return ChildRole.ARROW; - } else if (elType == JavaElementType.PARAMETER_LIST) { - return ChildRole.PARAMETER_LIST; - } else if (elType == JavaElementType.CODE_BLOCK) { - return ChildRole.LBRACE; - } else { - return ChildRole.EXPRESSION; - } + public PsiElement getParent() { + return getParentByTree(); } @Override diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java index ce572483c1998..1ab3723edb458 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java @@ -23,10 +23,12 @@ import com.intellij.psi.*; import com.intellij.psi.impl.CheckUtil; import com.intellij.psi.impl.PsiImplUtil; +import com.intellij.psi.impl.java.stubs.FunctionalExpressionStub; +import com.intellij.psi.impl.java.stubs.JavaStubElementTypes; +import com.intellij.psi.impl.source.JavaStubPsiElement; import com.intellij.psi.impl.source.resolve.graphInference.FunctionalInterfaceParameterizationUtil; import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession; import com.intellij.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil; -import com.intellij.psi.impl.source.tree.ChildRole; import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.infos.MethodCandidateInfo; import com.intellij.psi.scope.ElementClassFilter; @@ -35,8 +37,8 @@ import com.intellij.psi.scope.conflictResolvers.DuplicateConflictResolver; import com.intellij.psi.scope.processor.FilterScopeProcessor; import com.intellij.psi.scope.util.PsiScopesUtil; -import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.*; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -45,15 +47,25 @@ import javax.swing.*; import java.util.*; -public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase implements PsiMethodReferenceExpression { +public class PsiMethodReferenceExpressionImpl extends JavaStubPsiElement> + implements PsiMethodReferenceExpression { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiMethodReferenceExpressionImpl"); private static final MethodReferenceResolver RESOLVER = new MethodReferenceResolver(); - public PsiMethodReferenceExpressionImpl() { - super(JavaElementType.METHOD_REF_EXPRESSION); + public PsiMethodReferenceExpressionImpl(@NotNull FunctionalExpressionStub stub) { + super(stub, JavaStubElementTypes.METHOD_REFERENCE); + } + + public PsiMethodReferenceExpressionImpl(@NotNull ASTNode node) { + super(node); } + @Override + public PsiElement getParent() { + return getParentByTree(); + } + @Override public PsiTypeElement getQualifierType() { final PsiElement qualifier = getQualifier(); @@ -284,19 +296,6 @@ public void setQualifierExpression(@Nullable PsiExpression newQualifier) throws } } - @Override - public int getChildRole(ASTNode child) { - final IElementType elType = child.getElementType(); - if (elType == JavaTokenType.DOUBLE_COLON) { - return ChildRole.DOUBLE_COLON; - } else if (elType == JavaTokenType.IDENTIFIER) { - return ChildRole.REFERENCE_NAME; - } else if (elType == JavaElementType.REFERENCE_EXPRESSION) { - return ChildRole.CLASS_REFERENCE; - } - return ChildRole.EXPRESSION; - } - @NotNull @Override public JavaResolveResult[] multiResolve(boolean incompleteCode) { @@ -316,7 +315,7 @@ public TextRange getRangeInElement() { final int offsetInParent = element.getStartOffsetInParent(); return new TextRange(offsetInParent, offsetInParent + element.getTextLength()); } - final PsiElement colons = findPsiChildByType(JavaTokenType.DOUBLE_COLON); + final PsiElement colons = findChildByType(JavaTokenType.DOUBLE_COLON); if (colons != null) { final int offsetInParent = colons.getStartOffsetInParent(); return new TextRange(offsetInParent, offsetInParent + colons.getTextLength()); @@ -375,9 +374,9 @@ else if (element instanceof PsiClass) { @Override public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException { - PsiElement oldIdentifier = findChildByRoleAsPsiElement(ChildRole.REFERENCE_NAME); + PsiElement oldIdentifier = findChildByType(JavaTokenType.IDENTIFIER); if (oldIdentifier == null) { - oldIdentifier = findChildByRoleAsPsiElement(ChildRole.CLASS_REFERENCE); + oldIdentifier = findChildByType(JavaElementType.REFERENCE_EXPRESSION); } if (oldIdentifier == null) { throw new IncorrectOperationException(); @@ -478,4 +477,72 @@ public boolean isAcceptable(PsiType left) { public Icon getIcon(int flags) { return AllIcons.Nodes.MethodReference; } + + @Override + public PsiElement bindToElementViaStaticImport(@NotNull final PsiClass qualifierClass) throws IncorrectOperationException { + throw new IncorrectOperationException(); + } + + @Override + public PsiElement getElement() { + return this; + } + + @Override + public PsiElement resolve() { + return advancedResolve(false).getElement(); + } + + @NotNull + @Override + public Object[] getVariants() { + // this reference's variants are rather obtained with processVariants() + return ArrayUtil.EMPTY_OBJECT_ARRAY; + } + + @Override + public boolean isSoft() { + return false; + } + + @Override + public PsiReference getReference() { + return this; + } + + @NotNull + @Override + public JavaResolveResult advancedResolve(boolean incompleteCode) { + final JavaResolveResult[] results = multiResolve(incompleteCode); + return results.length == 1 ? results[0] : JavaResolveResult.EMPTY; + } + + @Override + public String getReferenceName() { + final PsiElement element = getReferenceNameElement(); + return element != null ? element.getText() : null; + } + + @Override + public PsiReferenceParameterList getParameterList() { + return PsiTreeUtil.getChildOfType(this, PsiReferenceParameterList.class); + } + + @NotNull + @Override + public PsiType[] getTypeParameters() { + final PsiReferenceParameterList parameterList = getParameterList(); + return parameterList != null ? parameterList.getTypeArguments() : PsiType.EMPTY_ARRAY; + } + + @Override + public boolean isQualified() { + return getQualifier() != null; + } + + @Override + public String getQualifiedName() { + return getCanonicalText(); + } + } diff --git a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java index 937668d7789a8..13fca2e78688c 100644 --- a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java @@ -235,7 +235,8 @@ public void testAnonymousClasses() { " MODIFIER_LIST:PsiModifierListStub[mask=0]\n" + " ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=O.P]\n" + " ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=Y inqualifnew]\n" + - " ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=R]\n"); + " LAMBDA_EXPRESSION:FunctionalExpressionStub\n" + + " ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=R]\n"); } public void testEnums() { @@ -435,8 +436,9 @@ public void testTypeAnnotations() { " ANNOTATION_PARAMETER_LIST:PsiAnnotationParameterListStubImpl\n" + " ANNOTATION:PsiAnnotationStub[@A5]\n" + " ANNOTATION_PARAMETER_LIST:PsiAnnotationParameterListStubImpl\n" + - " ANNOTATION:PsiAnnotationStub[@A6]\n" + - " ANNOTATION_PARAMETER_LIST:PsiAnnotationParameterListStubImpl\n" + + " METHOD_REF_EXPRESSION:FunctionalExpressionStub\n" + + " ANNOTATION:PsiAnnotationStub[@A6]\n" + + " ANNOTATION_PARAMETER_LIST:PsiAnnotationParameterListStubImpl\n" + " ANNOTATION:PsiAnnotationStub[@A7]\n" + " ANNOTATION_PARAMETER_LIST:PsiAnnotationParameterListStubImpl\n" + " ANNOTATION:PsiAnnotationStub[@A8]\n" + From 235d77f357df036a8033f2d2a1f2f3f4c34d8f80 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 17:27:19 +0200 Subject: [PATCH 68/74] NPE (IDEA-158755) --- .../intellij/codeInspection/export/ExportToHTMLDialog.java | 4 +++- platform/util/src/com/intellij/util/ui/GraphicsUtil.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInspection/export/ExportToHTMLDialog.java b/platform/lang-impl/src/com/intellij/codeInspection/export/ExportToHTMLDialog.java index 6eb3c423f2bef..203472cc02f41 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/export/ExportToHTMLDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/export/ExportToHTMLDialog.java @@ -71,7 +71,9 @@ public void reset() { } final String text = exportToHTMLSettings.OUTPUT_DIRECTORY; myTargetDirectoryField.setText(text); - myTargetDirectoryField.setPreferredSize(new Dimension(GraphicsUtil.stringWidth(text, myTargetDirectoryField.getFont()) + 100, myTargetDirectoryField.getPreferredSize().height)); + if (text != null) { + myTargetDirectoryField.setPreferredSize(new Dimension(GraphicsUtil.stringWidth(text, myTargetDirectoryField.getFont()) + 100, myTargetDirectoryField.getPreferredSize().height)); + } } public void apply() { diff --git a/platform/util/src/com/intellij/util/ui/GraphicsUtil.java b/platform/util/src/com/intellij/util/ui/GraphicsUtil.java index da223902b78ec..3d635f657f280 100644 --- a/platform/util/src/com/intellij/util/ui/GraphicsUtil.java +++ b/platform/util/src/com/intellij/util/ui/GraphicsUtil.java @@ -41,7 +41,7 @@ public static void setupAntialiasing(@NotNull Graphics g2) { setupAntialiasing(g2, true, false); } - public static int stringWidth(String text, Font font) { + public static int stringWidth(@NotNull String text, Font font) { setupAntialiasing(ourGraphics, true, true); return ourGraphics.getFontMetrics(font).stringWidth(text); } From 0f82a3bf77d14ad95ec439ea5f4f7264c7b9d7f9 Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Tue, 19 Jul 2016 19:04:30 +0200 Subject: [PATCH 69/74] merge misspelled (hashCode, toString, setUp, tearDown, compareTo) inspections --- .../UnusedDeclarationInspectionMerger.java | 4 +- .../ex/InspectionProfileTest.java | 16 +++++ .../InspectionProfileEntry.java | 14 ++++ .../ex/InspectionElementsMerger.java | 48 +++++++++++++ ...java => InspectionElementsMergerBase.java} | 29 +++++--- .../ex/InspectionProfileImpl.java | 41 ++++++----- .../src/META-INF/InspectionGadgets.xml | 20 +----- .../MisspelledCompareToInspectionBase.java | 63 ---------------- .../MisspelledHashcodeInspectionBase.java | 63 ---------------- .../MisspelledToStringInspectionBase.java | 63 ---------------- .../ThrowableNeverThrownInspectionMerger.java | 4 +- .../junit/MisspelledSetUpInspectionBase.java | 72 ------------------- .../MisspelledTearDownInspectionBase.java | 72 ------------------- ...> MisspelledMethodNameInspectionBase.java} | 8 +-- ...MisspelledMethodNameInspectionMerger.java} | 21 +++--- .../ig/bugs/MisspelledHashcodeInspection.java | 28 -------- .../ig/bugs/MisspelledToStringInspection.java | 28 -------- .../ig/junit/MisspelledSetUpInspection.java | 27 ------- .../junit/MisspelledTearDownInspection.java | 27 ------- ...va => MisspelledMethodNameInspection.java} | 4 +- .../MethodNamesDifferOnlyByCase.java | 5 ++ ...odNamesDifferOnlyByCaseInspectionTest.java | 2 +- 22 files changed, 150 insertions(+), 509 deletions(-) create mode 100644 platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java rename platform/analysis-impl/src/com/intellij/codeInspection/ex/{InspectionElementsMerger.java => InspectionElementsMergerBase.java} (90%) delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MisspelledCompareToInspectionBase.java delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MisspelledHashcodeInspectionBase.java delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/MisspelledToStringInspectionBase.java delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisspelledSetUpInspectionBase.java delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisspelledTearDownInspectionBase.java rename plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/{MethodNamesDifferOnlyByCaseInspectionBase.java => MisspelledMethodNameInspectionBase.java} (95%) rename plugins/InspectionGadgets/{src/com/siyeh/ig/bugs/MisspelledCompareToInspection.java => InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/MisspelledMethodNameInspectionMerger.java} (52%) delete mode 100644 plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledHashcodeInspection.java delete mode 100644 plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledToStringInspection.java delete mode 100644 plugins/InspectionGadgets/src/com/siyeh/ig/junit/MisspelledSetUpInspection.java delete mode 100644 plugins/InspectionGadgets/src/com/siyeh/ig/junit/MisspelledTearDownInspection.java rename plugins/InspectionGadgets/src/com/siyeh/ig/naming/{MethodNamesDifferOnlyByCaseInspection.java => MisspelledMethodNameInspection.java} (89%) diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java index 5092410f419e5..75be9546415be 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java @@ -15,12 +15,12 @@ */ package com.intellij.codeInspection.deadCode; -import com.intellij.codeInspection.ex.InspectionElementsMerger; +import com.intellij.codeInspection.ex.InspectionElementsMergerBase; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import com.intellij.openapi.util.WriteExternalException; import org.jdom.Element; -public class UnusedDeclarationInspectionMerger extends InspectionElementsMerger { +public class UnusedDeclarationInspectionMerger extends InspectionElementsMergerBase { private static final String UNUSED_SYMBOL = "UNUSED_SYMBOL"; private static final String UNUSED_DECLARATION = "UnusedDeclaration"; diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java index 7a5002f50a7da..85b9202d71fd2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java @@ -360,6 +360,22 @@ public void testDisabledUnusedDeclarationWithoutChanges() throws Exception { ""); } + public void testMergedMisspelledInspections() throws Exception { + checkMergedNoChanges("\n" + + " "); + checkMergedNoChanges("\n" + + " "); + } + public void testDisabledUnusedDeclarationWithChanges() throws Exception { checkMergedNoChanges("\n" + "