From 540392faad0aa4658956147f0621be9cd1260b49 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 6 May 2016 10:51:35 +0300 Subject: [PATCH 1/3] root index: avoid recursive processing of dependencies of each module and build dependencies graph properly instead (IDEA-CR-10361) --- .../src/com/intellij/openapi/roots/impl/RootIndex.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java index b1cf97108d28..649ac03176d2 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java @@ -249,7 +249,7 @@ public class RootIndex { final Module depModule = moduleOrderEntry.getModule(); if (depModule != null) { Node node = graph.myNodes.get(depModule); - OrderEnumerator en = OrderEnumerator.orderEntries(depModule).exportedOnly().recursively(); + OrderEnumerator en = OrderEnumerator.orderEntries(depModule).exportedOnly(); if (node == null) { node = new Node(); node.myKey = depModule; @@ -265,7 +265,7 @@ public class RootIndex { roots.putValue(sourceRoot, node); } } - boolean shouldRecurse = en.shouldRecurse(moduleOrderEntry, handlers); + boolean shouldRecurse = en.recursively().shouldRecurse(moduleOrderEntry, handlers); node.myEdges.add(new Edge(module, moduleOrderEntry, shouldRecurse)); } } From f1cf213260033a9ce0de1bd615c58cf207cb3c8f Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 6 May 2016 10:55:18 +0300 Subject: [PATCH 2/3] case in menu items corrected (IDEA-155665) --- .../src/messages/ActionsBundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index 686ab725b0d6..c1bd8b7280ae 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -1456,7 +1456,7 @@ action.UnmarkRoot.text=Unmark Root action.CreateLibraryFromFile.text=Add as Library... action.ImportModuleFromImlFile.text=Import Module action.ImportModuleFromImlFile.description=Import iml file as a module to the project -group.MarkRootGroup.text=Mark Directory As +group.MarkRootGroup.text=Mark Directory as action.CreateLauncherScript.text=Create Command-line Launcher... action.CreateLauncherScript.description=Create a script for opening files and projects from the command line action.CreateDesktopEntry.text=Create Desktop Entry... @@ -1467,7 +1467,7 @@ action.EditorGutterToggleLocalSoftWraps.gutterText=Soft-Wrap Current File action.EditorGutterToggleGlobalLineNumbers.text=Show Line Numbers action.EditorGutterToggleGlobalIndentLines.text=Show Indent Guides action.ExcludeFromProject.text=Exclude From Project... -group.MarkFileAs.text=Mark File As +group.MarkFileAs.text=Mark File as action.MarkAsPlainTextAction.text=Mark as Plain Text action.MarkAsOriginalTypeAction.text=Mark as From 3bef2f5b76443f1d62dba8c624c534ec867fa0bf Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 6 May 2016 11:52:53 +0300 Subject: [PATCH 3/3] build number: 146 -> 162 --- build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.txt b/build.txt index 6f540e14d3a6..6cafa4358b0d 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -146.SNAPSHOT +162.SNAPSHOT