Snapshot c11f3ac9bbde3f85d1f837ec3eb48a395ed7dd10 from idea/133.471 of git://git.jetbrains.org/idea/community.git

c11f3ac: faster xml properties indexing: don't process if no required namespace string present (cherry picked from commit 0845f9e) [r=Dmitry.Avdeev]
0be6c40: to get version sort copy of ClsStubBuilderFactory implementation array (cherry picked from commit c34b260) [r=Alexander.Podkhalusin]
8ed9df6: IDEA-116087 Warning when using new wrapper.gradleVersion construction (cherry picked from commit d3a81f0)
d33b33a: Gradle: fix check for gradle-related files (cherry picked from commit 140b618)
e8c50fa: Gradle: fix creation/sync of gradle wrapper files on project import
3fcf435: IDEA-99036 Changing breakpoint suspend policy from popup does not actually change the policy
033cdba: IDEA-116636 Android-Gradle facet is created when Gradle synchronization. related bug IDEA-116887 Gradle web artifacts do not contain compiled classes and JSP files (cherry picked from commit 64e7f51)
1f4d754: EA-52867 (null check)
3e2b5c5: proper processing of dom indices, 2 (cherry picked from commit e9d6759)
7061e85: proper processing of dom indices (cherry picked from commit e5401d6)
e04883d: proper implementation and usage of indices for DOMStubs
5fa6cf9: do not load/try to index inner classes content / delegate to ClsStubBuilder for inner class identification (cherry picked from commit a085c19) [r=Alexander.Podkhalusin]
3a8fd3f: - use all BinaryStubBuilders versions in stable order to calculate stub version - introduce version for ClassStubBuilderFactory and use all class stub builder factories in stable order to calculate version of ClassFileStubBuilder [r=Eugene.Zhuravlev, Alexander.Podkhalusin]
57e7213: IDEA-118436 Resource Bundle Editor converts UTF8 characters to ASCII even in UTF8 file
1dc12b4: IDEA-112730 PhpStorm goes crazy with collapsed comments and soft wraps until crash
eee52a9: IDEA-112730 PhpStorm goes crazy with collapsed comments and soft wraps until crash
c187921: IDEA-112730 PhpStorm goes crazy with collapsed comments and soft wraps until crash
2119489: ActionTestCase extracted from CoffeeScript and Puppet (cherry picked from commit be905df)
12e8b76: Overriding language in VariableInplaceRenamer. (CoffeeScript) (cherry picked from commit b459118)
c9069d1: IDEA-118587 IDEA may not exit with black window (cherry picked from commit a622b21)
6733c9e: WEB-9566 Debugger: optionally ignore certificate errors (cherry picked from commit af49f19)
da588bc: move CertificatesManager to platform (cherry picked from commit 6dc50e6)
f11ceb2: WEB-8262 Comment with line/block comment STILL doesn't work on HTML in ASP file (cherry picked from commit a83731c) [r=Rustam.Vyshnyakov]
8cfe207: WEB-849 "Comment with line comment" on empty line in <script> block generates HTML instead of JS comment (cherry picked from commit 73a14ec) [r=Rustam.Vyshnyakov]
36cf71c: WEB-6700 TODOs not recognized on multiple level language template (cherry picked from commit 9d00810) [r=Alexey.Gopachenko]
146d0c3: IDEA-118701 Multimodule project imported into IDEA via opening project file gets incorrect project name (cherry picked from commit 0912313)
25e5150: Bug fix: check not-null (cherry picked from commit 6b54183)
80932f6: IDEA-118601 New Module: Maven: click on "Create from archetype" reverts typed coordinates (cherry picked from commit d94c9a1)
a419509: IDEA-116593 improve choosing of Android and Java SDKs when creating new android-gradle project/module: choose only Android SDK location (if we don't know it) on first step, not build target; choose Java SDK (if there is no any) separately, set it as project sdk and as internal jdk for newly created android sdk entities (cherry picked from commit 2bf19b4)
e889183: Fixed IDEA-116006 Eclipse code style import: import the same xml does not pick up changes until manual synchronization (cherry picked from commit f6e9d9d)
fd2b92e: licenses missing licenses for libraries used by android
b5b25e5: Fixed IDEA-117788 Eclipse code style import: continuation indent is imported not multiplied to tab size (cherry picked from commit a9768ee)
074876e: remove all indexed state upon invalidateIndicesForFile (r=Eugene.Zhuravlev)
caa4032: EA-35422 - IOOBE: EditorImpl.offsetToLogicalLine (from debugger) (cherry picked from commit c21cd02) [r=Peter.Gromov]
b47b369: attach messages to root node if no running node found (cherry picked from commit 5c66005)
02cf0b4: [log] Flush & Close persistent enumerator on dispose()
f84ff13: better way to instantiate PersistentHashMap
36d590f: [git] Wrap the VcsException not to loose the cause
339dede: [log] IDEA-115407 Disable graph-only-actions if there is no graph
3773e2c: [log] IDEA-115568 Don't crash if the log is empty
cafe1a8: [log] IDEA-115901 Keep selection between refreshes and filtering
8169bbe: [log] rename type parameter to a more descriptive name
0548151: [log] remove pointless code
29f0909: [log] Don't use setFont(), instead supply value in getFont()
82f67f7: [log] IDEA-117816 small optimization in graph cell drawing
1acba78: IDEA-102942  Wrap always   Chained methods calls  over-format simple operations (cherry picked from commit 835ed38)
8ef13e9: IDEA-118613: catch all possible exceptions, that may be caused by corrupted storages
0654f14: IDEA-96131 Java: Braces placements don't work as expected for `Next Line`  [CR-IC-3694] (cherry picked from commit 975cfe8)
ee689af: WEB-10387 Mocha console log statements are not correctly aligned to their encasing tests (cherry picked from commit 6018640)
b6b35e2: WEB-9517 Npm: Error loading package list (cherry picked from commit aa82d2a)
07d7344: test fix: explicit encoding is required
257ac80: cleanup
9b46832: IDEA-93034 SQL: MySQL: erasing the first backtick could erase the pair
6da1645: in case when some output and source roots intersect: do not stop rebuild if caches version is advanced (IDEA-118613)
631aea6: separate checks if compiler is enabled and compiler api is supported by compiler implementation
4ecc2a5: external build: added method to register output directory in source-to-output mapping instead of registering individual files to reduce occupied disk space (ZD-16651) [rev by Jeka]
f344db7: don't copy ui-designer runtime classes to output if only NetBeans *.form files are found (ZD-14954) [rev by Jeka]
88de860: standalone JPS build: propagate 'forceBuild' option to dependencies implicitly included into compile scope [rev by Jeka]
cbec9d7: [^Peter] EA-50899 - ISE: GrRegexImpl.createLiteralTextEscaper
3013e02: [^Peter] IDEA-117828 Groovy console:  execute groovy code shortcut changed back
6ad8dbf: [^Peter] IDEA-117292 Groovy: checks for @Immutable class
8d2c8cf: EA-52292 fix (PHP template inside HTML comment case) (cherry picked from commit 41ccbd2)
1fc4a80: IDEA-118595
0f7f3a1: cleanup imports
09b3d12: style
efdd1aa: OutputSuppressed option added for HgCommandExecutor, style changed, unnecessary parameters removed (cherry picked from commit 4d55fdd)
12789c5: cosmetics: revision hash template changed to long. (cherry picked from commit f1c78e1)
57c3348: Parents revision hash template changed to long. (cherry picked from commit 32ab1db)
b70b45e: IDEA-118266 time measurements for all Mercurial commands added and log command debug output suppressed. (cherry picked from commit 75ec80e)
f44f8d8: [^maxmedvedev] gdsl: be prepared to multithreaded scripts (cherry picked from commit a240a44)
6121316: + "trie" (cherry picked from commit 669ae41)
3c8884d: IDEA-118552 Generated ANT scripts do not honour cross-compile settings

Change-Id: I18c031b09527bf8c7de6a529b546e66950a816d3

2 files changed, 13 insertions, 14 deletions

diff --git a/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java b/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java
index a585f8834c25..c666f6e4ab2b 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/stubs/index/DomNamespaceKeyIndex.java
@@ -45,21 +45,20 @@ public class DomNamespaceKeyIndex extends StringStubIndexExtension<PsiFile> {
     if (!(file instanceof VirtualFileWithId)) return false;
 
     final int virtualFileId = ((VirtualFileWithId)file).getId();
-    CommonProcessors.FindFirstProcessor<String> processor =
-      new CommonProcessors.FindFirstProcessor<String>() {
+    CommonProcessors.FindFirstProcessor<PsiFile> processor = new CommonProcessors.FindFirstProcessor<PsiFile>();
+    StubIndex.getInstance().process(
+      KEY,
+      namespaceKey,
+      domFileElement.getFile().getProject(),
+      GlobalSearchScope.fileScope(domFileElement.getFile()),
+      new IdFilter() {
         @Override
-        protected boolean accept(String s) {
-          return namespaceKey.equals(s);
+        public boolean containsFileId(int id) {
+          return id == virtualFileId;
         }
-      };
-    StubIndex.getInstance().processAllKeys(KEY, processor,
-                                           GlobalSearchScope.fileScope(domFileElement.getFile()),
-                                           new IdFilter() {
-                                             @Override
-                                             public boolean containsFileId(int id) {
-                                               return id == virtualFileId;
-                                             }
-                                           });
+      },
+      processor
+    );
     return processor.isFound();
   }
 
diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
index d588d9c8d712..b7f6c81418da 100644
--- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
+++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
@@ -196,7 +196,7 @@ public class XmlBlock extends AbstractXmlBlock {
   }
 
 
-  private List<Block> splitComment() {
+  protected List<Block> splitComment() {
     if (myNode.getElementType() != XmlElementType.XML_COMMENT) return EMPTY;
     final ArrayList<Block> result = new ArrayList<Block>(3);
     ASTNode child = myNode.getFirstChildNode();