From 7dd1846db21f4f12f55d1b2679e9448e6f60dff9 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 9 Nov 2016 15:26:44 +0300 Subject: [PATCH 1/4] javac ast indices: do not store duplicated references --- .../jps/backwardRefs/BackwardReferenceIndexWriter.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java index bba1c105a7ec..dcc556c97a00 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java +++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java @@ -35,9 +35,7 @@ import org.jetbrains.jps.model.java.compiler.JavaCompilers; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Set; import static com.sun.tools.javac.code.Flags.PRIVATE; @@ -166,7 +164,7 @@ public class BackwardReferenceIndexWriter { synchronized void writeReferences(int fileId, Collection refs) { final ByteArrayEnumerator byteSeqEum = myIndex.getByteSeqEum(); - final List usages = ContainerUtil.mapNotNull(refs, new Function() { + final Set usages = ContainerUtil.map2SetNotNull(refs, new Function() { @Override public LightRef fun(JavacRefSymbol symbol) { return fromSymbol(symbol, byteSeqEum); @@ -186,7 +184,7 @@ public class BackwardReferenceIndexWriter { private void updateReferenceIndicesIncrementally(int fileId, Collection usages) { final Collection rawOldUsages = myIndex.getReferenceMap().get(fileId); - Collection oldUsages = rawOldUsages == null ? null : new ArrayList(rawOldUsages); + Collection oldUsages = rawOldUsages == null ? null : new THashSet(rawOldUsages); for (LightRef usage : usages) { if (oldUsages == null || !oldUsages.remove(usage)) { myIndex.getBackwardReferenceMap().put(usage, fileId); From 4340dcbb57c41ebc9f681817c697ceef305f0932 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Wed, 9 Nov 2016 15:25:51 +0300 Subject: [PATCH 2/4] EA-91291 - NPE: BaseProjectTreeBuilder._select --- .../intellij/ide/projectView/BaseProjectTreeBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java index dcbf7ed025f4..3d92e7364fcd 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java @@ -22,6 +22,7 @@ import com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor; import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.AbstractTreeStructure; +import com.intellij.ide.util.treeView.AbstractTreeUpdater; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Progressive; @@ -160,11 +161,14 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { final boolean requestFocus, final Condition nonStopCondition) { + AbstractTreeUpdater updater = getUpdater(); + if (updater == null) return ActionCallback.REJECTED; + final ActionCallback result = new ActionCallback(); final FocusRequestor requestor = IdeFocusManager.getInstance(myProject).getFurtherRequestor(); - UiActivityMonitor.getInstance().addActivity(myProject, new UiActivity.AsyncBgOperation("projectViewSelect"), getUpdater().getModalityState()); + UiActivityMonitor.getInstance().addActivity(myProject, new UiActivity.AsyncBgOperation("projectViewSelect"), updater.getModalityState()); batch(indicator -> { _select(element, file, requestFocus, nonStopCondition, result, indicator, null, requestor, false); UiActivityMonitor.getInstance().removeActivity(myProject, new UiActivity.AsyncBgOperation("projectViewSelect")); From 9e4d3492cdbd07eb5c574f383a33a9c491fdcf54 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Wed, 9 Nov 2016 15:28:59 +0300 Subject: [PATCH 3/4] Some explanatory JavaDoc --- .../intellij/formatting/FormattingMode.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/formatting/FormattingMode.java b/platform/lang-impl/src/com/intellij/formatting/FormattingMode.java index 165482ce317b..758569f8a283 100644 --- a/platform/lang-impl/src/com/intellij/formatting/FormattingMode.java +++ b/platform/lang-impl/src/com/intellij/formatting/FormattingMode.java @@ -16,10 +16,23 @@ package com.intellij.formatting; /** - * @author Denis Zhdanov - * @since 8/22/12 2:44 PM + * The current formatting mode. */ public enum FormattingMode { - - REFORMAT, ADJUST_INDENT, ADJUST_INDENT_ON_ENTER + + /** + * Normal reformat (modifies indents and inline whitespaces). + */ + REFORMAT, + + /** + * Line indent adjustment. + */ + ADJUST_INDENT, + + /** + * Indent adjustment on a new line after Enter. In some cases a behavior may be different from the case when the same code is + * reformatted or indented, especially when some more input is expected to follow on the new line. + */ + ADJUST_INDENT_ON_ENTER } From 126d4b39818f79a96d04fee83b178e5c9bd3f644 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 9 Nov 2016 13:37:26 +0100 Subject: [PATCH 4/4] IDEA-CR-15513 rename to DefaultRunProgramRunner --- ...DefaultProgramRunnerImpl.kt => DefaultRunProgramRunner.kt} | 4 ++-- .../platform-resources/src/META-INF/PlatformLangPlugin.xml | 2 +- resources/src/idea/RichPlatformPlugin.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename platform/lang-impl/src/com/intellij/execution/runners/{DefaultProgramRunnerImpl.kt => DefaultRunProgramRunner.kt} (93%) diff --git a/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunnerImpl.kt b/platform/lang-impl/src/com/intellij/execution/runners/DefaultRunProgramRunner.kt similarity index 93% rename from platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunnerImpl.kt rename to platform/lang-impl/src/com/intellij/execution/runners/DefaultRunProgramRunner.kt index dcae4b26ee35..50082aedb035 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/DefaultProgramRunnerImpl.kt +++ b/platform/lang-impl/src/com/intellij/execution/runners/DefaultRunProgramRunner.kt @@ -24,8 +24,8 @@ import com.intellij.openapi.fileEditor.FileDocumentManager import org.jetbrains.concurrency.Promise import org.jetbrains.concurrency.resolvedPromise -private class DefaultProgramRunnerImpl : AsyncGenericProgramRunner() { - override fun getRunnerId() = "defaultRunner" +private class DefaultRunProgramRunner : AsyncGenericProgramRunner() { + override fun getRunnerId() = "defaultRunRunner" override fun prepare(environment: ExecutionEnvironment, state: RunProfileState): Promise { FileDocumentManager.getInstance().saveAllDocuments() diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml index 4c7beb1e2b46..5b36b9cc07f2 100644 --- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml +++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml @@ -75,7 +75,7 @@ - + diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index 8a7eab221bcf..ff41b7b47691 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -341,7 +341,7 @@ - +