Snapshot 568f05589922685b8c8f9a2f2f465043b8128542 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I47fe8cb5d8a3c9876cd4c313dca1a8cc531288ec
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index dec5a0e..7a5798b 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -243,42 +243,44 @@
 ])
 
 binding.setVariable("platformApiModules", [
-        "core-api",
-        "indexing-api",
-        "projectModel-api",
-        "jps-model-api",
-        "platform-api",
-        "lvcs-api",
-        "lang-api",
-        "analysis-api",
-        "vcs-api",
-        "usageView",
-        "xdebugger-api",
-        "xml-openapi",
-        "external-system-api",
+  "analysis-api",
+  "core-api",
+  "external-system-api",
+  "indexing-api",
+  "jps-model-api",
+  "lang-api",
+  "lvcs-api",
+  "projectModel-api",
+  "platform-api",
+  "usageView",
+  "vcs-api",
+  "xdebugger-api",
+  "xml-openapi",
+  "xml-psi-api",
 ])
 
 
 binding.setVariable("platformImplementationModules", [
-        "core-impl",
-        "indexing-impl",
-        "jps-model-impl",
-        "jps-model-serialization",
-        "projectModel-impl",
-        "platform-impl",
-        "vcs-impl",
-        "lang-impl",
-        "analysis-impl",
-        "testRunner",
-        "smRunner",
-        "xdebugger-impl",
-        "xml",
-        "relaxng",
-        "lvcs-impl",
-        "spellchecker",
-        "images",
-        "RegExpSupport",
-        "dvcs"
+  "analysis-impl",
+  "core-impl",
+  "dvcs",
+  "images",
+  "indexing-impl",
+  "jps-model-impl",
+  "jps-model-serialization",
+  "lang-impl",
+  "lvcs-impl",
+  "projectModel-impl",
+  "platform-impl",
+  "vcs-impl",
+  "testRunner",
+  "smRunner",
+  "relaxng",
+  "RegExpSupport",
+  "spellchecker",
+  "xdebugger-impl",
+  "xml",
+  "xml-psi-impl",
 ])
 
 binding.setVariable("layoutMacApp", { String path, String ch, Map args ->