From 1adf63f97db83cc3bfb745f9c52c64485ddfe62f Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Fri, 13 Mar 2015 14:18:53 +0300
Subject: [PATCH 01/27] IDEA-135417 Add an "Uninstall Feedback" page to the
 IntelliJ IDEA uninstaller for Windows

---
 build/conf/nsis/idea.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index 46c084bffd08..c706790bd73c 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -1183,7 +1183,7 @@ done:
 ; UNCOMMENT THIS IN RELEASE BUILD
   !insertmacro INSTALLOPTIONS_READ $R3 "DeleteSettings.ini" "Field 6" "State"
   StrCmp "$R3" "0" end_of_uninstall
-  StrCmp "${UNINSTALL_WEB_PAGE}" "NotRequired"  end_of_uninstall
+  StrCmp "${UNINSTALL_WEB_PAGE}" "feedback_web_page" end_of_uninstall
   ExecShell "" "${UNINSTALL_WEB_PAGE}"
 end_of_uninstall:
 SectionEnd

From 28921aeb16dcb04b0a81ff33897336f7adc58f4b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 13 Mar 2015 12:55:01 +0100
Subject: [PATCH 02/27] Cleanup (minor test fix)

---
 .../com/intellij/util/io/HttpRequestsTest.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java b/platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java
index f35948816f1d..e450a3edefe1 100644
--- a/platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -17,13 +17,18 @@ package com.intellij.util.io;
 
 import com.intellij.ide.IdeBundle;
 import org.jetbrains.annotations.NotNull;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.SocketTimeoutException;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeThat;
 
 public class HttpRequestsTest  {
   private final HttpRequests.RequestProcessor<Void> myProcessor = new HttpRequests.RequestProcessor<Void>() {
@@ -35,6 +40,12 @@ public class HttpRequestsTest  {
     }
   };
 
+  @Before
+  public void setUp() throws Exception {
+    InetAddress addr = InetAddress.getByName("openjdk.java.net");
+    assumeThat(addr, instanceOf(Inet4Address.class));
+  }
+
   @Test
   public void testLimit() {
     try {

From a2127ea189d8fd85459f57cc4facc2282b3ccf18 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 13 Mar 2015 12:55:20 +0100
Subject: [PATCH 03/27] IDEA-134631 (progress dialogs should change modality
 state)

---
 .../ui/impl/DialogWrapperPeerImpl.java        | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
index 902a11e579ce..5fed8076f49f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
@@ -214,7 +214,8 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
 
   @Deprecated
   public DialogWrapperPeerImpl(@NotNull DialogWrapper wrapper,final Window owner, final boolean canBeParent, final boolean applicationModalIfPossible) {
-      this(wrapper, owner, canBeParent, applicationModalIfPossible ? DialogWrapper.IdeModalityType.IDE : DialogWrapper.IdeModalityType.PROJECT);
+      this(wrapper, owner, canBeParent,
+           applicationModalIfPossible ? DialogWrapper.IdeModalityType.IDE : DialogWrapper.IdeModalityType.PROJECT);
   }
 
   @Override
@@ -301,10 +302,6 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
     }
   }
 
-  private boolean isProgressDialog() {
-    return myWrapper.isModalProgress();
-  }
-
   @Override
   @Nullable
   public Container getContentPane() {
@@ -452,11 +449,9 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
       ApplicationManager.getApplication() != null ? (CommandProcessorEx)CommandProcessor.getInstance() : null;
     final boolean appStarted = commandProcessor != null;
 
-    if (myDialog.isModal() && !isProgressDialog()) {
-      if (appStarted) {
-        commandProcessor.enterModal();
-        LaterInvocator.enterModal(myDialog);
-      }
+    if (myDialog.isModal() && appStarted) {
+      commandProcessor.enterModal();
+      LaterInvocator.enterModal(myDialog);
     }
 
     if (appStarted) {
@@ -467,11 +462,9 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
       myDialog.show();
     }
     finally {
-      if (myDialog.isModal() && !isProgressDialog()) {
-        if (appStarted) {
-          commandProcessor.leaveModal();
-          LaterInvocator.leaveModal(myDialog);
-        }
+      if (myDialog.isModal() && appStarted) {
+        commandProcessor.leaveModal();
+        LaterInvocator.leaveModal(myDialog);
       }
 
       myDialog.getFocusManager().doWhenFocusSettlesDown(result.createSetDoneRunnable());

From 1dcec839f5dcc9b5fd113404ab432e0da3f22305 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Fri, 13 Mar 2015 15:12:04 +0300
Subject: [PATCH 04/27] updated uninstaller main page.

---
 build/conf/nsis/idea.nsi | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index c706790bd73c..c2a38147e157 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -973,6 +973,15 @@ Function un.ConfirmDeleteSettings
   !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 3" "Text" "$(text_delete_settings)"
   !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 4" "Text" "$(confirm_delete_caches)"
   !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 5" "Text" "$(confirm_delete_settings)"
+  StrCmp "${UNINSTALL_WEB_PAGE}" "feedback_web_page" hide_feedback_checkbox done
+hide_feedback_checkbox:
+    ; show feedback web page checkbox through uninstall of products which is need.
+    push $R1
+    !insertmacro INSTALLOPTIONS_READ $R1 "DeleteSettings.ini" "Settings" "NumFields"
+    IntOp $R1 $R1 - 1
+    !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Settings" "NumFields" "$R1"
+    pop $R1
+done:
   !insertmacro INSTALLOPTIONS_DISPLAY "DeleteSettings.ini"
 FunctionEnd
 
@@ -1181,9 +1190,9 @@ remove_IntelliJIdeaProjectFile:
 done:
   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}"
 ; UNCOMMENT THIS IN RELEASE BUILD
+  StrCmp "${UNINSTALL_WEB_PAGE}" "feedback_web_page" end_of_uninstall
   !insertmacro INSTALLOPTIONS_READ $R3 "DeleteSettings.ini" "Field 6" "State"
   StrCmp "$R3" "0" end_of_uninstall
-  StrCmp "${UNINSTALL_WEB_PAGE}" "feedback_web_page" end_of_uninstall
   ExecShell "" "${UNINSTALL_WEB_PAGE}"
 end_of_uninstall:
 SectionEnd

From dfbb17f60a69d594a1d1bd299a384516ad15c0b7 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 13 Mar 2015 15:06:29 +0300
Subject: [PATCH 05/27] maven: honor maven-compiler-plugin default source and
 target settings, it's 1.5, independently of the JDK you run maven with;
 related issue - https://youtrack.jetbrains.com/issue/IDEA-135877

---
 .../jetbrains/idea/maven/importing/MavenModuleImporter.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index acae99f054f9..a10ef9750eea 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -341,6 +341,11 @@ public class MavenModuleImporter {
       level = LanguageLevel.parse(myMavenProject.getSourceLevel());
     }
 
+    // default source and target settings of maven-compiler-plugin is 1.5, see details at http://maven.apache.org/plugins/maven-compiler-plugin
+    if (level == null) {
+      level = LanguageLevel.JDK_1_5;
+    }
+
     myRootModelAdapter.setLanguageLevel(level);
   }
 }

From 89eb617831a3bbe94d47d9f8d8fbca3b0057503a Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Fri, 13 Mar 2015 15:31:46 +0300
Subject: [PATCH 06/27] PSI based on Grammar-Kit created for command line
 language in order to implement PY-11855

 * GrammarKit instead of custom parsing
 * ToolWindow instead of popup
 * Inspection and help added
---
 .../CommandLineElementTypes.java              |  36 ++
 .../gnuCommandLine/CommandLineParser.java     | 167 ++++++
 .../gnuCommandLine/_CommandLineLexer.flex     |  42 ++
 .../gnuCommandLine/_CommandLineLexer.java     | 554 ++++++++++++++++++
 .../psi/CommandLineArgument.java              |  16 +
 .../psi/CommandLineCommand.java               |  13 +
 .../gnuCommandLine/psi/CommandLineOption.java |  22 +
 .../psi/CommandLineVisitor.java               |  26 +
 .../psi/impl/CommandLineArgumentImpl.java     |  37 ++
 .../psi/impl/CommandLineCommandImpl.java      |  31 +
 .../psi/impl/CommandLineOptionImpl.java       |  47 ++
 .../provider.py                               |   2 +-
 .../CommandLineInspection.html                |   9 +
 python/src/META-INF/gnu-command-line.xml      |  26 +
 python/src/META-INF/python-core.xml           |   5 +-
 .../commandInterface/command/Argument.java    | 154 +++++
 .../command/ArgumentType.java}                |   6 +-
 .../command/ArgumentsInfo.java                |   2 +-
 .../commandInterface/command/Command.java     |   9 +-
 .../command/KnownArgumentsInfo.java           |   2 +-
 .../command/NoArgumentsInfo.java              |   2 +-
 .../commandInterface/command/Option.java      |  11 +-
 .../command/UnknownArgumentsInfo.java         |   2 +-
 .../command/package-info.java}                |  23 +-
 .../console/CommandExecutor.java              |  70 +++
 .../console/CommandLineConsole.java           | 118 ++++
 .../console/package-info.java}                |  13 +-
 .../CommandLineArgumentReference.java         |  74 +++
 .../CommandLineCommandReference.java          |  76 +++
 .../CommandLineDocumentationProvider.java     |  67 +++
 .../gnuCommandLine/CommandLineElement.java}   |  28 +-
 .../CommandLineElementManipulator.java}       |  25 +-
 .../CommandLineElementReference.java          |  69 +++
 .../CommandLineElementType.java}              |  22 +-
 .../gnuCommandLine/CommandLineFileType.java   |  63 ++
 .../CommandLineFileTypeFactory.java}          |  20 +-
 .../gnuCommandLine/CommandLineInspection.java | 130 ++++
 .../gnuCommandLine/CommandLineLanguage.java}  |  19 +-
 .../CommandLineOptionReference.java           |  60 ++
 .../CommandLineParserDefinition.java          |  90 +++
 .../gnuCommandLine/CommandLineParserUtil.java |  54 ++
 .../CommandLineReferenceContributor.java      |  56 ++
 .../CommandLineSyntaxHighlighterFactory.java  |  78 +++
 .../gnuCommandLine/ValidationResult.java      |  62 ++
 .../gnuCommandLine/command_line.bnf           |  44 ++
 .../gnuCommandLine/package-info.java          |  40 ++
 .../gnuCommandLine/psi/CommandLineFile.java   | 130 ++++
 .../psi/ValidationResultImpl.java             | 215 +++++++
 .../psi/impl/CommandLinePsiImplUtils.java     |  64 ++
 .../psi/impl}/package-info.java               |   9 +-
 .../gnuCommandLine/psi}/package-info.java     |   7 +-
 .../commandInterface/package-info.java        |  55 ++
 .../com/jetbrains/python/PyBundle.properties  |  19 +-
 .../jetbrains/python/WordWithPosition.java    | 158 -----
 .../CommandInterfacePresenter.java            |  50 --
 .../CommandInterfacePresenterAdapter.java     |  38 --
 .../CommandInterfaceView.java                 | 121 ----
 .../commandInterface/command/Argument.java    |  78 ---
 .../command/OptionArgumentInfo.java           |  42 --
 .../OptionChoiceBasedArgumentInfo.java        |  51 --
 .../command/OptionTypedArgumentInfo.java      |  61 --
 .../CommandBasedRangeInfoDriver.java          | 204 -------
 .../CommandExecutor.java                      |  62 --
 .../RangeInfoCollector.java                   | 250 --------
 .../UnusedOptionsCollector.java               |  97 ---
 .../commandBasedRangeDriver/package-info.java |  29 -
 .../python/commandInterface/package-info.java |  46 --
 .../RangeBasedPresenter.java                  | 246 --------
 .../rangeBasedPresenter/RangeInfo.java        | 122 ----
 .../rangeBasedPresenter/RangeInfoDriver.java  |  39 --
 .../rangeBasedPresenter/SuggestionInfo.java   |  79 ---
 .../rangeBasedPresenter/package-info.java     |  32 -
 .../CommandInterfaceViewSwingImpl.form        |  58 --
 .../CommandInterfaceViewSwingImpl.java        | 434 --------------
 .../swingView/CompletionKeyStrokeAction.java  |  34 --
 .../swingView/KeyStrokeAction.java            |  72 ---
 .../swingView/KeyStrokeInfo.java              |  99 ----
 .../swingView/SmartTextField.java             | 170 ------
 .../swingView/SuggestionKeyStrokeAction.java  |  34 --
 .../swingView/package-info.java               |  21 -
 .../python/commandLineParser/CommandLine.java |  78 ---
 .../commandLineParser/CommandLineOption.java  |  69 ---
 .../commandLineParser/CommandLineParser.java  |  34 --
 .../commandLineParser/CommandLinePart.java    |  51 --
 .../optParse/OptParseCommandLineParser.java   | 110 ----
 .../optParse/OptionParser.java                |  34 --
 .../optParse/OptionParserRegexBased.java      |  60 --
 .../commandLineParser/package-info.java       |  29 -
 .../badCommandLineNoCommand.cmdline           |   1 +
 .../badCommandLineWithCommand.cmdline         |   1 +
 .../testData/commandLine/commandLine.cmdline  |   1 +
 python/testData/commandLine/commandLine.txt   |  32 +
 .../commandLine/goodCommandLine.cmdline       |   1 +
 python/testData/commandLine/junk.cmdline      |   1 +
 python/testData/commandLine/junk.txt          |   3 +
 .../commandLine/optionNoValueJunk.cmdline     |   1 +
 .../commandLine/optionNoValueJunk.txt         |   9 +
 .../CommandLineInspectionTest.java            |  75 +++
 .../gnuCommandLine/CommandLineParserTest.java |  60 ++
 .../CommandLineSuggestionTest.java            |  70 +++
 .../gnuCommandLine/CommandTestTools.java      |  91 +++
 101 files changed, 3236 insertions(+), 3323 deletions(-)
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementTypes.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParser.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.flex
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineArgument.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineCommand.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineOption.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineVisitor.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineArgumentImpl.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineCommandImpl.java
 create mode 100644 python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineOptionImpl.java
 create mode 100644 python/resources/inspectionDescriptions/CommandLineInspection.html
 create mode 100644 python/src/META-INF/gnu-command-line.xml
 create mode 100644 python/src/com/jetbrains/commandInterface/command/Argument.java
 rename python/src/com/jetbrains/{python/commandInterface/command/OptionArgumentType.java => commandInterface/command/ArgumentType.java} (82%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/ArgumentsInfo.java (96%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/Command.java (76%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/KnownArgumentsInfo.java (98%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/NoArgumentsInfo.java (95%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/Option.java (89%)
 rename python/src/com/jetbrains/{python => }/commandInterface/command/UnknownArgumentsInfo.java (96%)
 rename python/src/com/jetbrains/{python/commandInterface/rangeBasedPresenter/Executor.java => commandInterface/command/package-info.java} (58%)
 create mode 100644 python/src/com/jetbrains/commandInterface/console/CommandExecutor.java
 create mode 100644 python/src/com/jetbrains/commandInterface/console/CommandLineConsole.java
 rename python/src/com/jetbrains/{python/commandLineParser/MalformedCommandLineException.java => commandInterface/console/package-info.java} (65%)
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineArgumentReference.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineCommandReference.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineDocumentationProvider.java
 rename python/src/com/jetbrains/{python/commandLineParser/optParse/ShortOptionParser.java => commandInterface/gnuCommandLine/CommandLineElement.java} (51%)
 rename python/src/com/jetbrains/{python/commandLineParser/optParse/LongOptionParser.java => commandInterface/gnuCommandLine/CommandLineElementManipulator.java} (54%)
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementReference.java
 rename python/src/com/jetbrains/{python/commandLineParser/CommandLinePartVisitor.java => commandInterface/gnuCommandLine/CommandLineElementType.java} (62%)
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileType.java
 rename python/src/com/jetbrains/{python/commandLineParser/CommandLineArgument.java => commandInterface/gnuCommandLine/CommandLineFileTypeFactory.java} (61%)
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspection.java
 rename python/src/com/jetbrains/{python/commandInterface/swingView/ExecutionKeyStrokeAction.java => commandInterface/gnuCommandLine/CommandLineLanguage.java} (63%)
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineOptionReference.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserDefinition.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserUtil.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineReferenceContributor.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSyntaxHighlighterFactory.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/ValidationResult.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/command_line.bnf
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/package-info.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineFile.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/ValidationResultImpl.java
 create mode 100644 python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLinePsiImplUtils.java
 rename python/src/com/jetbrains/{python/commandInterface/command => commandInterface/gnuCommandLine/psi/impl}/package-info.java (64%)
 rename python/src/com/jetbrains/{python/commandLineParser/optParse => commandInterface/gnuCommandLine/psi}/package-info.java (68%)
 create mode 100644 python/src/com/jetbrains/commandInterface/package-info.java
 delete mode 100644 python/src/com/jetbrains/python/WordWithPosition.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenter.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenterAdapter.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/CommandInterfaceView.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/command/Argument.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/command/OptionArgumentInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/command/OptionChoiceBasedArgumentInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/command/OptionTypedArgumentInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandBasedRangeInfoDriver.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandExecutor.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/RangeInfoCollector.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/UnusedOptionsCollector.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/package-info.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/package-info.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeBasedPresenter.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfoDriver.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/SuggestionInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/package-info.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.form
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/CompletionKeyStrokeAction.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeAction.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeInfo.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/SmartTextField.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/SuggestionKeyStrokeAction.java
 delete mode 100644 python/src/com/jetbrains/python/commandInterface/swingView/package-info.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/CommandLine.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/CommandLineOption.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/CommandLineParser.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/CommandLinePart.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/optParse/OptParseCommandLineParser.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/optParse/OptionParser.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/optParse/OptionParserRegexBased.java
 delete mode 100644 python/src/com/jetbrains/python/commandLineParser/package-info.java
 create mode 100644 python/testData/commandLine/badCommandLineNoCommand.cmdline
 create mode 100644 python/testData/commandLine/badCommandLineWithCommand.cmdline
 create mode 100644 python/testData/commandLine/commandLine.cmdline
 create mode 100644 python/testData/commandLine/commandLine.txt
 create mode 100644 python/testData/commandLine/goodCommandLine.cmdline
 create mode 100644 python/testData/commandLine/junk.cmdline
 create mode 100644 python/testData/commandLine/junk.txt
 create mode 100644 python/testData/commandLine/optionNoValueJunk.cmdline
 create mode 100644 python/testData/commandLine/optionNoValueJunk.txt
 create mode 100644 python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspectionTest.java
 create mode 100644 python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserTest.java
 create mode 100644 python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSuggestionTest.java
 create mode 100644 python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandTestTools.java

diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementTypes.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementTypes.java
new file mode 100644
index 000000000000..d54609b4a048
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementTypes.java
@@ -0,0 +1,36 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.PsiElement;
+import com.intellij.lang.ASTNode;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.impl.*;
+
+public interface CommandLineElementTypes {
+
+  IElementType ARGUMENT = new CommandLineElementType("ARGUMENT");
+  IElementType COMMAND = new CommandLineElementType("COMMAND");
+  IElementType OPTION = new CommandLineElementType("OPTION");
+
+  IElementType EQ = new IElementType("=", null);
+  IElementType LITERAL_STARTS_FROM_DIGIT = new IElementType("LITERAL_STARTS_FROM_DIGIT", null);
+  IElementType LITERAL_STARTS_FROM_LETTER = new IElementType("LITERAL_STARTS_FROM_LETTER", null);
+  IElementType LONG_OPTION_NAME_TOKEN = new IElementType("LONG_OPTION_NAME_TOKEN", null);
+  IElementType SHORT_OPTION_NAME_TOKEN = new IElementType("SHORT_OPTION_NAME_TOKEN", null);
+
+  class Factory {
+    public static PsiElement createElement(ASTNode node) {
+      IElementType type = node.getElementType();
+       if (type == ARGUMENT) {
+        return new CommandLineArgumentImpl(node);
+      }
+      else if (type == COMMAND) {
+        return new CommandLineCommandImpl(node);
+      }
+      else if (type == OPTION) {
+        return new CommandLineOptionImpl(node);
+      }
+      throw new AssertionError("Unknown element type: " + type);
+    }
+  }
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParser.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParser.java
new file mode 100644
index 000000000000..157d84db3c92
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParser.java
@@ -0,0 +1,167 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.PsiBuilder.Marker;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineParserUtil.*;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.tree.TokenSet;
+import com.intellij.lang.PsiParser;
+
+@SuppressWarnings({"SimplifiableIfStatement", "UnusedAssignment"})
+public class CommandLineParser implements PsiParser {
+
+  public ASTNode parse(IElementType t, PsiBuilder b) {
+    parseLight(t, b);
+    return b.getTreeBuilt();
+  }
+
+  public void parseLight(IElementType t, PsiBuilder b) {
+    boolean r;
+    b = adapt_builder_(t, b, this, null);
+    Marker m = enter_section_(b, 0, _COLLAPSE_, null);
+    if (t == ARGUMENT) {
+      r = argument(b, 0);
+    }
+    else if (t == COMMAND) {
+      r = command(b, 0);
+    }
+    else if (t == OPTION) {
+      r = option(b, 0);
+    }
+    else {
+      r = parse_root_(t, b, 0);
+    }
+    exit_section_(b, 0, m, t, r, true, TRUE_CONDITION);
+  }
+
+  protected boolean parse_root_(IElementType t, PsiBuilder b, int l) {
+    return root(b, l + 1);
+  }
+
+  /* ********************************************************** */
+  // LITERAL_STARTS_FROM_LETTER | LITERAL_STARTS_FROM_DIGIT
+  public static boolean argument(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "argument")) return false;
+    if (!nextTokenIs(b, "<argument>", LITERAL_STARTS_FROM_DIGIT, LITERAL_STARTS_FROM_LETTER)) return false;
+    boolean r;
+    Marker m = enter_section_(b, l, _NONE_, "<argument>");
+    r = consumeToken(b, LITERAL_STARTS_FROM_LETTER);
+    if (!r) r = consumeToken(b, LITERAL_STARTS_FROM_DIGIT);
+    exit_section_(b, l, m, ARGUMENT, r, false, null);
+    return r;
+  }
+
+  /* ********************************************************** */
+  // LITERAL_STARTS_FROM_LETTER
+  public static boolean command(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "command")) return false;
+    if (!nextTokenIs(b, LITERAL_STARTS_FROM_LETTER)) return false;
+    boolean r;
+    Marker m = enter_section_(b);
+    r = consumeToken(b, LITERAL_STARTS_FROM_LETTER);
+    exit_section_(b, m, COMMAND, r);
+    return r;
+  }
+
+  /* ********************************************************** */
+  // LONG_OPTION_NAME_TOKEN
+  static boolean long_option_name(PsiBuilder b, int l) {
+    return consumeToken(b, LONG_OPTION_NAME_TOKEN);
+  }
+
+  /* ********************************************************** */
+  // short_option_name <<bound_argument>> ? | long_option_name <<bound_argument>> ?
+  public static boolean option(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "option")) return false;
+    if (!nextTokenIs(b, "<option>", LONG_OPTION_NAME_TOKEN, SHORT_OPTION_NAME_TOKEN)) return false;
+    boolean r;
+    Marker m = enter_section_(b, l, _NONE_, "<option>");
+    r = option_0(b, l + 1);
+    if (!r) r = option_1(b, l + 1);
+    exit_section_(b, l, m, OPTION, r, false, null);
+    return r;
+  }
+
+  // short_option_name <<bound_argument>> ?
+  private static boolean option_0(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "option_0")) return false;
+    boolean r;
+    Marker m = enter_section_(b);
+    r = short_option_name(b, l + 1);
+    r = r && option_0_1(b, l + 1);
+    exit_section_(b, m, null, r);
+    return r;
+  }
+
+  // <<bound_argument>> ?
+  private static boolean option_0_1(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "option_0_1")) return false;
+    bound_argument(b, l + 1);
+    return true;
+  }
+
+  // long_option_name <<bound_argument>> ?
+  private static boolean option_1(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "option_1")) return false;
+    boolean r;
+    Marker m = enter_section_(b);
+    r = long_option_name(b, l + 1);
+    r = r && option_1_1(b, l + 1);
+    exit_section_(b, m, null, r);
+    return r;
+  }
+
+  // <<bound_argument>> ?
+  private static boolean option_1_1(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "option_1_1")) return false;
+    bound_argument(b, l + 1);
+    return true;
+  }
+
+  /* ********************************************************** */
+  // command (argument | option ) *  <<eof>>
+  static boolean root(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "root")) return false;
+    if (!nextTokenIs(b, LITERAL_STARTS_FROM_LETTER)) return false;
+    boolean r;
+    Marker m = enter_section_(b);
+    r = command(b, l + 1);
+    r = r && root_1(b, l + 1);
+    r = r && eof(b, l + 1);
+    exit_section_(b, m, null, r);
+    return r;
+  }
+
+  // (argument | option ) *
+  private static boolean root_1(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "root_1")) return false;
+    int c = current_position_(b);
+    while (true) {
+      if (!root_1_0(b, l + 1)) break;
+      if (!empty_element_parsed_guard_(b, "root_1", c)) break;
+      c = current_position_(b);
+    }
+    return true;
+  }
+
+  // argument | option
+  private static boolean root_1_0(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "root_1_0")) return false;
+    boolean r;
+    Marker m = enter_section_(b);
+    r = argument(b, l + 1);
+    if (!r) r = option(b, l + 1);
+    exit_section_(b, m, null, r);
+    return r;
+  }
+
+  /* ********************************************************** */
+  // SHORT_OPTION_NAME_TOKEN
+  static boolean short_option_name(PsiBuilder b, int l) {
+    return consumeToken(b, SHORT_OPTION_NAME_TOKEN);
+  }
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.flex b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.flex
new file mode 100644
index 000000000000..c242cf062d49
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.flex
@@ -0,0 +1,42 @@
+package com.jetbrains.commandInterface.gnuCommandLine;
+import com.intellij.lexer.*;
+import com.intellij.psi.tree.IElementType;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+
+%%
+
+%{
+  public _CommandLineLexer() {
+    this((java.io.Reader)null);
+  }
+%}
+
+%public
+%class _CommandLineLexer
+%implements FlexLexer
+%function advance
+%type IElementType
+%unicode
+
+EOL="\r"|"\n"|"\r\n"
+LINE_WS=[\ \t\f]
+WHITE_SPACE=({LINE_WS}|{EOL})+
+
+LITERAL_STARTS_FROM_LETTER=[:letter:]([a-zA-Z_0-9]|:|\\|"/"|\.)*
+LITERAL_STARTS_FROM_DIGIT=[:digit:]([a-zA-Z_0-9]|:|\\\|"/"|\.)*
+SHORT_OPTION_NAME_TOKEN=-[:letter:]
+LONG_OPTION_NAME_TOKEN=--[:letter:](-|[a-zA-Z_0-9])*
+
+%%
+<YYINITIAL> {
+  {WHITE_SPACE}                     { return com.intellij.psi.TokenType.WHITE_SPACE; }
+
+  "="                               { return EQ; }
+
+  {LITERAL_STARTS_FROM_LETTER}      { return LITERAL_STARTS_FROM_LETTER; }
+  {LITERAL_STARTS_FROM_DIGIT}       { return LITERAL_STARTS_FROM_DIGIT; }
+  {SHORT_OPTION_NAME_TOKEN}         { return SHORT_OPTION_NAME_TOKEN; }
+  {LONG_OPTION_NAME_TOKEN}          { return LONG_OPTION_NAME_TOKEN; }
+
+  [^] { return com.intellij.psi.TokenType.BAD_CHARACTER; }
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.java
new file mode 100644
index 000000000000..90d9b3af67c6
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.java
@@ -0,0 +1,554 @@
+/* The following code was generated by JFlex 1.4.3 on 12.03.15 21:27 */
+
+package com.jetbrains.commandInterface.gnuCommandLine;
+import com.intellij.lexer.*;
+import com.intellij.psi.tree.IElementType;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+
+
+/**
+ * This class is a scanner generated by 
+ * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
+ * on 12.03.15 21:27 from the specification file
+ * <tt>C:/work/ultimate/community/python/gen/com/jetbrains/commandInterface/gnuCommandLine/_CommandLineLexer.flex</tt>
+ */
+public class _CommandLineLexer implements FlexLexer {
+  /** initial size of the lookahead buffer */
+  private static final int ZZ_BUFFERSIZE = 16384;
+
+  /** lexical states */
+  public static final int YYINITIAL = 0;
+
+  /**
+   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+   *                  at the beginning of a line
+   * l is of the form l = 2*k, k a non negative integer
+   */
+  private static final int ZZ_LEXSTATE[] = { 
+     0, 0
+  };
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final String ZZ_CMAP_PACKED = 
+    "\11\0\1\1\1\1\1\0\1\1\1\1\22\0\1\1\14\0\1\13"+
+    "\1\5\1\7\12\11\1\5\2\0\1\14\3\0\32\4\1\0\1\6"+
+    "\2\0\1\3\1\0\32\4\1\0\1\12\55\0\1\2\12\0\1\2"+
+    "\4\0\1\2\5\0\27\2\1\0\37\2\1\0\u013f\2\31\0\162\2"+
+    "\4\0\14\2\16\0\5\2\11\0\1\2\213\0\1\2\13\0\1\2"+
+    "\1\0\3\2\1\0\1\2\1\0\24\2\1\0\54\2\1\0\46\2"+
+    "\1\0\5\2\4\0\202\2\10\0\105\2\1\0\46\2\2\0\2\2"+
+    "\6\0\20\2\41\0\46\2\2\0\1\2\7\0\47\2\110\0\33\2"+
+    "\5\0\3\2\56\0\32\2\5\0\13\2\25\0\12\10\4\0\2\2"+
+    "\1\0\143\2\1\0\1\2\17\0\2\2\7\0\2\2\12\10\3\2"+
+    "\2\0\1\2\20\0\1\2\1\0\36\2\35\0\3\2\60\0\46\2"+
+    "\13\0\1\2\u0152\0\66\2\3\0\1\2\22\0\1\2\7\0\12\2"+
+    "\4\0\12\10\25\0\10\2\2\0\2\2\2\0\26\2\1\0\7\2"+
+    "\1\0\1\2\3\0\4\2\3\0\1\2\36\0\2\2\1\0\3\2"+
+    "\4\0\12\10\2\2\23\0\6\2\4\0\2\2\2\0\26\2\1\0"+
+    "\7\2\1\0\2\2\1\0\2\2\1\0\2\2\37\0\4\2\1\0"+
+    "\1\2\7\0\12\10\2\0\3\2\20\0\11\2\1\0\3\2\1\0"+
+    "\26\2\1\0\7\2\1\0\2\2\1\0\5\2\3\0\1\2\22\0"+
+    "\1\2\17\0\2\2\4\0\12\10\25\0\10\2\2\0\2\2\2\0"+
+    "\26\2\1\0\7\2\1\0\2\2\1\0\5\2\3\0\1\2\36\0"+
+    "\2\2\1\0\3\2\4\0\12\10\1\0\1\2\21\0\1\2\1\0"+
+    "\6\2\3\0\3\2\1\0\4\2\3\0\2\2\1\0\1\2\1\0"+
+    "\2\2\3\0\2\2\3\0\3\2\3\0\10\2\1\0\3\2\55\0"+
+    "\11\10\25\0\10\2\1\0\3\2\1\0\27\2\1\0\12\2\1\0"+
+    "\5\2\46\0\2\2\4\0\12\10\25\0\10\2\1\0\3\2\1\0"+
+    "\27\2\1\0\12\2\1\0\5\2\3\0\1\2\40\0\1\2\1\0"+
+    "\2\2\4\0\12\10\25\0\10\2\1\0\3\2\1\0\27\2\1\0"+
+    "\20\2\46\0\2\2\4\0\12\10\25\0\22\2\3\0\30\2\1\0"+
+    "\11\2\1\0\1\2\2\0\7\2\72\0\60\2\1\0\2\2\14\0"+
+    "\7\2\11\0\12\10\47\0\2\2\1\0\1\2\2\0\2\2\1\0"+
+    "\1\2\2\0\1\2\6\0\4\2\1\0\7\2\1\0\3\2\1\0"+
+    "\1\2\1\0\1\2\2\0\2\2\1\0\4\2\1\0\2\2\11\0"+
+    "\1\2\2\0\5\2\1\0\1\2\11\0\12\10\2\0\2\2\42\0"+
+    "\1\2\37\0\12\10\26\0\10\2\1\0\42\2\35\0\4\2\164\0"+
+    "\42\2\1\0\5\2\1\0\2\2\25\0\12\10\6\0\6\2\112\0"+
+    "\46\2\12\0\51\2\7\0\132\2\5\0\104\2\5\0\122\2\6\0"+
+    "\7\2\1\0\77\2\1\0\1\2\1\0\4\2\2\0\7\2\1\0"+
+    "\1\2\1\0\4\2\2\0\47\2\1\0\1\2\1\0\4\2\2\0"+
+    "\37\2\1\0\1\2\1\0\4\2\2\0\7\2\1\0\1\2\1\0"+
+    "\4\2\2\0\7\2\1\0\7\2\1\0\27\2\1\0\37\2\1\0"+
+    "\1\2\1\0\4\2\2\0\7\2\1\0\47\2\1\0\23\2\16\0"+
+    "\11\10\56\0\125\2\14\0\u026c\2\2\0\10\2\12\0\32\2\5\0"+
+    "\113\2\25\0\15\2\1\0\4\2\16\0\22\2\16\0\22\2\16\0"+
+    "\15\2\1\0\3\2\17\0\64\2\43\0\1\2\4\0\1\2\3\0"+
+    "\12\10\46\0\12\10\6\0\130\2\10\0\51\2\127\0\35\2\51\0"+
+    "\12\10\36\2\2\0\5\2\u038b\0\154\2\224\0\234\2\4\0\132\2"+
+    "\6\0\26\2\2\0\6\2\2\0\46\2\2\0\6\2\2\0\10\2"+
+    "\1\0\1\2\1\0\1\2\1\0\1\2\1\0\37\2\2\0\65\2"+
+    "\1\0\7\2\1\0\1\2\3\0\3\2\1\0\7\2\3\0\4\2"+
+    "\2\0\6\2\4\0\15\2\5\0\3\2\1\0\7\2\164\0\1\2"+
+    "\15\0\1\2\202\0\1\2\4\0\1\2\2\0\12\2\1\0\1\2"+
+    "\3\0\5\2\6\0\1\2\1\0\1\2\1\0\1\2\1\0\4\2"+
+    "\1\0\3\2\1\0\7\2\3\0\3\2\5\0\5\2\u0ebb\0\2\2"+
+    "\52\0\5\2\5\0\2\2\4\0\126\2\6\0\3\2\1\0\132\2"+
+    "\1\0\4\2\5\0\50\2\4\0\136\2\21\0\30\2\70\0\20\2"+
+    "\u0200\0\u19b6\2\112\0\u51a6\2\132\0\u048d\2\u0773\0\u2ba4\2\u215c\0\u012e\2"+
+    "\2\0\73\2\225\0\7\2\14\0\5\2\5\0\1\2\1\0\12\2"+
+    "\1\0\15\2\1\0\5\2\1\0\1\2\1\0\2\2\1\0\2\2"+
+    "\1\0\154\2\41\0\u016b\2\22\0\100\2\2\0\66\2\50\0\14\2"+
+    "\164\0\5\2\1\0\207\2\23\0\12\10\7\0\32\2\6\0\32\2"+
+    "\13\0\131\2\3\0\6\2\2\0\6\2\2\0\6\2\2\0\3\2"+
+    "\43\0";
+
+  /** 
+   * Translates characters to character classes
+   */
+  private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED);
+
+  /** 
+   * Translates DFA states to action switch labels.
+   */
+  private static final int [] ZZ_ACTION = zzUnpackAction();
+
+  private static final String ZZ_ACTION_PACKED_0 =
+    "\1\0\1\1\1\2\1\3\1\4\1\1\1\5\1\0"+
+    "\1\6\2\0\1\7";
+
+  private static int [] zzUnpackAction() {
+    int [] result = new int[12];
+    int offset = 0;
+    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAction(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /** 
+   * Translates a state to a row index in the transition table
+   */
+  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+  private static final String ZZ_ROWMAP_PACKED_0 =
+    "\0\0\0\15\0\32\0\47\0\64\0\101\0\15\0\116"+
+    "\0\15\0\133\0\150\0\165";
+
+  private static int [] zzUnpackRowMap() {
+    int [] result = new int[12];
+    int offset = 0;
+    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+    int i = 0;  /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int high = packed.charAt(i++) << 16;
+      result[j++] = high | packed.charAt(i++);
+    }
+    return j;
+  }
+
+  /** 
+   * The transition table of the DFA
+   */
+  private static final int [] ZZ_TRANS = zzUnpackTrans();
+
+  private static final String ZZ_TRANS_PACKED_0 =
+    "\1\2\1\3\1\4\1\2\1\4\3\2\2\5\1\2"+
+    "\1\6\1\7\16\0\1\3\16\0\5\4\1\0\1\4"+
+    "\6\0\3\5\1\10\2\0\1\5\5\0\1\11\1\0"+
+    "\1\11\6\0\1\12\13\0\1\13\4\0\1\14\1\0"+
+    "\1\14\17\0\1\5\10\0\2\14\4\0\1\14\1\0"+
+    "\1\14\1\0";
+
+  private static int [] zzUnpackTrans() {
+    int [] result = new int[130];
+    int offset = 0;
+    offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackTrans(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      value--;
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /* error codes */
+  private static final int ZZ_UNKNOWN_ERROR = 0;
+  private static final int ZZ_NO_MATCH = 1;
+  private static final int ZZ_PUSHBACK_2BIG = 2;
+  private static final char[] EMPTY_BUFFER = new char[0];
+  private static final int YYEOF = -1;
+  private static java.io.Reader zzReader = null; // Fake
+
+  /* error messages for the codes above */
+  private static final String ZZ_ERROR_MSG[] = {
+    "Unkown internal scanner error",
+    "Error: could not match input",
+    "Error: pushback value was too large"
+  };
+
+  /**
+   * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
+   */
+  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+  private static final String ZZ_ATTRIBUTE_PACKED_0 =
+    "\1\0\1\11\4\1\1\11\1\0\1\11\2\0\1\1";
+
+  private static int [] zzUnpackAttribute() {
+    int [] result = new int[12];
+    int offset = 0;
+    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /** the current state of the DFA */
+  private int zzState;
+
+  /** the current lexical state */
+  private int zzLexicalState = YYINITIAL;
+
+  /** this buffer contains the current text to be matched and is
+      the source of the yytext() string */
+  private CharSequence zzBuffer = "";
+
+  /** this buffer may contains the current text array to be matched when it is cheap to acquire it */
+  private char[] zzBufferArray;
+
+  /** the textposition at the last accepting state */
+  private int zzMarkedPos;
+
+  /** the textposition at the last state to be included in yytext */
+  private int zzPushbackPos;
+
+  /** the current text position in the buffer */
+  private int zzCurrentPos;
+
+  /** startRead marks the beginning of the yytext() string in the buffer */
+  private int zzStartRead;
+
+  /** endRead marks the last character in the buffer, that has been read
+      from input */
+  private int zzEndRead;
+
+  /**
+   * zzAtBOL == true <=> the scanner is currently at the beginning of a line
+   */
+  private boolean zzAtBOL = true;
+
+  /** zzAtEOF == true <=> the scanner is at the EOF */
+  private boolean zzAtEOF;
+
+  /* user code: */
+  public _CommandLineLexer() {
+    this((java.io.Reader)null);
+  }
+
+
+  public _CommandLineLexer(java.io.Reader in) {
+    this.zzReader = in;
+  }
+
+  /**
+   * Creates a new scanner.
+   * There is also java.io.Reader version of this constructor.
+   *
+   * @param   in  the java.io.Inputstream to read input from.
+   */
+  public _CommandLineLexer(java.io.InputStream in) {
+    this(new java.io.InputStreamReader(in));
+  }
+
+  /** 
+   * Unpacks the compressed character translation table.
+   *
+   * @param packed   the packed character translation table
+   * @return         the unpacked character translation table
+   */
+  private static char [] zzUnpackCMap(String packed) {
+    char [] map = new char[0x10000];
+    int i = 0;  /* index in packed string  */
+    int j = 0;  /* index in unpacked array */
+    while (i < 1222) {
+      int  count = packed.charAt(i++);
+      char value = packed.charAt(i++);
+      do map[j++] = value; while (--count > 0);
+    }
+    return map;
+  }
+
+  public final int getTokenStart(){
+    return zzStartRead;
+  }
+
+  public final int getTokenEnd(){
+    return getTokenStart() + yylength();
+  }
+
+  public void reset(CharSequence buffer, int start, int end,int initialState){
+    zzBuffer = buffer;
+    zzBufferArray = com.intellij.util.text.CharArrayUtil.fromSequenceWithoutCopying(buffer);
+    zzCurrentPos = zzMarkedPos = zzStartRead = start;
+    zzPushbackPos = 0;
+    zzAtEOF  = false;
+    zzAtBOL = true;
+    zzEndRead = end;
+    yybegin(initialState);
+  }
+
+  /**
+   * Refills the input buffer.
+   *
+   * @return      <code>false</code>, iff there was new input.
+   *
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  private boolean zzRefill() throws java.io.IOException {
+    return true;
+  }
+
+
+  /**
+   * Returns the current lexical state.
+   */
+  public final int yystate() {
+    return zzLexicalState;
+  }
+
+
+  /**
+   * Enters a new lexical state
+   *
+   * @param newState the new lexical state
+   */
+  public final void yybegin(int newState) {
+    zzLexicalState = newState;
+  }
+
+
+  /**
+   * Returns the text matched by the current regular expression.
+   */
+  public final CharSequence yytext() {
+    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+  }
+
+
+  /**
+   * Returns the character at position <tt>pos</tt> from the
+   * matched text.
+   *
+   * It is equivalent to yytext().charAt(pos), but faster
+   *
+   * @param pos the position of the character to fetch.
+   *            A value from 0 to yylength()-1.
+   *
+   * @return the character at position pos
+   */
+  public final char yycharat(int pos) {
+    return zzBufferArray != null ? zzBufferArray[zzStartRead+pos]:zzBuffer.charAt(zzStartRead+pos);
+  }
+
+
+  /**
+   * Returns the length of the matched text region.
+   */
+  public final int yylength() {
+    return zzMarkedPos-zzStartRead;
+  }
+
+
+  /**
+   * Reports an error that occured while scanning.
+   *
+   * In a wellformed scanner (no or only correct usage of
+   * yypushback(int) and a match-all fallback rule) this method
+   * will only be called with things that "Can't Possibly Happen".
+   * If this method is called, something is seriously wrong
+   * (e.g. a JFlex bug producing a faulty scanner etc.).
+   *
+   * Usual syntax/scanner level error handling should be done
+   * in error fallback rules.
+   *
+   * @param   errorCode  the code of the errormessage to display
+   */
+  private void zzScanError(int errorCode) {
+    String message;
+    try {
+      message = ZZ_ERROR_MSG[errorCode];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+    }
+
+    throw new Error(message);
+  }
+
+
+  /**
+   * Pushes the specified amount of characters back into the input stream.
+   *
+   * They will be read again by then next call of the scanning method
+   *
+   * @param number  the number of characters to be read again.
+   *                This number must not be greater than yylength()!
+   */
+  public void yypushback(int number)  {
+    if ( number > yylength() )
+      zzScanError(ZZ_PUSHBACK_2BIG);
+
+    zzMarkedPos -= number;
+  }
+
+
+  /**
+   * Resumes scanning until the next regular expression is matched,
+   * the end of input is encountered or an I/O-Error occurs.
+   *
+   * @return      the next token
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  public IElementType advance() throws java.io.IOException {
+    int zzInput;
+    int zzAction;
+
+    // cached fields:
+    int zzCurrentPosL;
+    int zzMarkedPosL;
+    int zzEndReadL = zzEndRead;
+    CharSequence zzBufferL = zzBuffer;
+    char[] zzBufferArrayL = zzBufferArray;
+    char [] zzCMapL = ZZ_CMAP;
+
+    int [] zzTransL = ZZ_TRANS;
+    int [] zzRowMapL = ZZ_ROWMAP;
+    int [] zzAttrL = ZZ_ATTRIBUTE;
+
+    while (true) {
+      zzMarkedPosL = zzMarkedPos;
+
+      zzAction = -1;
+
+      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+      zzState = ZZ_LEXSTATE[zzLexicalState];
+
+
+      zzForAction: {
+        while (true) {
+
+          if (zzCurrentPosL < zzEndReadL)
+            zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
+          else if (zzAtEOF) {
+            zzInput = YYEOF;
+            break zzForAction;
+          }
+          else {
+            // store back cached positions
+            zzCurrentPos  = zzCurrentPosL;
+            zzMarkedPos   = zzMarkedPosL;
+            boolean eof = zzRefill();
+            // get translated positions and possibly new buffer
+            zzCurrentPosL  = zzCurrentPos;
+            zzMarkedPosL   = zzMarkedPos;
+            zzBufferL      = zzBuffer;
+            zzEndReadL     = zzEndRead;
+            if (eof) {
+              zzInput = YYEOF;
+              break zzForAction;
+            }
+            else {
+              zzInput = (zzBufferArrayL != null ? zzBufferArrayL[zzCurrentPosL++] : zzBufferL.charAt(zzCurrentPosL++));
+            }
+          }
+          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ];
+          if (zzNext == -1) break zzForAction;
+          zzState = zzNext;
+
+          int zzAttributes = zzAttrL[zzState];
+          if ( (zzAttributes & 1) == 1 ) {
+            zzAction = zzState;
+            zzMarkedPosL = zzCurrentPosL;
+            if ( (zzAttributes & 8) == 8 ) break zzForAction;
+          }
+
+        }
+      }
+
+      // store back cached position
+      zzMarkedPos = zzMarkedPosL;
+
+      switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+        case 4: 
+          { return LITERAL_STARTS_FROM_DIGIT;
+          }
+        case 8: break;
+        case 1: 
+          { return com.intellij.psi.TokenType.BAD_CHARACTER;
+          }
+        case 9: break;
+        case 3: 
+          { return LITERAL_STARTS_FROM_LETTER;
+          }
+        case 10: break;
+        case 7: 
+          { return LONG_OPTION_NAME_TOKEN;
+          }
+        case 11: break;
+        case 5: 
+          { return EQ;
+          }
+        case 12: break;
+        case 6: 
+          { return SHORT_OPTION_NAME_TOKEN;
+          }
+        case 13: break;
+        case 2: 
+          { return com.intellij.psi.TokenType.WHITE_SPACE;
+          }
+        case 14: break;
+        default:
+          if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+            zzAtEOF = true;
+            return null;
+          }
+          else {
+            zzScanError(ZZ_NO_MATCH);
+          }
+      }
+    }
+  }
+
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineArgument.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineArgument.java
new file mode 100644
index 000000000000..f00290d76698
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineArgument.java
@@ -0,0 +1,16 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface CommandLineArgument extends PsiElement {
+
+  @Nullable
+  PsiElement getLiteralStartsFromDigit();
+
+  @Nullable
+  PsiElement getLiteralStartsFromLetter();
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineCommand.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineCommand.java
new file mode 100644
index 000000000000..c126a1182a65
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineCommand.java
@@ -0,0 +1,13 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface CommandLineCommand extends PsiElement {
+
+  @NotNull
+  PsiElement getLiteralStartsFromLetter();
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineOption.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineOption.java
new file mode 100644
index 000000000000..7b97673a803a
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineOption.java
@@ -0,0 +1,22 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface CommandLineOption extends PsiElement {
+
+  @Nullable
+  PsiElement getLongOptionNameToken();
+
+  @Nullable
+  PsiElement getShortOptionNameToken();
+
+  @Nullable
+  @NonNls
+  String getOptionName();
+
+  boolean isLong();
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineVisitor.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineVisitor.java
new file mode 100644
index 000000000000..ec1a10cd9136
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineVisitor.java
@@ -0,0 +1,26 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.PsiElement;
+
+public class CommandLineVisitor extends PsiElementVisitor {
+
+  public void visitArgument(@NotNull CommandLineArgument o) {
+    visitPsiElement(o);
+  }
+
+  public void visitCommand(@NotNull CommandLineCommand o) {
+    visitPsiElement(o);
+  }
+
+  public void visitOption(@NotNull CommandLineOption o) {
+    visitPsiElement(o);
+  }
+
+  public void visitPsiElement(@NotNull PsiElement o) {
+    visitElement(o);
+  }
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineArgumentImpl.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineArgumentImpl.java
new file mode 100644
index 000000000000..49ff7ec12a0b
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineArgumentImpl.java
@@ -0,0 +1,37 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+
+public class CommandLineArgumentImpl extends CommandLineElement implements CommandLineArgument {
+
+  public CommandLineArgumentImpl(ASTNode node) {
+    super(node);
+  }
+
+  public void accept(@NotNull PsiElementVisitor visitor) {
+    if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitArgument(this);
+    else super.accept(visitor);
+  }
+
+  @Override
+  @Nullable
+  public PsiElement getLiteralStartsFromDigit() {
+    return findChildByType(LITERAL_STARTS_FROM_DIGIT);
+  }
+
+  @Override
+  @Nullable
+  public PsiElement getLiteralStartsFromLetter() {
+    return findChildByType(LITERAL_STARTS_FROM_LETTER);
+  }
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineCommandImpl.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineCommandImpl.java
new file mode 100644
index 000000000000..10f491a82366
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineCommandImpl.java
@@ -0,0 +1,31 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+
+public class CommandLineCommandImpl extends CommandLineElement implements CommandLineCommand {
+
+  public CommandLineCommandImpl(ASTNode node) {
+    super(node);
+  }
+
+  public void accept(@NotNull PsiElementVisitor visitor) {
+    if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitCommand(this);
+    else super.accept(visitor);
+  }
+
+  @Override
+  @NotNull
+  public PsiElement getLiteralStartsFromLetter() {
+    return findNotNullChildByType(LITERAL_STARTS_FROM_LETTER);
+  }
+
+}
diff --git a/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineOptionImpl.java b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineOptionImpl.java
new file mode 100644
index 000000000000..fadf509f0892
--- /dev/null
+++ b/python/gen/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLineOptionImpl.java
@@ -0,0 +1,47 @@
+// This is a generated file. Not intended for manual editing.
+package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
+import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+
+public class CommandLineOptionImpl extends CommandLineElement implements CommandLineOption {
+
+  public CommandLineOptionImpl(ASTNode node) {
+    super(node);
+  }
+
+  public void accept(@NotNull PsiElementVisitor visitor) {
+    if (visitor instanceof CommandLineVisitor) ((CommandLineVisitor)visitor).visitOption(this);
+    else super.accept(visitor);
+  }
+
+  @Override
+  @Nullable
+  public PsiElement getLongOptionNameToken() {
+    return findChildByType(LONG_OPTION_NAME_TOKEN);
+  }
+
+  @Override
+  @Nullable
+  public PsiElement getShortOptionNameToken() {
+    return findChildByType(SHORT_OPTION_NAME_TOKEN);
+  }
+
+  @Nullable
+  @NonNls
+  public String getOptionName() {
+    return CommandLinePsiImplUtils.getOptionName(this);
+  }
+
+  public boolean isLong() {
+    return CommandLinePsiImplUtils.isLong(this);
+  }
+
+}
diff --git a/python/helpers/pycharm/django_manage_commands_provider/provider.py b/python/helpers/pycharm/django_manage_commands_provider/provider.py
index fb1ca00516b0..bf0ca6e8fa69 100644
--- a/python/helpers/pycharm/django_manage_commands_provider/provider.py
+++ b/python/helpers/pycharm/django_manage_commands_provider/provider.py
@@ -18,7 +18,7 @@ __author__ = 'Ilya.Kazakevich'
 version = LooseVersion(django.get_version())
 assert version < LooseVersion('1.8a'), "Only Django <1.8 is supported now"
 # Some django versions require setup
-if django.setup:
+if hasattr(django, 'setup'):
     django.setup()
 dumper = _xml.XmlDumper()
 _optparse.report_data(dumper)
diff --git a/python/resources/inspectionDescriptions/CommandLineInspection.html b/python/resources/inspectionDescriptions/CommandLineInspection.html
new file mode 100644
index 000000000000..f596afc6c4d9
--- /dev/null
+++ b/python/resources/inspectionDescriptions/CommandLineInspection.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+<strong>Command line (commands, arguments and options) inspection.</strong>
+<!-- tooltip end -->
+<p>This inspection checks command you type in command console or command file. It helps you to make sure arguments are on their
+  places, option names are correct as well as arguments, provided for options.</p>
+<p>Do not disable it if you are going to use command-line interfaces like manage.py in Django</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/python/src/META-INF/gnu-command-line.xml b/python/src/META-INF/gnu-command-line.xml
new file mode 100644
index 000000000000..fe41c5b9f616
--- /dev/null
+++ b/python/src/META-INF/gnu-command-line.xml
@@ -0,0 +1,26 @@
+<idea-plugin version="2">
+
+  <!--
+   Extension points to support gnu command line language.
+   See {@link com.jetbrains.commandInterface.gnuCommandLine} package
+  -->
+  <extensions defaultExtensionNs="com.intellij">
+
+
+    <fileTypeFactory implementation="com.jetbrains.commandInterface.gnuCommandLine.CommandLineFileTypeFactory"/>
+    <lang.parserDefinition language="CommandLine"
+                           implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineParserDefinition"/>
+    <lang.syntaxHighlighterFactory key="CommandLine"
+                                   implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineSyntaxHighlighterFactory"/>
+    <psi.referenceContributor implementation="com.jetbrains.commandInterface.gnuCommandLine.CommandLineReferenceContributor"/>
+    <lang.elementManipulator forClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement"
+                             implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementManipulator"/>
+    <localInspection language="CommandLine" shortName="CommandLineInspection" displayName="Command-line inspection"
+                     enabledByDefault="true" level="WARNING"
+                     groupKey="INSP.GROUP.python"
+                     groupBundle="com.jetbrains.python.PyBundle"
+                     implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineInspection"/>
+    <lang.documentationProvider language="CommandLine"
+                                implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineDocumentationProvider"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/python/src/META-INF/python-core.xml b/python/src/META-INF/python-core.xml
index 05ef55dfea7b..d669cb89a7be 100644
--- a/python/src/META-INF/python-core.xml
+++ b/python/src/META-INF/python-core.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2">
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- Components and extensions declared in this file work both in PyCharm and Python plugin.
        Both Community and Professional editions. -->
 
@@ -6,6 +6,9 @@
 
   <module value="com.intellij.modules.python"/>
 
+  <!-- TODO: Doc -->
+  <xi:include href="/META-INF/gnu-command-line.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <extensions defaultExtensionNs="com.intellij">
     <library.type implementation="com.jetbrains.python.library.PythonLibraryType"/>
     <renameHandler implementation="com.jetbrains.python.magicLiteral.PyMagicLiteralRenameHandler"/>
diff --git a/python/src/com/jetbrains/commandInterface/command/Argument.java b/python/src/com/jetbrains/commandInterface/command/Argument.java
new file mode 100644
index 000000000000..4bc8df656656
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/command/Argument.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2000-2014 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.jetbrains.commandInterface.command;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+// TODO: Support regex validation as well
+
+/**
+ * Command argument (positional or option argument)
+ * This class represents command argument, not its value.
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class Argument {
+  /**
+   * Argument help user-readable text
+   */
+  @NotNull
+  private final String myHelpText;
+  /**
+   * List of values argument may have. Null if any value is possible.
+   */
+  @Nullable
+  private final List<String> myAvailableValues;
+  @Nullable
+  private final ArgumentType myType;
+
+
+  /**
+   * @param helpText Argument help user-readable text
+   */
+  public Argument(@NotNull final String helpText) {
+    this(helpText, null, null);
+  }
+
+  /**
+   * @param type Argument value type. Null if any type is possible.
+   */
+  public Argument(@NotNull final ArgumentType type) {
+    this("", type);
+  }
+
+  /**
+   * @param helpText Argument help user-readable text
+   * @param type     Argument value type. Null if any type is possible.
+   */
+  public Argument(@NotNull final String helpText,
+                  @Nullable final ArgumentType type) {
+    this(helpText, null, type);
+  }
+
+  /**
+   * @param availableValues List of values argument may have. Null if any value is possible.
+   */
+  public Argument(@Nullable final List<String> availableValues) {
+    this("", availableValues, null);
+  }
+
+  /**
+   * @param helpText        Argument help user-readable text
+   * @param availableValues List of values argument may have. Null if any value is possible.
+   */
+  public Argument(@NotNull final String helpText, @Nullable final List<String> availableValues) {
+    this(helpText, availableValues, null);
+  }
+
+
+  /**
+   * @param helpText        Argument help user-readable text
+   * @param availableValues List of values argument may have. Null if any value is possible.
+   * @param type            Argument value type. Null if any type is possible.
+   */
+  public Argument(@NotNull final String helpText,
+                  @Nullable final List<String> availableValues,
+                  @Nullable final ArgumentType type) {
+    myHelpText = helpText;
+    myAvailableValues = (availableValues == null ? null : new ArrayList<String>(availableValues));
+    myType = type;
+  }
+
+  /**
+   * @return Argument help user-readable text
+   */
+  @NotNull
+  public String getHelpText() {
+    return myHelpText;
+  }
+
+  /**
+   * @return List of values argument may have. Null if any value is possible.
+   */
+  @Nullable
+  public List<String> getAvailableValues() {
+    return (myAvailableValues == null ? null : Collections.unmodifiableList(myAvailableValues));
+  }
+
+
+  /**
+   * Validates argument value. Argument tries its best to validate value based on information, provided by constructor.
+   *
+   * @param value value to check
+   * @return true if argument may have this value.
+   */
+  public boolean isValid(@NotNull final String value) {
+    if (!isTypeValid(value)) {
+      return false;
+    }
+
+    if (myAvailableValues == null) {
+      return true;
+    }
+    return myAvailableValues.contains(value);
+  }
+
+  /**
+   * Ensures value conforms type (if known)
+   *
+   * @param value value to check
+   * @return false if type is known and it differs from value
+   */
+  private boolean isTypeValid(@NotNull final String value) {
+    // We only check integer for now
+    if (myType == ArgumentType.INTEGER) {
+      try {
+        // We just getCommandLineInfo it to get exception
+        //noinspection ResultOfMethodCallIgnored
+        Integer.parseInt(value);
+      }
+      catch (final NumberFormatException ignored) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/OptionArgumentType.java b/python/src/com/jetbrains/commandInterface/command/ArgumentType.java
similarity index 82%
rename from python/src/com/jetbrains/python/commandInterface/command/OptionArgumentType.java
rename to python/src/com/jetbrains/commandInterface/command/ArgumentType.java
index 9710d03f0530..c1ca9fb105c6 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/OptionArgumentType.java
+++ b/python/src/com/jetbrains/commandInterface/command/ArgumentType.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 /**
- * Argument type to be used with {@link OptionTypedArgumentInfo}
+ * Argument type to be used with {@link Argument}
  * @author Ilya.Kazakevich
  */
-public enum OptionArgumentType {
+public enum ArgumentType {
   /**
    * String (actually, anything)
    */
diff --git a/python/src/com/jetbrains/python/commandInterface/command/ArgumentsInfo.java b/python/src/com/jetbrains/commandInterface/command/ArgumentsInfo.java
similarity index 96%
rename from python/src/com/jetbrains/python/commandInterface/command/ArgumentsInfo.java
rename to python/src/com/jetbrains/commandInterface/command/ArgumentsInfo.java
index c1eb793702e9..aadf5c9c7c77 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/ArgumentsInfo.java
+++ b/python/src/com/jetbrains/commandInterface/command/ArgumentsInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.Nullable;
diff --git a/python/src/com/jetbrains/python/commandInterface/command/Command.java b/python/src/com/jetbrains/commandInterface/command/Command.java
similarity index 76%
rename from python/src/com/jetbrains/python/commandInterface/command/Command.java
rename to python/src/com/jetbrains/commandInterface/command/Command.java
index 295e4a96dc4d..e2ab9e7192fd 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/Command.java
+++ b/python/src/com/jetbrains/commandInterface/command/Command.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
@@ -36,10 +36,13 @@ public interface Command {
   String getName();
 
   /**
+   * @param tryCutOutArguments Try to remove information about arguments from help text (i.e. "[file] removes file" -> "removes file").
+   *                           Command may or may not support it.
+   *                           It should ignore argument if it does not know how to cut out argument info.
    * @return Command readable help text
    */
   @Nullable
-  String getHelp();
+  String getHelp(boolean tryCutOutArguments);
 
 
   /**
@@ -57,7 +60,7 @@ public interface Command {
   /**
    * Execute command
    *
-   * @param module      module to execute command against
+   * @param module     module to execute command against
    * @param parameters command's arguments and options (just like entered by user but splitted by space)
    */
   void execute(@NotNull final Module module, @NotNull final List<String> parameters);
diff --git a/python/src/com/jetbrains/python/commandInterface/command/KnownArgumentsInfo.java b/python/src/com/jetbrains/commandInterface/command/KnownArgumentsInfo.java
similarity index 98%
rename from python/src/com/jetbrains/python/commandInterface/command/KnownArgumentsInfo.java
rename to python/src/com/jetbrains/commandInterface/command/KnownArgumentsInfo.java
index acc88d1e0d74..8f1d54a89a1b 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/KnownArgumentsInfo.java
+++ b/python/src/com/jetbrains/commandInterface/command/KnownArgumentsInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.google.common.base.Preconditions;
 import com.intellij.openapi.util.Pair;
diff --git a/python/src/com/jetbrains/python/commandInterface/command/NoArgumentsInfo.java b/python/src/com/jetbrains/commandInterface/command/NoArgumentsInfo.java
similarity index 95%
rename from python/src/com/jetbrains/python/commandInterface/command/NoArgumentsInfo.java
rename to python/src/com/jetbrains/commandInterface/command/NoArgumentsInfo.java
index 5ea2ba545e8e..e620365526c0 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/NoArgumentsInfo.java
+++ b/python/src/com/jetbrains/commandInterface/command/NoArgumentsInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.Nullable;
diff --git a/python/src/com/jetbrains/python/commandInterface/command/Option.java b/python/src/com/jetbrains/commandInterface/command/Option.java
similarity index 89%
rename from python/src/com/jetbrains/python/commandInterface/command/Option.java
rename to python/src/com/jetbrains/commandInterface/command/Option.java
index f362eda7af1f..01f7f0e3cf69 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/Option.java
+++ b/python/src/com/jetbrains/commandInterface/command/Option.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.google.common.base.Preconditions;
 import com.intellij.openapi.util.Pair;
@@ -37,7 +37,7 @@ public final class Option {
   @NotNull
   private final List<String> myShortNames = new ArrayList<String>();
   @Nullable
-  private final Pair<Integer, OptionArgumentInfo> myArgumentAndQuantity;
+  private final Pair<Integer, Argument> myArgumentAndQuantity;
   @NotNull
   private final String myHelp;
 
@@ -47,7 +47,7 @@ public final class Option {
    * @param shortNames          option short names
    * @param longNames           option long names
    */
-  public Option(@Nullable final Pair<Integer, OptionArgumentInfo> argumentAndQuantity,
+  public Option(@Nullable final Pair<Integer, Argument> argumentAndQuantity,
                 @NotNull final String help,
                 @NotNull final Collection<String> shortNames,
                 @NotNull final Collection<String> longNames) {
@@ -85,11 +85,12 @@ public final class Option {
     return Collections.unmodifiableList(myShortNames);
   }
 
+  // TODO: USe "known arguments info" to prevent copy/paste
   /**
-   * @return if option accepts argument -- pair of [argument_quantity, its_type_info]. Null otherwise.
+   * @return if option accepts argument -- pair of [argument_quantity, argument]. Null otherwise.
    */
   @Nullable
-  public Pair<Integer, OptionArgumentInfo> getArgumentAndQuantity() {
+  public Pair<Integer, Argument> getArgumentAndQuantity() {
     return myArgumentAndQuantity;
   }
 
diff --git a/python/src/com/jetbrains/python/commandInterface/command/UnknownArgumentsInfo.java b/python/src/com/jetbrains/commandInterface/command/UnknownArgumentsInfo.java
similarity index 96%
rename from python/src/com/jetbrains/python/commandInterface/command/UnknownArgumentsInfo.java
rename to python/src/com/jetbrains/commandInterface/command/UnknownArgumentsInfo.java
index bd4701e54713..f6b75ea0d3f9 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/UnknownArgumentsInfo.java
+++ b/python/src/com/jetbrains/commandInterface/command/UnknownArgumentsInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.command;
+package com.jetbrains.commandInterface.command;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/Executor.java b/python/src/com/jetbrains/commandInterface/command/package-info.java
similarity index 58%
rename from python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/Executor.java
rename to python/src/com/jetbrains/commandInterface/command/package-info.java
index 41ed72cec714..96fa66c46a77 100644
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/Executor.java
+++ b/python/src/com/jetbrains/commandInterface/command/package-info.java
@@ -13,24 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.rangeBasedPresenter;
-
-import org.jetbrains.annotations.Nullable;
 
 /**
- * Engine to execute command line
+ * <h1>Command with arguments and options.</h1>
+ * <p>
+ * Each {@link com.jetbrains.commandInterface.command.Command} may have one or more positional {@link com.jetbrains.commandInterface.command.Argument arguments}
+ * and several {@link com.jetbrains.commandInterface.command.Option options} (with arguments as well).
+ * You need to implemenet {@link com.jetbrains.commandInterface.command.Command} first.
+ * </p>
  *
  * @author Ilya.Kazakevich
  */
-public interface Executor {
-  /**
-   * @return information about what to execute (like command name)
-   */
-  @Nullable
-  String getExecutionDescription();
-
-  /**
-   * Execute command!
-   */
-  void execute();
-}
+package com.jetbrains.commandInterface.command;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/commandInterface/console/CommandExecutor.java b/python/src/com/jetbrains/commandInterface/console/CommandExecutor.java
new file mode 100644
index 000000000000..228e084b575d
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/console/CommandExecutor.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.console;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.psi.PsiFileFactory;
+import com.intellij.util.Consumer;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineLanguage;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.python.psi.PyUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * Delegates console execution to command.
+ *
+ * @author Ilya.Kazakevich
+ */
+class CommandExecutor implements Consumer<String> {
+  @NotNull
+  private static final Pattern EMPTY_SPACE = Pattern.compile("\\s+");
+  @NotNull
+  private final Collection<Command> myCommands = new ArrayList<Command>();
+  @NotNull
+  private final Module myModule;
+
+  CommandExecutor(@NotNull final Collection<Command> commands, @NotNull final Module module) {
+    myCommands.addAll(commands);
+    myModule = module;
+  }
+  @Override
+  public final void consume(final String t) {
+    /**
+     * We need to: 1) parse input 2) fetch command 3) split its arguments.
+     */
+    final PsiFileFactory fileFactory = PsiFileFactory.getInstance(myModule.getProject());
+    final CommandLineFile file = PyUtil.as(fileFactory.createFileFromText(CommandLineLanguage.INSTANCE, t), CommandLineFile.class);
+    if (file == null) {
+      return;
+    }
+    final String commandName = file.getCommand();
+
+    for (final Command command : myCommands) {
+      if (command.getName().equals(commandName)) {
+        final List<String> argument = Arrays.asList(EMPTY_SPACE.split(file.getText()));
+        // 1 because we need to command which is on the first place
+        command.execute(myModule, argument.subList(1, argument.size()));
+      }
+    }
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/console/CommandLineConsole.java b/python/src/com/jetbrains/commandInterface/console/CommandLineConsole.java
new file mode 100644
index 000000000000..063d93e5434a
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/console/CommandLineConsole.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.console;
+
+import com.intellij.execution.console.LanguageConsoleBuilder;
+import com.intellij.execution.console.LanguageConsoleImpl;
+import com.intellij.execution.console.LanguageConsoleView;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Condition;
+import com.intellij.openapi.wm.ToolWindow;
+import com.intellij.openapi.wm.ToolWindowAnchor;
+import com.intellij.openapi.wm.ToolWindowManager;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.ContentManager;
+import com.intellij.ui.content.impl.ContentImpl;
+import com.intellij.util.Consumer;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineLanguage;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.python.psi.PyUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Displays command-line console for user.
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineConsole {
+
+  private CommandLineConsole() {
+  }
+
+  /**
+   * Creates and displays command-line console for user.
+   *
+   * @param module      module to display console for.
+   * @param consoleName Console name (would be used in prompt, history etc)
+   * @param commandList list of commands available for this console. You may pass null here, but in this case no validation nor suggestion
+   *                    would work. Additionaly, no executor would be registered, so you will need to use
+   *                    {@link LanguageConsoleBuilder#registerExecuteAction(LanguageConsoleView, Consumer, String, String, Condition)}
+   *                    by yourself passing this method result as arg to enable execution, history etc.
+   * @return newly created console. You do not need to do anything with this value to display console: it will be displayed automatically
+   */
+  @NotNull
+  public static LanguageConsoleView createConsole(
+    @NotNull final Module module,
+    @NotNull final String consoleName,
+    @Nullable final List<Command> commandList) {
+    final Project project = module.getProject();
+    final ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(project);
+    ToolWindow window = toolWindowManager.getToolWindow(consoleName);
+    if (window == null) {
+      window = toolWindowManager.registerToolWindow(consoleName, true, ToolWindowAnchor.BOTTOM);
+    }
+    window.activate(null);
+
+    final ContentManager contentManager = window.getContentManager();
+    contentManager.removeAllContents(true);
+    final LanguageConsoleView console = new LanguageConsoleImpl(project, "", CommandLineLanguage.INSTANCE);
+    console.setPrompt(consoleName + " > ");
+    console.setEditable(true);
+
+    final CommandLineFile file = PyUtil.as(console.getFile(), CommandLineFile.class);
+    if (file != null && commandList != null) {
+      file.setCommands(commandList);
+      LanguageConsoleBuilder.registerExecuteAction(console, new CommandExecutor(commandList, module), consoleName, consoleName, null);
+    }
+
+
+    final Content content = new ContentImpl(console.getComponent(), "", true);
+    contentManager.addContent(content);
+
+    showHiddenCommandWorkAround(console);
+    return console;
+  }
+
+  /**
+   * TODO: Investigate why do we need this hack
+   * For some reason console is not displayed correctly unless we type something to it (i.e. space)
+   *
+   * @param console console to type space
+   */
+  private static void showHiddenCommandWorkAround(@NotNull final LanguageConsoleView console) {
+    console.getComponent().setVisible(true);
+    CommandProcessor.getInstance().executeCommand(null, new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            console.getEditorDocument().insertString(0, " ");
+            console.getComponent().grabFocus();
+          }
+        });
+      }
+    }, null, null);
+  }
+}
+
diff --git a/python/src/com/jetbrains/python/commandLineParser/MalformedCommandLineException.java b/python/src/com/jetbrains/commandInterface/console/package-info.java
similarity index 65%
rename from python/src/com/jetbrains/python/commandLineParser/MalformedCommandLineException.java
rename to python/src/com/jetbrains/commandInterface/console/package-info.java
index 5ef572961036..369b89343156 100644
--- a/python/src/com/jetbrains/python/commandLineParser/MalformedCommandLineException.java
+++ b/python/src/com/jetbrains/commandInterface/console/package-info.java
@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandLineParser;
-
-import org.jetbrains.annotations.NotNull;
 
 /**
- * This exception is thrown when command line can't be parsed
+ * Package to display command line console on the bottom of the screen. It supports history, execution, syntax highlighting and so on.
+ * Entry point is {@link com.jetbrains.commandInterface.console.CommandLineConsole}
  *
  * @author Ilya.Kazakevich
+ * @see com.jetbrains.commandInterface.console.CommandLineConsole
  */
-public class MalformedCommandLineException extends Exception {
-  public MalformedCommandLineException(@NotNull final String message) {
-    super(message);
-  }
-}
+package com.jetbrains.commandInterface.console;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineArgumentReference.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineArgumentReference.java
new file mode 100644
index 000000000000..7a28f7e39ebe
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineArgumentReference.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.codeInsight.completion.PrioritizedLookupElement;
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.psi.PsiElement;
+import com.intellij.util.ArrayUtil;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+import com.jetbrains.commandInterface.command.Option;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Ref to be injected in command line argument
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineArgumentReference extends CommandLineElementReference<CommandLineArgument> {
+  CommandLineArgumentReference(@NotNull final CommandLineArgument element) {
+    super(element);
+  }
+
+  @Nullable
+  @Override
+  public PsiElement resolve() {
+    return null;
+  }
+
+
+  @NotNull
+  @Override
+  public Object[] getVariants() {
+    final ValidationResult validationResult = getValidationResult();
+    if (validationResult == null) {
+      return EMPTY_ARRAY;
+    }
+    final Collection<LookupElement> result = new ArrayList<LookupElement>();
+    final Collection<String> argumentValues = validationResult.getPossibleArgumentValues(getElement());
+
+    // priority is used to display args before options
+    if (argumentValues != null) {
+      for (final String value : argumentValues) {
+        result.add(PrioritizedLookupElement.withPriority(LookupElementBuilder.create(value).withBoldness(true), 1));
+      }
+    }
+
+
+    if (!validationResult.isOptionArgument(getElement())) {
+      for (final Option option : validationResult.getUnusedOptions()) {
+        for (final String value : option.getAllNames()) {
+          result.add(PrioritizedLookupElement.withPriority(LookupElementBuilder.create(value).withTailText(" :" + option.getHelp()), 0));
+        }
+      }
+    }
+    return ArrayUtil.toObjectArray(result);
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineCommandReference.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineCommandReference.java
new file mode 100644
index 000000000000..b90f163b85b4
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineCommandReference.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiElement;
+import com.intellij.util.ArrayUtil;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineCommand;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Ref to be injected in command itself
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineCommandReference extends CommandLineElementReference<CommandLineCommand> {
+
+  CommandLineCommandReference(@NotNull final CommandLineCommand element) {
+    super(element);
+  }
+
+  @Nullable
+  @Override
+  public PsiElement resolve() {
+    return null;
+  }
+
+
+  @NotNull
+  @Override
+  public Object[] getVariants() {
+    final CommandLineFile file = getCommandLineFile();
+    if (file == null) {
+      return EMPTY_ARRAY;
+    }
+    final List<Command> commands = file.getCommands();
+    if (commands == null) {
+      return EMPTY_ARRAY;
+    }
+
+    final Collection<LookupElement> commandNames = new ArrayList<LookupElement>();
+
+    for (final Command command : commands) {
+      LookupElementBuilder lookupElementBuilder = LookupElementBuilder.create(command.getName());
+      final String help = command.getHelp(true);
+      if (!StringUtil.isEmpty(help)) {
+        lookupElementBuilder = lookupElementBuilder.withTailText(" :" + help);
+      }
+      commandNames.add(lookupElementBuilder);
+    }
+
+
+    return ArrayUtil.toObjectArray(commandNames);
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineDocumentationProvider.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineDocumentationProvider.java
new file mode 100644
index 000000000000..043c85d28f0c
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineDocumentationProvider.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.lang.documentation.DocumentationProvider;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiManager;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Provides quick help for arguments
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineDocumentationProvider implements DocumentationProvider {
+  @Nullable
+  @Override
+  public String getQuickNavigateInfo(final PsiElement element, final PsiElement originalElement) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public List<String> getUrlFor(final PsiElement element, final PsiElement originalElement) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public String generateDoc(final PsiElement element, @Nullable final PsiElement originalElement) {
+    if (element instanceof CommandLineFile) {
+      final Command command = ((CommandLineFile)element).findRealCommand();
+      if (command != null) {
+        return command.getHelp(false); // We do not need arguments info in help text
+      }
+    }
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiElement getDocumentationElementForLookupItem(final PsiManager psiManager, final Object object, final PsiElement element) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiElement getDocumentationElementForLink(final PsiManager psiManager, final String link, final PsiElement context) {
+    return null;
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/ShortOptionParser.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElement.java
similarity index 51%
rename from python/src/com/jetbrains/python/commandLineParser/optParse/ShortOptionParser.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElement.java
index 00c72ea2887a..ffbb9e96a44a 100644
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/ShortOptionParser.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElement.java
@@ -13,32 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandLineParser.optParse;
+package com.jetbrains.commandInterface.gnuCommandLine;
 
-import com.intellij.openapi.util.Pair;
+import com.intellij.extapi.psi.ASTWrapperPsiElement;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
- * Deals with short-style options like -b or -f
+ * Parent of all command line elements (enables reference injection, see {@link #getReferences()})
  *
  * @author Ilya.Kazakevich
  */
-final class ShortOptionParser extends OptionParserRegexBased {
-  /**
-   * Short-style option regexp
-   */
-  private static final Pattern SHORT_OPT_PATTERN = Pattern.compile("^(-[a-zA-Z0-9])([^ -])?");
-
-  ShortOptionParser() {
-    super(SHORT_OPT_PATTERN);
+public class CommandLineElement extends ASTWrapperPsiElement {
+  protected CommandLineElement(@NotNull final ASTNode node) {
+    super(node);
   }
 
   @NotNull
   @Override
-  protected Pair<String, String> getOptionTextAndNameFromMatcher(@NotNull final Matcher matcher) {
-    return Pair.create(matcher.group(1), matcher.group(1));
+  public final PsiReference[] getReferences() {
+    // We need it to enable reference injection
+    return ReferenceProvidersRegistry.getReferencesFromProviders(this);
   }
 }
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/LongOptionParser.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementManipulator.java
similarity index 54%
rename from python/src/com/jetbrains/python/commandLineParser/optParse/LongOptionParser.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementManipulator.java
index 82fd6dfe88e4..29794f0dfb65 100644
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/LongOptionParser.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementManipulator.java
@@ -13,30 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandLineParser.optParse;
+package com.jetbrains.commandInterface.gnuCommandLine;
 
-import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.AbstractElementManipulator;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
- * Supports --long-option-style-with=value
+ * Manipulator to support reference injection. Will fail with out of it.
  *
  * @author Ilya.Kazakevich
  */
-final class LongOptionParser extends OptionParserRegexBased {
-  @NotNull
-  private static final Pattern LONG_OPT_PATTERN = Pattern.compile("^((--[a-zA-Z0-9-]+)=?)");
+public final class CommandLineElementManipulator extends AbstractElementManipulator<CommandLineElement> {
 
-  LongOptionParser() {
-    super(LONG_OPT_PATTERN);
-  }
-
-  @NotNull
   @Override
-  protected Pair<String, String> getOptionTextAndNameFromMatcher(@NotNull final Matcher matcher) {
-    return Pair.create(matcher.group(1), matcher.group(2));
+  public CommandLineElement handleContentChange(@NotNull final CommandLineElement element,
+                                                @NotNull final TextRange range,
+                                                final String newContent) {
+    return null;
   }
 }
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementReference.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementReference.java
new file mode 100644
index 000000000000..718ced07423e
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementReference.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReferenceBase;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Parent of all  references injected to command line elements
+ *
+ * @author Ilya.Kazakevich
+ */
+abstract class CommandLineElementReference<T extends PsiElement> extends PsiReferenceBase<T> {
+  protected CommandLineElementReference(@NotNull final T element) {
+    super(element);
+  }
+
+  /**
+   * @return command line file this element sits in (if any)
+   */
+  @Nullable
+  protected final CommandLineFile getCommandLineFile() {
+    return PsiTreeUtil.getParentOfType(getElement(), CommandLineFile.class);
+  }
+
+  /**
+   * @return command line validation result (if any)
+   */
+  @Nullable
+  protected final ValidationResult getValidationResult() {
+    final CommandLineFile file = getCommandLineFile();
+    if (file == null) {
+      return null;
+    }
+    return file.getValidationResult();
+  }
+
+  /**
+   * @return real command used in parent file (if any)
+   */
+  @Nullable
+  protected final Command getCommand() {
+    final CommandLineFile file = getCommandLineFile();
+    if (file == null) {
+      return null;
+    }
+    return file.findRealCommand();
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLinePartVisitor.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementType.java
similarity index 62%
rename from python/src/com/jetbrains/python/commandLineParser/CommandLinePartVisitor.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementType.java
index fe381c0957c4..9ec25beadd31 100644
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLinePartVisitor.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineElementType.java
@@ -13,25 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandLineParser;
+package com.jetbrains.commandInterface.gnuCommandLine;
 
+import com.intellij.psi.tree.IElementType;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Visitor to process options and arguments
+ * Command line element type to be used in parser
  *
  * @author Ilya.Kazakevich
- * @see CommandLinePart#accept(CommandLinePartVisitor)
  */
-public interface CommandLinePartVisitor {
-
-  /**
-   * @param option option to visit
-   */
-  void visitOption(@NotNull CommandLineOption option);
-
-  /**
-   * @param argument argument to visit
-   */
-  void visitArgument(@NotNull CommandLineArgument argument);
+final class CommandLineElementType extends IElementType {
+  CommandLineElementType(@NotNull @NonNls final String debugName) {
+    super(debugName, CommandLineLanguage.INSTANCE);
+  }
 }
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileType.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileType.java
new file mode 100644
index 000000000000..a93020649844
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileType.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.LanguageFileType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+
+/**
+ * Command line file type
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineFileType extends LanguageFileType {
+  public static final FileType INSTANCE = new CommandLineFileType();
+  /**
+   * Command line extension
+   */
+  static final String EXTENSION = "cmdline";
+
+  CommandLineFileType() {
+    super(CommandLineLanguage.INSTANCE);
+  }
+
+  @NotNull
+  @Override
+  public String getName() {
+    return CommandLineLanguage.INSTANCE.getID();
+  }
+
+  @NotNull
+  @Override
+  public String getDescription() {
+    return CommandLineLanguage.INSTANCE.getID();
+  }
+
+  @NotNull
+  @Override
+  public String getDefaultExtension() {
+    return '.' + EXTENSION;
+  }
+
+  @Nullable
+  @Override
+  public Icon getIcon() {
+    return null;
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLineArgument.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileTypeFactory.java
similarity index 61%
rename from python/src/com/jetbrains/python/commandLineParser/CommandLineArgument.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileTypeFactory.java
index 13d92b9b2451..998a6ff82cde 100644
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLineArgument.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineFileTypeFactory.java
@@ -13,24 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandLineParser;
+package com.jetbrains.commandInterface.gnuCommandLine;
 
-import com.jetbrains.python.WordWithPosition;
+import com.intellij.openapi.fileTypes.FileTypeConsumer;
+import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Positional or option argument.
+ * Factory to create command line files
+ *
  * @author Ilya.Kazakevich
  */
-public final class CommandLineArgument extends CommandLinePart {
-
-  public CommandLineArgument(@NotNull final WordWithPosition argumentValue) {
-    super(argumentValue);
-  }
-
-
+public final class CommandLineFileTypeFactory extends FileTypeFactory {
   @Override
-  public void accept(@NotNull final CommandLinePartVisitor visitor) {
-    visitor.visitArgument(this);
+  public void createFileTypes(@NotNull final FileTypeConsumer consumer) {
+    consumer.consume(CommandLineFileType.INSTANCE, CommandLineFileType.EXTENSION);
   }
 }
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspection.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspection.java
new file mode 100644
index 000000000000..edefebcf40d4
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspection.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.codeInspection.*;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.python.PyBundle;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * Inspection that ensures command line options and arguments are correct.
+ * It works only if list of available commands is provided to command file
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineInspection extends LocalInspectionTool {
+
+  @Nls
+  @NotNull
+  @Override
+  public String getDisplayName() {
+    return PyBundle.message("commandLine.inspection.name");
+  }
+
+  @NotNull
+  @Override
+  public String getShortName() {
+    return getClass().getSimpleName();
+  }
+
+  @Override
+  public boolean isEnabledByDefault() {
+    return true;
+  }
+
+  @NotNull
+  @Override
+  public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder,
+                                        final boolean isOnTheFly,
+                                        @NotNull final LocalInspectionToolSession session) {
+    return new MyVisitor(holder);
+  }
+
+  private static final class MyVisitor extends CommandLineVisitor {
+    @NotNull
+    private final ProblemsHolder myHolder;
+
+    private MyVisitor(@NotNull final ProblemsHolder holder) {
+      myHolder = holder;
+    }
+
+    @Nullable
+    private static CommandLineFile getFile(@NotNull final PsiElement element) {
+      return PsiTreeUtil.getParentOfType(element, CommandLineFile.class);
+    }
+
+    @Nullable
+    private static ValidationResult getValidationResult(@NotNull final PsiElement element) {
+      final CommandLineFile file = getFile(element);
+      if (file == null) {
+        return null;
+      }
+      return file.getValidationResult();
+    }
+
+    @Override
+    public void visitCommand(@NotNull final CommandLineCommand o) {
+      super.visitCommand(o);
+      final CommandLineFile file = getFile(o);
+      if (file == null) {
+        return;
+      }
+      final List<Command> commands = file.getCommands();
+      if (commands == null) {
+        return;
+      }
+      for (final Command command : commands) {
+        if (o.getText().equals(command.getName())) {
+          return;
+        }
+      }
+      myHolder.registerProblem(o, PyBundle.message("commandLine.inspection.badCommand"));
+    }
+
+    @Override
+    public void visitOption(@NotNull final CommandLineOption o) {
+      super.visitOption(o);
+      final ValidationResult validationResult = getValidationResult(o);
+      if (validationResult != null && validationResult.isBadValue(o)) {
+        myHolder.registerProblem(o, PyBundle.message("commandLine.inspection.badOption"));
+      }
+    }
+
+
+    @Override
+    public void visitArgument(@NotNull final CommandLineArgument o) {
+      super.visitArgument(o);
+      final ValidationResult validationResult = getValidationResult(o);
+      if (validationResult != null) {
+        if (validationResult.isBadValue(o)) {
+          myHolder.registerProblem(o, PyBundle.message("commandLine.inspection.badArgument"));
+        }
+        else if (validationResult.isExcessArgument(o)) {
+          myHolder.registerProblem(o, PyBundle.message("commandLine.inspection.excessArgument"));
+        }
+      }
+    }
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/ExecutionKeyStrokeAction.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineLanguage.java
similarity index 63%
rename from python/src/com/jetbrains/python/commandInterface/swingView/ExecutionKeyStrokeAction.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineLanguage.java
index 7f258822a968..80a3ad568a46 100644
--- a/python/src/com/jetbrains/python/commandInterface/swingView/ExecutionKeyStrokeAction.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineLanguage.java
@@ -13,22 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.python.commandInterface.swingView;
+package com.jetbrains.commandInterface.gnuCommandLine;
 
-import java.awt.event.ActionEvent;
+import com.intellij.lang.Language;
 
 /**
- * "Execute command" action
- *
+ * Command line language itself
+ * <pre>my_command --option=value foo</pre>
  * @author Ilya.Kazakevich
  */
-final class ExecutionKeyStrokeAction extends KeyStrokeAction {
-  ExecutionKeyStrokeAction() {
-    super(KeyStrokeInfo.EXECUTION);
-  }
+public final class CommandLineLanguage extends Language {
+  public static final CommandLineLanguage INSTANCE = new CommandLineLanguage();
 
-  @Override
-  public void actionPerformed(final ActionEvent e) {
-    myPresenter.executionRequested();
+  private CommandLineLanguage() {
+    super("CommandLine");
   }
 }
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineOptionReference.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineOptionReference.java
new file mode 100644
index 000000000000..d7754748a975
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineOptionReference.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.psi.PsiElement;
+import com.intellij.util.ArrayUtil;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineOption;
+import com.jetbrains.commandInterface.command.Option;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * Ref to be injected into command line option
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineOptionReference extends CommandLineElementReference<CommandLineOption> {
+  CommandLineOptionReference(@NotNull final CommandLineOption element) {
+    super(element);
+  }
+
+  @Nullable
+  @Override
+  public PsiElement resolve() {
+    return null;
+  }
+
+
+  @NotNull
+  @Override
+  public Object[] getVariants() {
+    final ValidationResult validationResult = getValidationResult();
+    if (validationResult == null) {
+      return EMPTY_ARRAY;
+    }
+    final Collection<String> result = new ArrayList<String>();
+
+    for (final Option option : validationResult.getUnusedOptions()) {
+      // Suggest long options for -- and short for -
+      result.addAll((getElement().isLong() ? option.getLongNames() : option.getShortNames()));
+    }
+
+    return ArrayUtil.toStringArray(result);
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserDefinition.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserDefinition.java
new file mode 100644
index 000000000000..6bb73ead2cd1
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserDefinition.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.ParserDefinition;
+import com.intellij.lang.PsiParser;
+import com.intellij.lexer.FlexAdapter;
+import com.intellij.lexer.Lexer;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.FileViewProvider;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.TokenType;
+import com.intellij.psi.tree.IFileElementType;
+import com.intellij.psi.tree.TokenSet;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.Factory;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Command line language parser definition
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineParserDefinition implements ParserDefinition {
+  @NotNull
+  @Override
+  public Lexer createLexer(final Project project) {
+    return new FlexAdapter(new _CommandLineLexer());
+  }
+
+  @Override
+  public PsiParser createParser(final Project project) {
+    return new CommandLineParser();
+  }
+
+  @Override
+  public IFileElementType getFileNodeType() {
+    return new IFileElementType(CommandLineLanguage.INSTANCE);
+  }
+
+
+  @NotNull
+  @Override
+  public TokenSet getWhitespaceTokens() {
+    return TokenSet.create(TokenType.WHITE_SPACE);
+  }
+
+  @NotNull
+  @Override
+  public TokenSet getCommentTokens() {
+    return TokenSet.EMPTY;
+  }
+
+  @NotNull
+  @Override
+  public TokenSet getStringLiteralElements() {
+    return TokenSet.EMPTY;
+  }
+
+  @NotNull
+  @Override
+  public PsiElement createElement(final ASTNode node) {
+    return Factory.createElement(node);
+  }
+
+  @Override
+  public PsiFile createFile(final FileViewProvider viewProvider) {
+    return new CommandLineFile(viewProvider);
+  }
+
+  @Override
+  public SpaceRequirements spaceExistanceTypeBetweenTokens(final ASTNode left, final ASTNode right) {
+    return SpaceRequirements.MAY;
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserUtil.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserUtil.java
new file mode 100644
index 000000000000..7469ab27019e
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserUtil.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.parser.GeneratedParserUtilBase;
+import com.intellij.psi.TokenType;
+import com.intellij.psi.tree.IElementType;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Tool to be used in parser generation to handle "=" for long option
+ *
+ * @author Ilya.Kazakevich
+ */
+final class CommandLineParserUtil extends GeneratedParserUtilBase {
+  private CommandLineParserUtil() {
+  }
+
+  static void bound_argument(@NotNull final PsiBuilder b, final int i) {
+    final IElementType tokenType = b.getTokenType();
+    final IElementType leftElement = b.rawLookup(-1);
+    final IElementType rightElement = b.rawLookup(1);
+    if (leftElement == null || TokenType.WHITE_SPACE.equals(leftElement)) {
+      return;
+    }
+
+    /**
+     * At '=' position: if no whitespace to left and right, we move to argument.
+     * And we report error if whitespace to the left.
+     */
+    if (tokenType == CommandLineElementTypes.EQ) {
+      if (leftElement.equals(CommandLineElementTypes.LONG_OPTION_NAME_TOKEN)) {
+        if (rightElement == null || TokenType.WHITE_SPACE.equals(rightElement)) {
+          b.error("Space between argument is its value is unexpected");
+        }
+        b.advanceLexer();
+      }
+    }
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineReferenceContributor.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineReferenceContributor.java
new file mode 100644
index 000000000000..fb182c719437
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineReferenceContributor.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.patterns.PlatformPatterns;
+import com.intellij.psi.*;
+import com.intellij.util.ProcessingContext;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Injects references to command-line parts
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineReferenceContributor extends PsiReferenceContributor {
+  private static final ReferenceProvider REFERENCE_PROVIDER = new ReferenceProvider();
+
+  @Override
+  public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) {
+    registrar.registerReferenceProvider(PlatformPatterns.psiElement(CommandLineElement.class), REFERENCE_PROVIDER);
+  }
+
+
+  private static class ReferenceProvider extends PsiReferenceProvider {
+    @NotNull
+    @Override
+    public final PsiReference[] getReferencesByElement(@NotNull final PsiElement element,
+                                                       @NotNull final ProcessingContext context) {
+      if (element instanceof CommandLineCommand) {
+        return new PsiReference[]{new CommandLineCommandReference((CommandLineCommand)element)};
+      }
+      if (element instanceof CommandLineArgument) {
+        return new PsiReference[]{new CommandLineArgumentReference((CommandLineArgument)element)};
+      }
+      if (element instanceof CommandLineOption) {
+        return new PsiReference[]{new CommandLineOptionReference((CommandLineOption)element)};
+      }
+      return PsiReference.EMPTY_ARRAY;
+    }
+  }
+}
+
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSyntaxHighlighterFactory.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSyntaxHighlighterFactory.java
new file mode 100644
index 000000000000..c18f97d6ff6e
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSyntaxHighlighterFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.lexer.FlexAdapter;
+import com.intellij.lexer.Lexer;
+import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.util.containers.hash.HashMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+/**
+ * Highlights tokens based on lexer
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineSyntaxHighlighterFactory extends SyntaxHighlighterFactory {
+  @NotNull
+  @Override
+  public SyntaxHighlighter getSyntaxHighlighter(@Nullable final Project project,
+                                                @Nullable final VirtualFile virtualFile) {
+    return new CommandLineSyntaxHighlighter();
+  }
+
+  private static class CommandLineSyntaxHighlighter implements SyntaxHighlighter {
+    private static final Map<IElementType, TextAttributesKey> ATTRIBUTES = new HashMap<IElementType, TextAttributesKey>();
+    public static final TextAttributesKey[] NO_ATTRS = new TextAttributesKey[0];
+
+    static {
+      ATTRIBUTES.put(CommandLineElementTypes.LITERAL_STARTS_FROM_LETTER,
+                     TextAttributesKey.createTextAttributesKey("GNU.LETTER", DefaultLanguageHighlighterColors.LOCAL_VARIABLE)
+      );
+      ATTRIBUTES.put(CommandLineElementTypes.LITERAL_STARTS_FROM_DIGIT,
+                     TextAttributesKey.createTextAttributesKey("GNU.NUMBER", DefaultLanguageHighlighterColors.NUMBER)
+      );
+      ATTRIBUTES.put(CommandLineElementTypes.SHORT_OPTION_NAME_TOKEN,
+                     TextAttributesKey.createTextAttributesKey("GNU.SHORT_OPTION", DefaultLanguageHighlighterColors.INSTANCE_METHOD)
+
+      );
+      ATTRIBUTES.put(CommandLineElementTypes.LONG_OPTION_NAME_TOKEN,
+                     TextAttributesKey.createTextAttributesKey("GNU.LONG_OPTION", DefaultLanguageHighlighterColors.INSTANCE_METHOD)
+      );
+    }
+
+    @NotNull
+    @Override
+    public Lexer getHighlightingLexer() {
+      return new FlexAdapter(new _CommandLineLexer());
+    }
+
+    @NotNull
+    @Override
+    public TextAttributesKey[] getTokenHighlights(final IElementType tokenType) {
+      final TextAttributesKey attributesKey = ATTRIBUTES.get(tokenType);
+      return (attributesKey == null ? NO_ATTRS : new TextAttributesKey[]{attributesKey});
+    }
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/ValidationResult.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/ValidationResult.java
new file mode 100644
index 000000000000..fa14b61fbdcf
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/ValidationResult.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.psi.PsiElement;
+import com.jetbrains.commandInterface.command.Option;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineArgument;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+
+/**
+ * Result of command line validation
+ *
+ * @author Ilya.Kazakevich
+ */
+public interface ValidationResult {
+  /**
+   * @param element element to check
+   * @return true if element is known to have bad/illegal value
+   */
+  boolean isBadValue(@NotNull PsiElement element);
+
+  /**
+   * @param argument element to check
+   * @return true if argument is excess
+   */
+  boolean isExcessArgument(@NotNull CommandLineArgument argument);
+
+  /**
+   * @return list of allowed options unused by user
+   */
+  @NotNull
+  Collection<Option> getUnusedOptions();
+
+  /**
+   * @param argument argument to check
+   * @return true if argument is option argument (position argument otherwise)
+   */
+  boolean isOptionArgument(@NotNull CommandLineArgument argument);
+
+  /**
+   * @param argument argument to check
+   * @return list of available argument values or null if unknown
+   */
+  @Nullable
+  Collection<String> getPossibleArgumentValues(@NotNull CommandLineArgument argument);
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/command_line.bnf b/python/src/com/jetbrains/commandInterface/gnuCommandLine/command_line.bnf
new file mode 100644
index 000000000000..6db74e85957b
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/command_line.bnf
@@ -0,0 +1,44 @@
+/*TODO:Add generation to ant*/
+
+// This file is used to auto-generate lexer and parser for gnu command line language
+// Please make sure .flex, and .java generated files are all in "gen" folder under this module.
+// Generate flex first, then generate lexer by flex, and then generate PSI and parser
+
+{
+   // All 3 elements should implement this class
+   mixin("command")="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement"
+   mixin("argument")="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement"
+   mixin("option")="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement"
+
+   parserClass = 'com.jetbrains.commandInterface.gnuCommandLine.CommandLineParser'
+   parserUtilClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineParserUtil"
+   psiImplUtilClass="com.jetbrains.commandInterface.gnuCommandLine.psi.impl.CommandLinePsiImplUtils"
+   psiPackage = 'com.jetbrains.commandInterface.gnuCommandLine.psi'
+   psiImplPackage = 'com.jetbrains.commandInterface.gnuCommandLine.psi.impl'
+
+   elementTypeHolderClass = 'com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes'
+   psiClassPrefix = "CommandLine"
+   psiVisitorName = "CommandLineVisitor"
+   elementTypeClass = 'com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementType'
+
+
+  tokens=[
+    space='regexp:\s+' // WARNING: Comment out or remove this (space) before generating Flex file! It is here only for live preview.
+    EQ = '='
+    LITERAL_STARTS_FROM_LETTER='regexp:\p{Alpha}(\w|:|\\|/|\.)*'
+    LITERAL_STARTS_FROM_DIGIT='regexp:\p{Digit}(\w|:|\\\|/|\.)*'
+    SHORT_OPTION_NAME_TOKEN='regexp:-\p{Alpha}'
+    LONG_OPTION_NAME_TOKEN='regexp:--\p{Alpha}(-|\w)*'
+  ]
+
+}
+
+root ::= command (argument | option ) *  <<eof>>
+command ::= LITERAL_STARTS_FROM_LETTER
+option ::= (short_option_name <<bound_argument>> ? | long_option_name <<bound_argument>> ?)  {
+methods=[ getOptionName isLong ]
+}
+private short_option_name ::= SHORT_OPTION_NAME_TOKEN
+private long_option_name ::= LONG_OPTION_NAME_TOKEN
+argument ::= LITERAL_STARTS_FROM_LETTER | LITERAL_STARTS_FROM_DIGIT
+
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/package-info.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/package-info.java
new file mode 100644
index 000000000000..d517145ead15
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2015 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.
+ */
+
+/**
+ * <h1>GNU command line language PSI</h1>
+ * <h2>Command line language</h2>
+ * <p>
+ * <a href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02">GNU</a> command line language syntax
+ * based on <a href="http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html">POSIX</a> syntax.
+ * <pre>
+ *   my_command --option --option-2=argument positional_argument -s
+ * </pre>
+ * </p>
+ * <h2>PSI</h2>
+ * <p>Generation based on Grammar-Kit, see .bnf file, do not edit parser nor lexer manually.
+ * When parsed, {@link com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile} is root element for
+ * {@link com.jetbrains.commandInterface.gnuCommandLine.CommandLineLanguage}.
+ * <strong>Warning</strong>: always fill {@link com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile#setCommands(java.util.List)}
+ * if possible.
+ * </p>
+ * <h2>Extension points</h2>
+ * <p>This package has a a lot of extension points (language, inspection etc). Make sure all of them are registered</p>
+ *
+ *
+ * @author Ilya.Kazakevich
+ */
+package com.jetbrains.commandInterface.gnuCommandLine;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineFile.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineFile.java
new file mode 100644
index 000000000000..aff97816cc54
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/CommandLineFile.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import com.intellij.extapi.psi.PsiFileBase;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.util.Key;
+import com.intellij.psi.FileViewProvider;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.jetbrains.commandInterface.gnuCommandLine.CommandLineLanguage;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.gnuCommandLine.ValidationResult;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+
+
+/**
+ * Gnu command line file (topmost element).
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineFile extends PsiFileBase {
+  private static final Key<List<Command>> COMMANDS = Key.create("COMMANDS");
+
+  public CommandLineFile(final FileViewProvider provider) {
+    super(provider, CommandLineLanguage.INSTANCE);
+  }
+
+  @NotNull
+  @Override
+  public FileType getFileType() {
+
+    return getViewProvider().getVirtualFile().getFileType();
+  }
+
+  /**
+   * @return list of commands, available for this file
+   * @see #setCommands(List)
+   */
+  @Nullable
+  public List<Command> getCommands() {
+    return getCopyableUserData(COMMANDS);
+  }
+
+
+  /**
+   * @param commands list of commands, available for this file. Better to provide one, if you know
+   */
+  public void setCommands(@NotNull final List<Command> commands) {
+    putCopyableUserData(COMMANDS, commands);
+  }
+
+
+  /**
+   * Tries to find real command used in this file.
+   * You need to first inject list of commands {@link #setCommands(List)}.
+   *
+   * @return Command if found and available, or null if command can't be parsed or bad command.
+   */
+  @Nullable
+  public Command findRealCommand() {
+    final String command = getCommand();
+    final List<Command> realCommands = getCommands();
+    if (realCommands == null) {
+      return null;
+    }
+
+    for (final Command realCommand : realCommands) {
+      if (realCommand.getName().equals(command)) {
+        return realCommand;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Tries to validate file.
+   *
+   * @return file validation info or null if file is junk or list of commands is unknown (see {@link #setCommands(List)})
+   */
+  @Nullable
+  public ValidationResult getValidationResult() {
+    return ValidationResultImpl.create(this);
+  }
+
+  /**
+   * @return command (text) typed by user. I.e "my_command" in "my_command --foo --bar"
+   */
+  @Nullable
+  public String getCommand() {
+    final CommandLineCommand command = PsiTreeUtil.getChildOfType(this, CommandLineCommand.class);
+    if (command != null) {
+      return command.getText();
+    }
+    return null;
+  }
+
+  /**
+   * @return all arguments from file
+   */
+  @NotNull
+  public Collection<CommandLineArgument> getArguments() {
+    return PsiTreeUtil.findChildrenOfType(this, CommandLineArgument.class);
+  }
+
+  /**
+   * @return all options from file
+   */
+  @NotNull
+  public Collection<CommandLineOption> getOptions() {
+    return PsiTreeUtil.findChildrenOfType(this, CommandLineOption.class);
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/ValidationResultImpl.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/ValidationResultImpl.java
new file mode 100644
index 000000000000..902bd74fa9ae
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/ValidationResultImpl.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine.psi;
+
+import com.intellij.openapi.util.Pair;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.util.containers.hash.HashMap;
+import com.jetbrains.commandInterface.gnuCommandLine.ValidationResult;
+import com.jetbrains.commandInterface.command.Argument;
+import com.jetbrains.commandInterface.command.Command;
+import com.jetbrains.commandInterface.command.Option;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Validation result provider and holder implemented as visitor.
+ * @author Ilya.Kazakevich
+ */
+final class ValidationResultImpl extends CommandLineVisitor implements ValidationResult {
+  /**
+   * List of options with names
+   */
+  @NotNull
+  private final HashMap<String, Option> myOptions = new HashMap<String, Option>();
+  /**
+   * We always need command to validate args
+   */
+  @NotNull
+  private final Command myCommand;
+  /**
+   * Number of next positional argument. I.e. will be 3 for "my_arg arg_1 arg_2"
+   */
+  private int myCurrentPositionArgument;
+  /**
+   * If next arg is supposed to be option arg, then option and number of expected args stored here.
+   * Null stored otherwise.
+   */
+  @Nullable
+  private Pair<Option, Integer> myCurrentOptionAndArgsLeft;
+  /**
+   * List of elements whose values are known to be bad
+   */
+  @NotNull
+  private final Collection<PsiElement> myBadValues = new ArrayList<PsiElement>();
+  /**
+   * List of elements which is known to be excess
+   */
+  @NotNull
+  private final Collection<CommandLineArgument> myExcessArguments = new ArrayList<CommandLineArgument>();
+  /**
+   * Possible values for argument
+   */
+  @NotNull
+  private final Map<CommandLineArgument, List<String>> myPossibleValues = new HashMap<CommandLineArgument, List<String>>();
+  /**
+   * List of arguments known to be option arguments
+   */
+  @NotNull
+  private final Collection<CommandLineArgument> myOptionArguments = new ArrayList<CommandLineArgument>();
+
+  private ValidationResultImpl(@NotNull final Command command) {
+    for (final Option option : command.getOptions()) {
+      for (final String optionName : option.getAllNames()) {
+        myOptions.put(optionName, option);
+      }
+    }
+    myCommand = command;
+  }
+
+  @Override
+  public boolean isBadValue(@NotNull final PsiElement element) {
+    return myBadValues.contains(element);
+  }
+
+  @Override
+  public boolean isExcessArgument(@NotNull final CommandLineArgument argument) {
+    return myExcessArguments.contains(argument);
+  }
+
+  @Override
+  @NotNull
+  public Collection<Option> getUnusedOptions() {
+    return myOptions.values();
+  }
+
+
+  @Override
+  public boolean isOptionArgument(@NotNull final CommandLineArgument argument) {
+    return myOptionArguments.contains(argument);
+  }
+
+  @Override
+  @Nullable
+  public Collection<String> getPossibleArgumentValues(@NotNull final CommandLineArgument argument) {
+    return myPossibleValues.get(argument);
+  }
+
+  /**
+   * Creates validation result by file
+   * @param file file to validate
+   * @return validation result or null if file has no command or command is unknown
+   */
+  @Nullable
+  static ValidationResult create(final CommandLineFile file) {
+    final Command command = file.findRealCommand();
+    if (command == null) {
+      return null;
+    }
+    final ValidationResultImpl validationLayout = new ValidationResultImpl(command);
+    file.acceptChildren(validationLayout);
+    return validationLayout;
+  }
+
+  @Override
+  public void visitArgument(@NotNull final CommandLineArgument o) {
+    super.visitArgument(o);
+    if (myCurrentOptionAndArgsLeft != null) {
+      processOptionArgument(o);
+      return;
+    }
+
+    // Process as positional
+    processPositionalArgument(o);
+  }
+
+  private void processPositionalArgument(@NotNull final CommandLineArgument o) {
+    final Pair<Boolean, Argument> argumentPair = myCommand.getArgumentsInfo().getArgument(myCurrentPositionArgument++);
+    if (argumentPair == null) {
+      myExcessArguments.add(o);
+    }
+    else {
+      processArgument(o, argumentPair.second);
+    }
+  }
+
+  private void processOptionArgument(@NotNull final CommandLineArgument o) {
+    assert myCurrentOptionAndArgsLeft != null: "Method can't be called if no current option exist";
+    if (myCurrentOptionAndArgsLeft.second > 0) {
+      myCurrentOptionAndArgsLeft = Pair.create(myCurrentOptionAndArgsLeft.first, myCurrentOptionAndArgsLeft.second - 1);
+      final Pair<Integer, Argument> argumentAndQuantity = myCurrentOptionAndArgsLeft.first.getArgumentAndQuantity();
+      // TODO: Use class instead of pair to prevent such a stupid checks
+      assert argumentAndQuantity != null: "Option has arguments left but no argument info";
+      final Argument argumentInfo = argumentAndQuantity.getSecond();
+      processArgument(o, argumentInfo);
+
+      myOptionArguments.add(o);
+    }
+    else if (myCurrentOptionAndArgsLeft.second == 0) {
+      myCurrentOptionAndArgsLeft = null;
+      myExcessArguments.add(o);
+    }
+  }
+
+  private void processArgument(@NotNull final CommandLineArgument o, final Argument argumentInfo) {
+    final List<String> availableValues = argumentInfo.getAvailableValues();
+    if (availableValues != null) {
+      myPossibleValues.put(o, availableValues);
+    }
+    if (!argumentInfo.isValid(o.getText())) {
+      myBadValues.add(o);
+    }
+  }
+
+
+  @Override
+  public void visitWhiteSpace(final PsiWhiteSpace space) {
+    super.visitWhiteSpace(space);
+    // -aSHORT_OPT_ARGUMENT, but -a NEW_POSITION_ARGUMENT, so whitespace makes sense
+    if (myCurrentOptionAndArgsLeft != null && myCurrentOptionAndArgsLeft.second == 0) {
+      myCurrentOptionAndArgsLeft = null;
+    }
+  }
+
+  @Override
+  public void visitOption(@NotNull final CommandLineOption o) {
+    super.visitOption(o);
+    if (myOptions.containsKey(o.getOptionName())) {
+      // Remove from list of available options
+      final Option option = myOptions.remove(o.getOptionName());
+      for (final String optionName : option.getAllNames()) {
+        myOptions.remove(optionName);
+      }
+
+      final Pair<Integer, Argument> argumentAndQuantity = option.getArgumentAndQuantity();
+      if (argumentAndQuantity != null) {
+        myCurrentOptionAndArgsLeft = Pair.create(option, argumentAndQuantity.first);
+      }
+      else {
+        myCurrentOptionAndArgsLeft = new Pair<Option, Integer>(option, 0);
+      }
+    }
+    else {
+      myBadValues.add(o); //No such option available
+    }
+  }
+}
diff --git a/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLinePsiImplUtils.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLinePsiImplUtils.java
new file mode 100644
index 000000000000..fe206c750857
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/CommandLinePsiImplUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+
+import com.intellij.psi.PsiElement;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineOption;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Class to be used by autogenerated PSI elements to delegate logic
+ *
+ * @author Ilya.Kazakevich
+ */
+final class CommandLinePsiImplUtils {
+
+
+  private CommandLinePsiImplUtils() {
+  }
+
+  /**
+   * Checks if option is long (--long-option vs -s)
+   *
+   * @param o option
+   * @return true if long
+   */
+  static boolean isLong(@NotNull final CommandLineOption o) {
+    return o.getLongOptionNameToken() != null;
+  }
+
+  /**
+   * Returns option name regardless it is long or short.
+   *
+   * @param o option
+   * @return name (if any)
+   */
+  @Nullable
+  @NonNls
+  static String getOptionName(@NotNull final CommandLineOption o) {
+    final PsiElement longNameToken = o.getLongOptionNameToken();
+    if (longNameToken != null) {
+      return longNameToken.getText();
+    }
+    final PsiElement shortOptionNameToken = o.getShortOptionNameToken();
+    if (shortOptionNameToken != null) {
+      return shortOptionNameToken.getText();
+    }
+    return null;
+  }
+}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/package-info.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/package-info.java
similarity index 64%
rename from python/src/com/jetbrains/python/commandInterface/command/package-info.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/package-info.java
index 2993f12ca968..7b45d7642752 100644
--- a/python/src/com/jetbrains/python/commandInterface/command/package-info.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/impl/package-info.java
@@ -15,9 +15,10 @@
  */
 
 /**
- * Command with arguments and options.
- * Each {@link com.jetbrains.python.commandInterface.command.Command} may have one or more positional {@link com.jetbrains.python.commandInterface.command.Argument arguments}
- * and several {@link com.jetbrains.python.commandInterface.command.Option options}.
+ * Gnu command line language PSI implementation.
+ * Do not use this package directly, consider using interfaces from {@link com.jetbrains.commandInterface.gnuCommandLine.psi} instead.
+ * <strong>Warning</strong>: most files in this package is autogenerated. Do not touch them directly.
+ *
  * @author Ilya.Kazakevich
  */
-package com.jetbrains.python.commandInterface.command;
\ No newline at end of file
+package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/package-info.java b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/package-info.java
similarity index 68%
rename from python/src/com/jetbrains/python/commandLineParser/optParse/package-info.java
rename to python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/package-info.java
index 1a7a6e1b7b42..488377e0eae0 100644
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/package-info.java
+++ b/python/src/com/jetbrains/commandInterface/gnuCommandLine/psi/package-info.java
@@ -15,8 +15,9 @@
  */
 
 /**
- * {@link com.jetbrains.python.commandLineParser.CommandLineParser} based on <a href="https://docs.python.org/2/library/optparse.html">OptParse</a>
- * See {@link com.jetbrains.python.commandLineParser.optParse.OptParseCommandLineParser}
+ * Gnu command line public PSI interfaces: Command, option, argument etc.
+ *
+ * <strong>Warning</strong>: most files in this package is autogenerated. Do not touch them directly.
  * @author Ilya.Kazakevich
  */
-package com.jetbrains.python.commandLineParser.optParse;
\ No newline at end of file
+package com.jetbrains.commandInterface.gnuCommandLine.psi;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/commandInterface/package-info.java b/python/src/com/jetbrains/commandInterface/package-info.java
new file mode 100644
index 000000000000..072fcc6b32d0
--- /dev/null
+++ b/python/src/com/jetbrains/commandInterface/package-info.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2015 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.
+ */
+
+/**
+ * <h1>Command-line interface</h1>
+ * <h2>What is the purpose of this package?</h2>
+ * <p>
+ *   This package is based on ideas of command-line with command, positional arguments, options and their arguments.
+ *   Initial idea is taken from <a href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02">POSIX</a>
+ *   and enhanced by <a href="http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html">GNU</a>.
+ *   It also supported by Python in <a href="https://docs.python.org/2/library/optparse.html">optparse</a> package.
+ *   Command-line is something like
+ *   <pre>my_command positional_argument -s --long-option --another-long-option=arg1 arg2 some_other_arg</pre>
+ *   and this package helps you to parse command lines, highlight errors, display a console-like interface and execute commands.
+ * </p>
+ * <h2>What this package consists of?</h2>
+ * <p>
+ *   This package has 3 subpackages:
+ *   <ol>
+ *     <li>{@link com.jetbrains.commandInterface.command}  contains classes to describe commands, arguments and options.
+ *     It is up to you where to obtain list of available commands, but you should implement {@link com.jetbrains.commandInterface.command.Command}
+ *     first, and create list of it with arguments and options. See package info for more details</li>
+ *     <li>{@link com.jetbrains.commandInterface.gnuCommandLine} is language based on
+ *     <a href="http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html">GNU</a> command line representation.
+ *     It has PSI, so it parses command lines into tree of PsiElements. But this package <strong>is not only for parsing</strong>:
+ *     If you provide list of
+ *     {@link com.jetbrains.commandInterface.command.Command commands} to {@link com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile}
+ *      (see {@link com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile#setCommands(java.util.List)}), it will inject references
+ *      (to provide autocompletion) and activate inspection to validate options and arguments. </li>
+ *      <li>{@link com.jetbrains.commandInterface.console} displays console-like interface at the bottom of the screen to give user
+ *      ability to wotk with your command-line.</li>
+ *   </ol>
+ * </p>
+ * <h2>How to use this package?</h2>
+ *   <ol>
+ *     <li>Implement {@link com.jetbrains.commandInterface.command.Command}</li>
+ *     <li>Create list of {@link com.jetbrains.commandInterface.command.Command commands}</li>
+ *     <li>Provide it to {@link com.jetbrains.commandInterface.console.CommandLineConsole#createConsole(com.intellij.openapi.module.Module, java.lang.String, java.util.List)}</li>
+ *   </ol>
+ * @author Ilya.Kazakevich
+ */
+package com.jetbrains.commandInterface;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/PyBundle.properties b/python/src/com/jetbrains/python/PyBundle.properties
index 9cc1d7bc52d8..bd25c9c31b04 100644
--- a/python/src/com/jetbrains/python/PyBundle.properties
+++ b/python/src/com/jetbrains/python/PyBundle.properties
@@ -864,16 +864,9 @@ remote.interpreter.configure.temp.files.path.label=PyCharm helpers path:
 custom.type.mimic.name=Dynamic class based on {0}
 
 
-# Values for command argument value validation
-commandLine.validation.badCommand=Unknown command
-commandLine.validation.argMissing=Required argument value is missing
-commandLine.validation.optArgMissing=Option argument value is missing
-commandLine.validation.argBadValue=Argument can't have this value
-commandLine.validation.excessArg=Excess argument value
-commandLine.validation.badOption=Bad option or option already set
-commandLine.validation.noArgAllowed=No argument allowed for this option
-# And for labels
-commandLine.subText.key.complete=Use {0} to complete selected variant
-commandLine.subText.key.suggestions=Use {0} to view available values
-commandLine.subText.key.executeUnknown=Click {0} to execute
-commandLine.subText.key.executeCommand=Click {0} to execute "{1}"
+# CommandLine
+commandLine.inspection.name=Command-line inspection
+commandLine.inspection.badCommand=Bad or unknown command. make sure this command really exists.
+commandLine.inspection.badOption=Bad or unknown option. make sure this option really exists.
+commandLine.inspection.badArgument=Argument can't have this value. use autocompletion to check list of possible values.
+commandLine.inspection.excessArgument=Excess argument or argument is not possible here
diff --git a/python/src/com/jetbrains/python/WordWithPosition.java b/python/src/com/jetbrains/python/WordWithPosition.java
deleted file mode 100644
index 0c8043b53a87..000000000000
--- a/python/src/com/jetbrains/python/WordWithPosition.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python;
-
-import com.intellij.util.Range;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Word with range position. To be used to mark some part of text or split it.
- *
- * @author Ilya.Kazakevich
- */
-public final class WordWithPosition extends Range<Integer> {
-  @NotNull
-  private final String myWord;
-
-  /**
-   * Creates word with beam (it has start, but it is infinite)
-   *
-   * @param word word
-   * @param from start
-   */
-  public WordWithPosition(@NotNull final String word, final int from) {
-    this(word, from, Integer.MAX_VALUE);
-  }
-
-  /**
-   * @param word text
-   * @param from from where
-   * @param to   to where
-   */
-  public WordWithPosition(@NotNull final String word, final int from, final int to) {
-    super(from, to);
-    myWord = word;
-  }
-
-  /**
-   * Creates instance with certain text and range (start/end)
-   * @param word text
-   * @param range range
-   */
-  public WordWithPosition(@NotNull final String word, @NotNull final Range<Integer> range) {
-    this(word, range.getFrom(), range.getTo());
-  }
-
-  @NotNull
-  public String getText() {
-    return myWord;
-  }
-
-  /**
-   * Returns texts only from collection of instances of this class
-   *
-   * @param words collection of instances of this class
-   * @return collection of strings (text)
-   */
-  @NotNull
-  public static List<String> fetchText(@NotNull final Collection<WordWithPosition> words) {
-    final List<String> result = new ArrayList<String>(words.size());
-    for (final WordWithPosition word : words) {
-      result.add(word.myWord);
-    }
-    return result;
-  }
-
-  /**
-   * Creates new instance with all fields copied but text
-   *
-   * @param newText new test to add
-   * @return new instance
-   */
-  @NotNull
-  public WordWithPosition copyWithDifferentText(@NotNull final String newText) {
-    return new WordWithPosition(newText, getFrom(), getTo());
-  }
-
-  @Override
-  public String toString() {
-    return "WordWithPosition{" +
-           "myWord='" + myWord + '\'' +
-           ", myFrom=" + getFrom() +
-           ", myTo=" + getTo() +
-           '}';
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    WordWithPosition position = (WordWithPosition)o;
-
-    if (!getFrom().equals(position.getFrom())) return false;
-    if (!getTo().equals(position.getTo())) return false;
-    if (!myWord.equals(position.myWord)) return false;
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = myWord.hashCode();
-    result = 31 * result + getFrom();
-    result = 31 * result + getTo();
-    return result;
-  }
-
-
-  /**
-   * Tool that splits text into parts using one or more whitespace as delimiter.
-   * Each part contains text and boundaries (from and to)
-   *
-   * @param text text to split
-   * @return parse result
-   */
-  @NotNull
-  public static List<WordWithPosition> splitText(@NotNull final String text) {
-    // TODO: Rewrite using regex or scanner?
-    int position = 0;
-    int wordStart = -1;
-    final List<WordWithPosition> parts = new ArrayList<WordWithPosition>();
-    for (final char c : text.toCharArray()) {
-      if (Character.isWhitespace(c) && wordStart != -1) {
-        // Close word
-        parts.add(new WordWithPosition(text.substring(wordStart, position), wordStart, position));
-        wordStart = -1;
-      }
-      else if (!Character.isWhitespace(c) && wordStart == -1) {
-        // Start word
-        wordStart = position;
-      }
-
-      position++;
-    }
-    if (wordStart != -1) {
-      // Adding last word
-      parts.add(new WordWithPosition(text.substring(wordStart), wordStart, position));
-    }
-    return parts;
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenter.java b/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenter.java
deleted file mode 100644
index 1eeecac550e5..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface;
-
-import com.jetbrains.python.vp.Presenter;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Presenter for command-line interface to be paired with view.
- *
- * @author Ilya.Kazakevich
- */
-public interface CommandInterfacePresenter extends Presenter {
-  /**
-   * Called by view when user types new text or text changed by some other reason
-   *
-   */
-  void textChanged();
-
-  /**
-   * Called by view when user requests for completion (like tab)
-   *
-   * @param valueFromSuggestionList value selected from suggestion list (if any selected)
-   */
-  void completionRequested(@Nullable String valueFromSuggestionList);
-
-  /**
-   * Called by view when user asks for suggestions (like CTRL+Space)
-   */
-  void suggestionRequested();
-
-  /**
-   * Called by view when user wants to execute command (like enter)
-   *
-   */
-  void executionRequested();
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenterAdapter.java b/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenterAdapter.java
deleted file mode 100644
index 8983e38f1c10..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/CommandInterfacePresenterAdapter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Adapter that holds view.
- * @author Ilya.Kazakevich
- */
-
-public abstract class CommandInterfacePresenterAdapter implements CommandInterfacePresenter {
-  @NotNull
-  protected final CommandInterfaceView myView;
-
-  protected CommandInterfacePresenterAdapter(@NotNull final CommandInterfaceView view) {
-    myView = view;
-  }
-
-  @Override
-  public void launch() {
-    myView.show();
-  }
-
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/CommandInterfaceView.java b/python/src/com/jetbrains/python/commandInterface/CommandInterfaceView.java
deleted file mode 100644
index 317d4caeed49..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/CommandInterfaceView.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface;
-
-import com.intellij.util.Range;
-import com.jetbrains.python.WordWithPosition;
-import com.jetbrains.python.suggestionList.SuggestionsBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * View for command-line interface to be paired with view.
- *
- * @author Ilya.Kazakevich
- */
-public interface CommandInterfaceView {
-
-  /**
-   * Special place in command line that represents "after the last character" place.
-   * To be used in methods like {@link #setInfoAndErrors(java.util.Collection, java.util.Collection)} to mark it.
-   */
-  @NotNull
-  Range<Integer> AFTER_LAST_CHARACTER_RANGE = new Range<Integer>(Integer.MAX_VALUE, Integer.MAX_VALUE);
-
-  /**
-   * Launches view
-   */
-  void show();
-
-  /**
-   * Suggests user some elements (for completion reason)
-   *
-   * @param suggestions what to suggest (see {@link com.jetbrains.python.suggestionList.SuggestionsBuilder})
-   * @param absolute    display list in its main position, or directly near the caret
-   * @param toSelect    word to select in list (if any)
-   */
-  void displaySuggestions(@NotNull SuggestionsBuilder suggestions, boolean absolute, @Nullable String toSelect);
-
-
-  /**
-   * Each time caret meets certain place, view should check whether some subtext has to be displayed.
-   * There are 2 types of subtext to be displayed:
-   * <ol>
-   * <li>Suggestion Text: View says something like "click FOO to see list of suggestions". Only presenter knows exact places where
-   * suggestions are available, so it should provide them</li>
-   * <li>Default text: In all other cases view displays default text (if available).</li>
-   * </ol>
-   * <p/>
-   * Presenter provides view list of special places
-   *
-   * @param defaultSubText            default text
-   * @param suggestionAvailablePlaces list of places where suggestions are available in format [from, to].
-   */
-  void configureSubTexts(@Nullable String defaultSubText,
-                         @NotNull List<Range<Integer>> suggestionAvailablePlaces);
-
-  /**
-   * Hide suggestion list
-   */
-  void removeSuggestions();
-
-
-  /**
-   * @return text, entered by user
-   */
-  @NotNull
-  String getText();
-
-
-  /**
-   * When caret meets certain place, view may display some info and some errors.
-   * Errors, how ever, may always be emphasized (with something like red line).
-   * This function configures view with pack of ranges and texts to display.
-   * Special place {@link #AFTER_LAST_CHARACTER_RANGE} may also be used.
-   * Each place is described as start-end position (in chars) where it should be enabled.
-   * Each call removes previously enabled information.
-   *
-   * @param errors       places to be marked as errors with error text.
-   * @param infoBalloons places to display info balloon
-   * @see #AFTER_LAST_CHARACTER_RANGE
-   */
-  void setInfoAndErrors(@NotNull final Collection<WordWithPosition> infoBalloons, @NotNull final Collection<WordWithPosition> errors);
-
-
-  /**
-   * Inserts text after caret moving next chars to the right
-   *
-   * @param text text to insert
-   */
-  void insertTextAfterCaret(@NotNull String text);
-
-  /**
-   * Replaces current text with another one.
-   *
-   * @param from    from
-   * @param to      to
-   * @param newText text to replace
-   */
-  void replaceText(final int from, final int to, @NotNull String newText);
-
-  /**
-   * @return position of caret (in chars)
-   */
-  int getCaretPosition();
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/Argument.java b/python/src/com/jetbrains/python/commandInterface/command/Argument.java
deleted file mode 100644
index 4e33c3b585e9..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/command/Argument.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface.command;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-// TODO: Support regex validation as well
-
-/**
- * Command <strong>positional, not named</strong> argument (not option!).
- * This class represents command argument, not its value.
- *
- *
- * @author Ilya.Kazakevich
- */
-public final class Argument {
-  /**
-   * Argument help user-readable text
-   */
-  @NotNull
-  private final String myHelpText;
-  /**
-   * List of values argument may have. Null if any value is possible.
-   */
-  @Nullable
-  private final List<String> myAvailableValues;
-
-
-  /**
-   * @param helpText Argument help user-readable text
-   */
-  public Argument(@NotNull final String helpText) {
-    this(helpText, null);
-  }
-
-  /**
-   * @param helpText        Argument help user-readable text
-   * @param availableValues List of values argument may have. Null if any value is possible.
-   */
-  public Argument(@NotNull final String helpText, @Nullable final List<String> availableValues) {
-    myHelpText = helpText;
-    myAvailableValues = (availableValues == null ? null : new ArrayList<String>(availableValues));
-  }
-
-  /**
-   * @return Argument help user-readable text
-   */
-  @NotNull
-  public String getHelpText() {
-    return myHelpText;
-  }
-
-  /**
-   * @return List of values argument may have. Null if any value is possible.
-   */
-  @Nullable
-  public List<String> getAvailableValues() {
-    return (myAvailableValues == null ? null : Collections.unmodifiableList(myAvailableValues));
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/OptionArgumentInfo.java b/python/src/com/jetbrains/python/commandInterface/command/OptionArgumentInfo.java
deleted file mode 100644
index 33382333a18d..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/command/OptionArgumentInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.command;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-/**
- * Information about option argument
- *
- * @author Ilya.Kazakevich
- */
-public interface OptionArgumentInfo {
-  /**
-   * Validates argument value
-   *
-   * @param value value to validate
-   * @return true if valid
-   */
-  boolean isValid(@NotNull String value);
-
-  /**
-   * @return list of available values (if argument is based on list of choices), or null if any value is accepted (but should be validated)
-   */
-  @Nullable
-  List<String> getAvailableValues();
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/OptionChoiceBasedArgumentInfo.java b/python/src/com/jetbrains/python/commandInterface/command/OptionChoiceBasedArgumentInfo.java
deleted file mode 100644
index 7c037980f1aa..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/command/OptionChoiceBasedArgumentInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.command;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * For options, whose argument is based on list of choices
- * @author Ilya.Kazakevich
- */
-public final class OptionChoiceBasedArgumentInfo implements OptionArgumentInfo {
-  @NotNull
-  private final List<String> myChoices = new ArrayList<String>();
-
-  /**
-   * @param choices available choices
-   */
-  public OptionChoiceBasedArgumentInfo(@NotNull final Collection<String> choices) {
-    myChoices.addAll(choices);
-  }
-
-  @Override
-  public boolean isValid(@NotNull final String value) {
-    return myChoices.contains(value);
-  }
-
-  @Nullable
-  @Override
-  public List<String> getAvailableValues() {
-    return Collections.unmodifiableList(myChoices);
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/command/OptionTypedArgumentInfo.java b/python/src/com/jetbrains/python/commandInterface/command/OptionTypedArgumentInfo.java
deleted file mode 100644
index 42cadf0c5c81..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/command/OptionTypedArgumentInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.command;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-/**
- * For options, whose argument is based on certain type.
- *
- * @author Ilya.Kazakevich
- * @see OptionArgumentType
- */
-public final class OptionTypedArgumentInfo implements OptionArgumentInfo {
-  @NotNull
-  private final OptionArgumentType myType;
-
-  /**
-   * @param type type argument(s) of this option may have
-   */
-  public OptionTypedArgumentInfo(@NotNull final OptionArgumentType type) {
-    myType = type;
-  }
-
-  @Override
-  public boolean isValid(@NotNull final String value) {
-    // We only check integer for now
-    if (myType == OptionArgumentType.INTEGER) {
-      try {
-        // We just getCommandLineInfo it to get exception
-        //noinspection ResultOfMethodCallIgnored
-        Integer.parseInt(value);
-      }
-      catch (final NumberFormatException ignored) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Nullable
-  @Override
-  public List<String> getAvailableValues() {
-    return null;
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandBasedRangeInfoDriver.java b/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandBasedRangeInfoDriver.java
deleted file mode 100644
index a35fd4b8f621..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandBasedRangeInfoDriver.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.commandBasedRangeDriver;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.Range;
-import com.jetbrains.python.PyBundle;
-import com.jetbrains.python.commandInterface.command.Argument;
-import com.jetbrains.python.commandInterface.command.Command;
-import com.jetbrains.python.commandInterface.command.Option;
-import com.jetbrains.python.commandInterface.command.OptionArgumentInfo;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.Executor;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfo;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfoDriver;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.SuggestionInfo;
-import com.jetbrains.python.commandLineParser.CommandLine;
-import com.jetbrains.python.commandLineParser.CommandLineParser;
-import com.jetbrains.python.commandLineParser.CommandLinePart;
-import com.jetbrains.python.commandLineParser.MalformedCommandLineException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-/**
- * Driver that returns pack of range infos for certain command line
- *
- * @author Ilya.Kazakevich
- */
-public final class CommandBasedRangeInfoDriver implements RangeInfoDriver {
-  @NotNull
-  private final Map<String, Command> myCommands = new TreeMap<String, Command>(); // To sort commands by name
-  @NotNull
-  private final Module myModule;
-  @NotNull
-  private final CommandLineParser myCommandLineParser;
-
-  /**
-   *
-   * @param module module (to be used in execution)
-   * @param commandLineParser parser to parse command lines
-   * @param commands available commands
-   */
-  public CommandBasedRangeInfoDriver(
-    @NotNull final Module module,
-    @NotNull final CommandLineParser commandLineParser,
-    @NotNull final Collection<? extends Command> commands) {
-    for (final Command command : commands) {
-      myCommands.put(command.getName(), command);
-    }
-    myModule = module;
-    myCommandLineParser = commandLineParser;
-  }
-
-  @NotNull
-  @Override
-  public Pair<Executor, List<RangeInfo>> getCommandLineInfo(@NotNull final String commandLineText) {
-    // TODO: Copty/paste with exceptiojn
-    if (StringUtil.isEmpty(commandLineText)) {
-      final RangeInfo info = new RangeInfo(null, "", new SuggestionInfo(
-        true, true, myCommands.keySet()
-      ), RangeInfo.TERMINATION_RANGE, false
-      );
-      return new Pair<Executor, List<RangeInfo>>(null, Collections.singletonList(info));
-    }
-    final CommandLine commandLine;
-    try {
-      commandLine = myCommandLineParser.parse(commandLineText);
-    }
-    catch (final MalformedCommandLineException ignored) {
-      return new Pair<Executor, List<RangeInfo>>(null, Collections.singletonList(
-        new RangeInfo(null, PyBundle.message("commandLine.validation.badCommand"), new SuggestionInfo(
-          false, true, myCommands.keySet()
-        ), new Range<Integer>(0, commandLineText.length()), false)
-      ));
-    }
-
-    final Command command = getExistingCommand(commandLine);
-    final List<CommandLinePart> commandLineParts = commandLine.getParts();
-    if (command == null) {
-      // Bad command inserted
-      return createBadCommandInfo(commandLine);
-    }
-
-    final UnusedOptionsCollector unusedOptionsCollector = UnusedOptionsCollector.create(command, commandLineParts);
-    final RangeInfoCollector rangeInfoCollector = RangeInfoCollector.create(command, commandLineParts, unusedOptionsCollector);
-
-
-
-    final SuggestionInfo commandSuggestions = new SuggestionInfo(false, true, myCommands.keySet());
-    // Add command as first range info
-    final List<RangeInfo> rangeInfos =
-      new ArrayList<RangeInfo>(Collections.singletonList(new RangeInfo(null, null, commandSuggestions, commandLine.getCommand(), false)));
-    // Then add collected infos
-    rangeInfos.addAll(rangeInfoCollector.getRangeInfos());
-
-
-    /////// What about "after the caret" ?
-    final Pair<Boolean, Argument> unsatisfiedArgument = rangeInfoCollector.getUnsatisfiedPositionalArgument();
-    final OptionArgumentInfo unsatisfiedOptionArgument = rangeInfoCollector.getUnsatisfiedOptionArgument();
-
-
-    // TODO: Move to collector after test
-    if (unsatisfiedOptionArgument != null) {
-      final List<String> availableValues = unsatisfiedOptionArgument.getAvailableValues();
-      final SuggestionInfo suggestionInfo;
-      if (availableValues != null) {
-
-        suggestionInfo =
-          new SuggestionInfo(false, false, availableValues);
-      }
-      else {
-        suggestionInfo = null;
-      }
-      rangeInfos
-        .add(new RangeInfo(null, PyBundle.message("commandLine.validation.optArgMissing"), suggestionInfo, RangeInfo.TERMINATION_RANGE,
-                           false));
-    }
-    else if (unsatisfiedArgument != null) {
-      final boolean required = unsatisfiedArgument.first;
-      final Argument argument = unsatisfiedArgument.second;
-      // Only add error if required
-      final String error = required ? PyBundle.message("commandLine.validation.argMissing") : null;
-      final List<String> availableValues = unusedOptionsCollector.addUnusedOptions(argument.getAvailableValues());
-      final RangeInfo lastArgInfo =
-        new RangeInfo(argument.getHelpText(), error,
-                      (availableValues != null ? new SuggestionInfo(false, false, availableValues) : null), RangeInfo.TERMINATION_RANGE,
-                      false);
-      rangeInfos.add(lastArgInfo);
-    }
-    else {
-      // Looks like all arguments are satisfied. Adding empty chunk to prevent completion etc.
-      // This is a hack, but with out of it last range info will always be used, even 200 chars after last place
-      rangeInfos.add(new RangeInfo(null, null, rangeInfoCollector.getCurrentSuggestions(false, null), RangeInfo.TERMINATION_RANGE, false));
-    }
-
-    assert rangeInfos.size() >= commandLineParts.size() : "Contract broken: not enough chunks";
-    return Pair.<Executor, List<RangeInfo>>create(new CommandExecutor(command, myModule, commandLine.getPartsAsText()), rangeInfos);
-  }
-
-  @Nullable
-  private Command getExistingCommand(@NotNull final CommandLine commandLine) {
-    return myCommands.get(commandLine.getCommand().getText());
-  }
-
-
-  /**
-   * Creates range info info signaling command is bad or junk
-   *
-   *
-   * @param commandLine command line passed by user
-   * @return  info to return
-   */
-  @NotNull
-  private Pair<Executor, List<RangeInfo>> createBadCommandInfo(final CommandLine commandLine) {
-    final List<RangeInfo> result = new ArrayList<RangeInfo>();
-    // We know that first chunk command line, but we can't say anything about outher chunks except they are bad.
-    // How ever, we must say something
-    result
-      .add(new RangeInfo(null, PyBundle.message("commandLine.validation.badCommand"), new SuggestionInfo(true, true, myCommands.keySet()),
-                         commandLine.getCommand(), false));
-    // Command is unknown, all other parts are junk
-    for (final CommandLinePart part : commandLine.getParts()) {
-      result.add(new RangeInfo(null, "", false, part.getWord()));
-    }
-
-
-    return Pair.create(null, result);
-  }
-
-
-  /**
-   * Finds option by its name
-   * @param command current command
-   * @param optionName option name
-   * @return option or null if no option found
-   */
-  @Nullable
-  static Option findOptionByName(@NotNull final Command command, @NotNull final String optionName) {
-    for (final Option option : command.getOptions()) {
-      for (final String name : option.getAllNames()) {
-        if (name.equals(optionName)) {
-          return option;
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandExecutor.java b/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandExecutor.java
deleted file mode 100644
index 992f00c1fc45..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/CommandExecutor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.commandBasedRangeDriver;
-
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.ArrayUtil;
-import com.jetbrains.python.commandInterface.command.Command;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.Executor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-
-/**
- * Executes commands according to {@link Executor} contract
- *
- * @author Ilya.Kazakevich
- */
-final class CommandExecutor implements Executor {
-  @NotNull
-  private final Command myCommand;
-  @NotNull
-  private final Module myModule;
-  @NotNull
-  private final String[] myArguments;
-
-  /**
-   * @param command       command to execute
-   * @param module        module to execute against
-   * @param argumentsLine all command arguments as testline
-   */
-  CommandExecutor(@NotNull final Command command, @NotNull final Module module, @NotNull final String argumentsLine) {
-    myCommand = command;
-    myModule = module;
-    myArguments = (StringUtil.isEmpty(argumentsLine) ? ArrayUtil.EMPTY_STRING_ARRAY : argumentsLine.split(" "));
-  }
-
-  @Nullable
-  @Override
-  public String getExecutionDescription() {
-    return myCommand.getHelp();
-  }
-
-  @Override
-  public void execute() {
-    myCommand.execute(myModule, Arrays.asList(myArguments));
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/RangeInfoCollector.java b/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/RangeInfoCollector.java
deleted file mode 100644
index cf2f92edf34e..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/RangeInfoCollector.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.commandBasedRangeDriver;
-
-import com.google.common.collect.Sets;
-import com.intellij.openapi.util.Pair;
-import com.intellij.util.containers.HashSet;
-import com.jetbrains.python.PyBundle;
-import com.jetbrains.python.WordWithPosition;
-import com.jetbrains.python.commandInterface.command.Argument;
-import com.jetbrains.python.commandInterface.command.Command;
-import com.jetbrains.python.commandInterface.command.Option;
-import com.jetbrains.python.commandInterface.command.OptionArgumentInfo;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfo;
-import com.jetbrains.python.commandInterface.rangeBasedPresenter.SuggestionInfo;
-import com.jetbrains.python.commandLineParser.CommandLineArgument;
-import com.jetbrains.python.commandLineParser.CommandLineOption;
-import com.jetbrains.python.commandLineParser.CommandLinePart;
-import com.jetbrains.python.commandLineParser.CommandLinePartVisitor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-/**
- * Visitor that collections ranges info by visiting options and arguments
- *
- * @author Ilya.Kazakevich
- */
-final class RangeInfoCollector implements CommandLinePartVisitor {
-  /**
-   * Options already met in command line. It has nothing to do with {@link UnusedOptionsCollector}!
-   */
-  @NotNull
-  private final Set<String> myUsedOptions = new HashSet<String>();
-  @NotNull
-  private final List<RangeInfo> myRangeInfos = new ArrayList<RangeInfo>();
-  @NotNull
-  private final Command myCommand;
-
-  private int myNumOfProcessedPositionalArguments = 0;
-  private boolean mySkipNextArgument;
-  private Pair<Integer, OptionArgumentInfo> myExpectedOptionArgument;
-  @NotNull
-  private final UnusedOptionsCollector myUnusedOptionsCollector;
-
-  /**
-   * @param command                command
-   * @param unusedOptionsCollector instance of unused options collector
-   */
-  private RangeInfoCollector(@NotNull final Command command,
-                             @NotNull final UnusedOptionsCollector unusedOptionsCollector) {
-    myCommand = command;
-    myUnusedOptionsCollector = unusedOptionsCollector;
-  }
-
-  @NotNull
-  static RangeInfoCollector create(@NotNull final Command command,
-                                   @NotNull final Iterable<CommandLinePart> commandLineParts,
-                                   @NotNull final UnusedOptionsCollector unusedOptionsCollector) {
-    final RangeInfoCollector infoCollector = new RangeInfoCollector(command, unusedOptionsCollector);
-    for (final CommandLinePart part : commandLineParts) {
-      part.accept(infoCollector);
-    }
-    return infoCollector;
-  }
-
-  @Override
-  public void visitOption(@NotNull final CommandLineOption option) {
-    if (processOptionArgument(option.getWord())) {
-      return;
-    }
-
-
-    final Option commandOption = CommandBasedRangeInfoDriver.findOptionByName(myCommand, option.getOptionName());
-    final WordWithPosition attachedArgument = option.getAttachedArgument();
-    if (commandOption == null) {
-      // There is no such option
-      // To Mark attached arg so we skip it in {@link #visitArgument}
-      if (attachedArgument != null) {
-        mySkipNextArgument = true;
-      }
-      // No such option
-      myRangeInfos.add(new RangeInfo(null, PyBundle.message("commandLine.validation.badOption"), getCurrentSuggestions(false, null),
-                                     option.getWord(), false));
-      return;
-    }
-
-
-    final Pair<Integer, OptionArgumentInfo> argumentAndQuantity = commandOption.getArgumentAndQuantity();
-
-
-    // If option already used, then mark it
-    final String optionAlreadyUsed = Sets.intersection(Sets.newHashSet(commandOption.getAllNames()), myUsedOptions).isEmpty()
-                                     ? null
-                                     : PyBundle.message("commandLine.validation.badOption");
-    myRangeInfos
-      .add(new RangeInfo(commandOption.getHelp(), optionAlreadyUsed, getCurrentSuggestions(false, null), option.getWord(),
-                         argumentAndQuantity != null));
-
-    // remove from existing options
-    myUsedOptions.addAll(commandOption.getAllNames());
-
-
-    if (argumentAndQuantity == null) {
-      if (attachedArgument != null) {
-        myRangeInfos.add(new RangeInfo(null, PyBundle.message("commandLine.validation.noArgAllowed"), false, attachedArgument));
-        mySkipNextArgument = true;
-      }
-    }
-    else {
-      // Some option args required
-      myExpectedOptionArgument = argumentAndQuantity;
-    }
-  }
-
-  /**
-   * Process option argument (not to be confused with positional!)
-   *
-   * @param currentPart part with argument.
-   * @return false if there should not be any option argument so this method did nothing. True if there should be and it is processed.
-   */
-  private boolean processOptionArgument(@NotNull final WordWithPosition currentPart) {
-    if (myExpectedOptionArgument == null) {
-      return false;
-    }
-    final OptionArgumentInfo argumentInfo = myExpectedOptionArgument.second;
-    int argsLeft = myExpectedOptionArgument.first;
-
-    final boolean valid = argumentInfo.isValid(currentPart.getText());
-    final List<String> availableValues = argumentInfo.getAvailableValues();
-    final SuggestionInfo suggestions;
-    if (availableValues != null) {
-      suggestions = new SuggestionInfo(false, false, availableValues);
-    }
-    else {
-      suggestions = null;
-    }
-
-    myRangeInfos.add(new RangeInfo(null, (valid ? null : PyBundle.message("commandLine.validation.argBadValue")),
-                                   suggestions, currentPart, false));
-
-
-    if (--argsLeft == 0) {
-      myExpectedOptionArgument = null;
-    }
-    else {
-      myExpectedOptionArgument = Pair.create(argsLeft, argumentInfo);
-    }
-    return true;
-  }
-
-
-  /**
-   * Returns suggestions available for current position.
-   *
-   * @param showAutomatically make suggestions displayed automatically
-   * @param argumentPair      argument to use. If null, current argument according to internal counter would be used.
-   * @return suggestiom info or null if no suggestion available
-   */
-  @Nullable
-  SuggestionInfo getCurrentSuggestions(final boolean showAutomatically, @Nullable Pair<Boolean, Argument> argumentPair) {
-    if (argumentPair == null) {
-      argumentPair = myCommand.getArgumentsInfo().getArgument(myNumOfProcessedPositionalArguments);
-    }
-
-    final List<String> suggestions = argumentPair != null ? myUnusedOptionsCollector.addUnusedOptions(
-      argumentPair.second.getAvailableValues()) : myUnusedOptionsCollector.addUnusedOptions(
-      null);
-    if (suggestions == null) {
-      return null;
-    }
-    return new SuggestionInfo(showAutomatically, false, suggestions);
-  }
-
-  @Override
-  public void visitArgument(@NotNull final CommandLineArgument argument) {
-    if (mySkipNextArgument) {
-      // Skip argument, clear flag and do nothing
-      mySkipNextArgument = false;
-      return;
-    }
-
-    if (processOptionArgument(argument.getWord())) {
-      return;
-    }
-
-    final Pair<Boolean, Argument> argumentPair = myCommand.getArgumentsInfo().getArgument(myNumOfProcessedPositionalArguments++);
-    if (argumentPair == null) {
-      //Exceed!
-      myRangeInfos.add(new RangeInfo(null, PyBundle.message("commandLine.validation.excessArg"), false, argument.getWord()));
-      return;
-    }
-    final Argument commandArgument = argumentPair.second;
-
-    final List<String> argumentAvailableValues = commandArgument.getAvailableValues();
-    final String argumentValue = argument.getWord().getText();
-    String errorMessage = null;
-    if (argumentAvailableValues != null && !argumentAvailableValues.contains(argumentValue)) {
-      // Bad value
-      errorMessage = PyBundle.message("commandLine.validation.argBadValue");
-    }
-    // Argument  seems to be ok. We suggest values automatically only if value is bad
-    myRangeInfos.add(new RangeInfo(commandArgument.getHelpText(), errorMessage,
-                                   getCurrentSuggestions(errorMessage != null, argumentPair),
-                                   argument.getWord(), false));
-  }
-
-  /**
-   * @return calculates range infos for all command line parts (not the command itself!)
-   */
-  @NotNull
-  Collection<RangeInfo> getRangeInfos() {
-    return Collections.unmodifiableList(myRangeInfos);
-  }
-
-
-  /**
-   * @return Unsatisfied (currently expected) positional argument ([required, arg]) or null if no arg expected
-   */
-  @Nullable
-  Pair<Boolean, Argument> getUnsatisfiedPositionalArgument() {
-    return myCommand.getArgumentsInfo().getArgument(myNumOfProcessedPositionalArguments);
-  }
-
-  /**
-   * @return Unsatisfied (currently expected) option argument or null if no option argument expected
-   */
-  public OptionArgumentInfo getUnsatisfiedOptionArgument() {
-    if (myExpectedOptionArgument != null) {
-      return myExpectedOptionArgument.second;
-    }
-    else {
-      return null;
-    }
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/UnusedOptionsCollector.java b/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/UnusedOptionsCollector.java
deleted file mode 100644
index a72030ac696f..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/UnusedOptionsCollector.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.commandBasedRangeDriver;
-
-import com.intellij.util.containers.HashSet;
-import com.jetbrains.python.commandInterface.command.Command;
-import com.jetbrains.python.commandInterface.command.Option;
-import com.jetbrains.python.commandLineParser.CommandLineArgument;
-import com.jetbrains.python.commandLineParser.CommandLineOption;
-import com.jetbrains.python.commandLineParser.CommandLinePart;
-import com.jetbrains.python.commandLineParser.CommandLinePartVisitor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Collections all used and unused options to report unused options then.
- * It may be used to add unused options to suggestion list {@link #addUnusedOptions(Collection)}
- *
- * @author Ilya.Kazakevich
- */
-final class UnusedOptionsCollector implements CommandLinePartVisitor {
-  @NotNull
-  private final Set<String> myUnusedOptions = new HashSet<String>();
-  @NotNull
-  private final Command myCommand;
-
-  /**
-   * @param command          command to be used
-   * @param commandLineParts command line parts
-   * @return instance
-   */
-  static UnusedOptionsCollector create(@NotNull final Command command, @NotNull final Iterable<CommandLinePart> commandLineParts) {
-    final UnusedOptionsCollector collector = new UnusedOptionsCollector(command);
-    for (final CommandLinePart part : commandLineParts) {
-      part.accept(collector);
-    }
-    return collector;
-  }
-
-  private UnusedOptionsCollector(@NotNull final Command command) {
-    for (final Option option : command.getOptions()) {
-      myUnusedOptions.addAll(option.getAllNames());
-    }
-    myCommand = command;
-  }
-
-  @Override
-  public void visitOption(@NotNull final CommandLineOption option) {
-    final Option commandOption = CommandBasedRangeInfoDriver.findOptionByName(myCommand, option.getOptionName());
-    if (commandOption != null) {
-      myUnusedOptions.removeAll(commandOption.getAllNames());
-    }
-  }
-
-  /**
-   * Merges list of unused options and other values provided as argument.
-   *
-   * @param mainValues values to merge options with. May be null.
-   * @return null of no options and no values provided or merged list of values and options. See method usages for more info
-   */
-  @Nullable
-  List<String> addUnusedOptions(@Nullable final Collection<String> mainValues) {
-    if (mainValues == null && myUnusedOptions.isEmpty()) {
-      return null;
-    }
-    final List<String> result = new ArrayList<String>(myUnusedOptions);
-
-    if (mainValues != null) {
-      result.addAll(mainValues);
-    }
-    return (result.isEmpty() ? null : result);
-  }
-
-
-  @Override
-  public void visitArgument(@NotNull final CommandLineArgument argument) {
-
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/package-info.java b/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/package-info.java
deleted file mode 100644
index 278f48371b70..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/commandBasedRangeDriver/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000-2015 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.
- */
-
-/**
- * {@link com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfoDriver} implementation based on idea of
- * {@link com.jetbrains.python.commandInterface.command command, option and argument}.
- *
- *  See {@link com.jetbrains.python.commandInterface.commandBasedRangeDriver.CommandBasedRangeInfoDriver} as entry point.
- *  It parses command line using {@link com.jetbrains.python.commandLineParser.CommandLineParser} and finds matching command and arguments
- *  provided by user
- *
- * @see com.jetbrains.python.commandInterface.command
- * @see com.jetbrains.python.commandInterface.command.Command
- * @author Ilya.Kazakevich
- */
-package com.jetbrains.python.commandInterface.commandBasedRangeDriver;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/commandInterface/package-info.java b/python/src/com/jetbrains/python/commandInterface/package-info.java
deleted file mode 100644
index d96540555e52..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/package-info.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000-2014 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.
- */
-
-/**
- * View/Presenter pair that implements so-called "command line interface".
- * It has several abilities, including (but not limited):
- * <ol>
- *   <li>Suggestion box</li>
- *   <li>Error emphasising</li>
- *   <li>Popups</li>
- *   <li>AutoCompletion</li>
- * </ol>
- * <p>
- *   System consists of {@link com.jetbrains.python.commandInterface.CommandInterfacePresenter}
- *   and appropriate {@link com.jetbrains.python.commandInterface.CommandInterfaceView}.
- *   See {@link com.jetbrains.python.vp} for more info.
- * </p>
- *
- * <p>
- *   There is also swing-based view implementation in {@link com.jetbrains.python.commandInterface.swingView}
- *   and presenter implementation based on idea of commands with arguments. See {@link com.jetbrains.python.commandInterface.rangeBasedPresenter}
- * </p>
- *
- * <p>
- *   Presenter and View talk to each other only in term of text and chars. Presenter knows nothing about pixels and should never
- *   assume view have certain pixel size.
- * </p>
- *
- *
- *
- * @author Ilya.Kazakevich
- */
-package com.jetbrains.python.commandInterface;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeBasedPresenter.java b/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeBasedPresenter.java
deleted file mode 100644
index 4ab64a444abe..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeBasedPresenter.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.rangeBasedPresenter;
-
-import com.intellij.openapi.util.Pair;
-import com.intellij.util.Range;
-import com.jetbrains.python.WordWithPosition;
-import com.jetbrains.python.commandInterface.CommandInterfacePresenterAdapter;
-import com.jetbrains.python.commandInterface.CommandInterfaceView;
-import com.jetbrains.python.suggestionList.SuggestionsBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-
-/**
- * Presenter that uses {@link RangeInfoDriver} to obtain {@link RangeInfo info}.
- * Such info tells presenter whether this text has info, error, suggestions and so on.
- * If caret situated far from text, then next neariest range should be found (see {@link #findNearestRangeInfo()}.
- *
- * @author Ilya.Kazakevich
- * @see RangeInfo
- */
-public final class RangeBasedPresenter extends CommandInterfacePresenterAdapter {
-  @NotNull
-  private final RangeInfoDriver myRangeInfoDriver;
-  @Nullable
-  private Executor myExecutor;
-  private final SortedSet<RangeInfo> myRangeInfos = new TreeSet<RangeInfo>();
-
-  public RangeBasedPresenter(@NotNull final CommandInterfaceView view,
-                             @NotNull final RangeInfoDriver rangeInfoDriver) {
-    super(view);
-    myRangeInfoDriver = rangeInfoDriver;
-  }
-
-  @Override
-  public void launch() {
-    super.launch();
-    reparseText(true);
-  }
-
-  @Override
-  public void textChanged() {
-    reparseText(false);
-  }
-
-  private void reparseText(final boolean skipSuggestions) {
-
-
-    final Pair<Executor, List<RangeInfo>> rangeInfoStructure = myRangeInfoDriver.getCommandLineInfo(myView.getText());
-    myExecutor = rangeInfoStructure.first;
-    final List<RangeInfo> rangeInfos = rangeInfoStructure.second;
-
-    assert !rangeInfos.isEmpty() : "At least one chunk info should exist";
-    myRangeInfos.clear();
-    myRangeInfos.addAll(rangeInfos);
-
-
-    // configure Errors And Balloons
-
-    final Collection<WordWithPosition> infoBalloons = new ArrayList<WordWithPosition>();
-    final Collection<WordWithPosition> errorBalloons = new ArrayList<WordWithPosition>();
-
-
-    for (final RangeInfo rangeInfo : rangeInfos) {
-      final String error = rangeInfo.getError();
-      if (error != null) {
-        errorBalloons.add(new WordWithPosition(error, rangeInfo));
-      }
-      final String info = rangeInfo.getInfoBalloon();
-      if (info != null) {
-        infoBalloons.add(new WordWithPosition(info, rangeInfo));
-      }
-    }
-
-    myView.setInfoAndErrors(infoBalloons, errorBalloons);
-
-
-    if (!skipSuggestions) {
-      configureSuggestion(false);
-    }
-
-    // Configure subtexts
-    final List<Range<Integer>> placesWhereSuggestionAvailable = new ArrayList<Range<Integer>>();
-    for (final RangeInfo rangeInfo : rangeInfos) {
-      // If some place has suggestions, then add it
-      if (rangeInfo.getSuggestions() != null) {
-        placesWhereSuggestionAvailable.add(rangeInfo);
-      }
-    }
-    final String statusText = (myExecutor != null ? myExecutor.getExecutionDescription() : null);
-    myView.configureSubTexts(statusText, placesWhereSuggestionAvailable);
-  }
-
-  @Override
-  public void suggestionRequested() {
-    configureSuggestion(true); // Show or hide
-  }
-
-
-  /**
-   * Displays suggestions if needed.
-   *
-   * @param requestedExplicitly is suggesions where requested by user explicitly or not
-   */
-  private void configureSuggestion(final boolean requestedExplicitly) {
-    myView.removeSuggestions();
-    final RangeInfo rangeInfo = findNearestRangeInfo();
-    final String text = getTextByRange(rangeInfo);
-
-    final SuggestionInfo suggestionInfo = rangeInfo.getSuggestions();
-    if (suggestionInfo == null || (!suggestionInfo.isShowSuggestionsAutomatically() && !requestedExplicitly)) {
-      return;
-    }
-    final List<String> suggestions = new ArrayList<String>(suggestionInfo.getSuggestions());
-    if (text != null && !requestedExplicitly) {
-      filterLeaveOnlyMatching(suggestions, text);
-    }
-    // TODO: Place to add history
-    if (!suggestions.isEmpty()) {
-      // No need to display empty suggestions
-      myView
-        .displaySuggestions(new SuggestionsBuilder(suggestions), suggestionInfo.isShowAbsolute(), text);
-    }
-  }
-
-
-  /**
-   * Filters collection of suggestions leaving only those starts with certain text.
-   *
-   * @param suggestions list to filter
-   * @param textToMatch leave only parts that start with this param
-   */
-  private static void filterLeaveOnlyMatching(@NotNull final Iterable<String> suggestions, @NotNull final String textToMatch) {
-    // TODO: use guava instead?
-    final Iterator<String> iterator = suggestions.iterator();
-    while (iterator.hasNext()) {
-      if (!iterator.next().startsWith(textToMatch)) {
-        iterator.remove();
-      }
-    }
-  }
-
-  /**
-   * Searches for the nearest range to use.
-   *
-   * @return nearest range info
-   */
-  @NotNull
-  private RangeInfo findNearestRangeInfo() {
-    final int caretPosition = myView.getCaretPosition();
-
-    for (final RangeInfo range : myRangeInfos) {
-      if (range.isWithin(caretPosition)) {
-        return range;
-      }
-      if (range.getFrom() > caretPosition) {
-        return range; // Ranges are sorted, so we are on the next range. Take it, if caret is not within range
-      }
-    }
-
-    return myRangeInfos.last();
-  }
-
-
-  @Override
-  public void completionRequested(@Nullable final String valueFromSuggestionList) {
-    final RangeInfo rangeInfo = findNearestRangeInfo();
-    final String text = getTextByRange(rangeInfo);
-
-    if (valueFromSuggestionList != null) {
-      // Just insert it
-      if (text != null) { // If caret is on the text itself
-        // TODO: Replace next range, if it has no space before it(--a=12 should be replaced wth arg)
-        myView.replaceText(rangeInfo.getFrom(), rangeInfo.getTo(), valueFromSuggestionList);
-      }
-      else {
-        myView.insertTextAfterCaret(valueFromSuggestionList);
-      }
-      return;
-    }
-
-    //User did not provide text no insert, do our best to find one
-
-    final SuggestionInfo suggestionInfo = rangeInfo.getSuggestions();
-    if (suggestionInfo == null) {
-      return; // No suggestion available for this chunk
-    }
-    final List<String> suggestions = new ArrayList<String>(suggestionInfo.getSuggestions());
-    if (text != null) {
-      filterLeaveOnlyMatching(suggestions, text);
-    }
-    if (suggestions.size() == 1) {
-      // Exclusive!
-      if (text != null) {
-        // TODO: Replace next range, if it has no space before it(--a=12 should be replaced wth arg)
-        myView.replaceText(rangeInfo.getFrom(), rangeInfo.getTo(), suggestions.get(0));
-      }
-      else {
-        myView.insertTextAfterCaret(suggestions.get(0));
-      }
-    }
-  }
-
-  /**
-   * Searches for text under the range
-   * @param rangeInfo range
-   * @return text or null if range does not contain any text
-   */
-  @Nullable
-  private String getTextByRange(@NotNull final RangeInfo rangeInfo) {
-
-    if (rangeInfo.isTerminationRange()) {
-      return null;
-    }
-    else {
-      final String viewText = myView.getText();
-      return viewText.substring(rangeInfo.getFrom(), rangeInfo.getTo());
-    }
-  }
-
-  @Override
-  public void executionRequested() {
-    if (myExecutor == null) {
-      // TODO: Display error somehow
-    }
-    else {
-      myExecutor.execute();
-    }
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfo.java b/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfo.java
deleted file mode 100644
index a695eea7db25..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfo.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.rangeBasedPresenter;
-
-import com.intellij.util.Range;
-import com.jetbrains.python.commandInterface.CommandInterfaceView;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Information about certain place in text, provided by driver.
- *
- * @author Ilya.Kazakevich
- */
-public final class RangeInfo extends Range<Integer> implements Comparable<RangeInfo> {
-
-
-  /**
-   * Special "terminator": the last range which is after all other ranges.
-   */
-  public static final Range<Integer> TERMINATION_RANGE = CommandInterfaceView.AFTER_LAST_CHARACTER_RANGE;
-
-  @Nullable
-  private final String myInfoBalloon;
-  @Nullable
-  private final String myError;
-  @Nullable
-  private final SuggestionInfo mySuggestions;
-  private final boolean myExclusiveBorders;
-
-
-  /**
-   * @param infoBalloon      info to bind to this range
-   * @param error            error to bind to this range
-   * @param exclusiveBorders true if range has exclusive borders and right border is not part of it. I.e. 3 is part of 1-3 range with out
-   *                         of exclusive borders, but not part of exclusive range
-   * @param range            from and to
-   */
-  public RangeInfo(@Nullable final String infoBalloon,
-                   @Nullable final String error,
-                   final boolean exclusiveBorders,
-                   @NotNull final Range<Integer> range) {
-    this(infoBalloon, error, null, range, exclusiveBorders);
-  }
-
-
-  /**
-   * @param infoBalloon Info balloon to display when caret meets this place (null if display nothing)
-   * @param error       Error balloon to display when caret meets this place and underline text as error (null if no error)
-   * @param suggestions list of suggestions available in this place (if any)
-   */
-  public RangeInfo(@Nullable final String infoBalloon,
-                   @Nullable final String error,
-                   @Nullable final SuggestionInfo suggestions,
-                   @NotNull final Range<Integer> range,
-                   final boolean exclusiveBorders) {
-    super(range.getFrom(), range.getTo());
-    myInfoBalloon = infoBalloon;
-    myError = error;
-    mySuggestions = suggestions;
-    myExclusiveBorders = exclusiveBorders;
-  }
-
-
-  /**
-   * @return Info balloon to display when caret meets this place (null if display nothing)
-   */
-  @Nullable
-  public String getInfoBalloon() {
-    return myInfoBalloon;
-  }
-
-  /**
-   * @return Error balloon to display when caret meets this place and underline text as error (null if no error)
-   */
-  @Nullable
-  public String getError() {
-    return myError;
-  }
-
-  /**
-   * @return list of suggestions available in this place (if any)
-   */
-  @Nullable
-  public SuggestionInfo getSuggestions() {
-    return mySuggestions;
-  }
-
-  @Override
-  public int compareTo(RangeInfo o) {
-    return getFrom().compareTo(o.getFrom());
-  }
-
-  @Override
-  public boolean isWithin(final Integer object) {
-    if (!super.isWithin(object)) {
-      return false;
-    }
-    if (myExclusiveBorders) {
-      return object < getTo();
-    }
-    return true;
-  }
-
-  public boolean isTerminationRange() {
-    // TODO: copy/paste with view
-    return TERMINATION_RANGE.getFrom().equals(getFrom()) && TERMINATION_RANGE.getTo().equals(getTo());
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfoDriver.java b/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfoDriver.java
deleted file mode 100644
index fb5887290654..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/RangeInfoDriver.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.rangeBasedPresenter;
-
-import com.intellij.openapi.util.Pair;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-/**
- * Driver that knows how to getCommandLineInfo pack of chunks into chunk info.
- *
- * @author Ilya.Kazakevich
- */
-public interface RangeInfoDriver {
-  /**
-   * Parses command line text into executor and pack of range infos.
-   * There <strong>always</strong> should be at least one range info and the last one is almost always {@link RangeInfo#TERMINATION_RANGE).
-   *
-   * @param commandLineText command line text to parse.
-   * @return pair or executor (the one that knows how to execute command line) and pack of range infos.
-   * <strong>Warning! </strong> :Executor could be null if command can't be executed
-   */
-  @NotNull
-  Pair<Executor, List<RangeInfo>> getCommandLineInfo(@NotNull String commandLineText);
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/SuggestionInfo.java b/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/SuggestionInfo.java
deleted file mode 100644
index e7af84e52ea0..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/SuggestionInfo.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.rangeBasedPresenter;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Information about suggestions
- *
- * @author Ilya.Kazakevich
- */
-public final class SuggestionInfo {
-  @NotNull
-  private final List<String> mySuggestions = new ArrayList<String>();
-  private final boolean myShowSuggestionsAutomatically;
-  private final boolean myShowAbsolute;
-
-  /**
-   * @param showSuggestionsAutomatically true it suggestions should be displayed even if user did not ask for that
-   * @param showAbsolute                 show suggestions at the absolute position (not relative to caret).
-   * @param suggestions                  List of suggestions to display
-   */
-  public SuggestionInfo(final boolean showSuggestionsAutomatically,
-                        final boolean showAbsolute,
-                        @NotNull final Collection<String> suggestions) {
-    myShowSuggestionsAutomatically = showSuggestionsAutomatically;
-    myShowAbsolute = showAbsolute;
-    mySuggestions.addAll(suggestions);
-  }
-
-  /**
-   * @return List of suggestions to display
-   */
-  @NotNull
-  public List<String> getSuggestions() {
-    return Collections.unmodifiableList(mySuggestions);
-  }
-
-  /**
-   * @return true it suggestions should be displayed even if user did not ask for that
-   */
-  public boolean isShowSuggestionsAutomatically() {
-    return myShowSuggestionsAutomatically;
-  }
-
-  /**
-   * @return show suggestions at the absolute position (not relative to caret).
-   */
-  public boolean isShowAbsolute() {
-    return myShowAbsolute;
-  }
-
-  @Override
-  public String toString() {
-    return "SuggestionInfo{" +
-           "mySuggestions=" + mySuggestions +
-           ", myShowSuggestionsAutomatically=" + myShowSuggestionsAutomatically +
-           ", myShowAbsolute=" + myShowAbsolute +
-           '}';
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/package-info.java b/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/package-info.java
deleted file mode 100644
index 152071b1e34c..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/rangeBasedPresenter/package-info.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000-2015 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.
- */
-
-/**
- * {@link com.jetbrains.python.commandInterface.CommandInterfacePresenter} implementation based on ideas of <strong>range info</strong>
- * and {@link com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfoDriver}.
- * This presenter passes command line to driver, and it returns pack of range information.
- * Each record contains everything presenter needs to know about certain range (i.e. error between 2 and 5 chars).
- * Special type of range {@link com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfo#TERMINATION_RANGE} exists, that
- * you may need to check.
- * <p/>
- * Presenter uses this information to display chunks correctly using view.
- * To use this package, {@link com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeInfoDriver} should be implemented.
- * <p/>
- * See {@link com.jetbrains.python.commandInterface.rangeBasedPresenter.RangeBasedPresenter} as entry point
- *
- * @author Ilya.Kazakevich
- */
-package com.jetbrains.python.commandInterface.rangeBasedPresenter;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.form b/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.form
deleted file mode 100644
index 3540a57f5144..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.form
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.python.commandInterface.swingView.CommandInterfaceViewSwingImpl">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="4" left="4" bottom="4" right="2"/>
-    <constraints>
-      <xy x="1" y="67" width="404" height="245"/>
-    </constraints>
-    <properties/>
-    <border type="none"/>
-    <children>
-      <hspacer id="91552">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="5"/>
-          </grid>
-        </constraints>
-      </hspacer>
-      <component id="4067e" class="javax.swing.JLabel" binding="myLabel">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Label"/>
-        </properties>
-      </component>
-      <grid id="30372" class="com.jetbrains.python.commandInterface.swingView.SmartTextField" binding="myMainTextField" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <enabled value="true"/>
-          <font/>
-        </properties>
-        <border type="none"/>
-        <children/>
-      </grid>
-      <hspacer id="4b381">
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
-      <component id="7a794" class="javax.swing.JLabel" binding="mySubLabel">
-        <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Label"/>
-        </properties>
-      </component>
-      <hspacer id="c568">
-        <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-      </hspacer>
-    </children>
-  </grid>
-</form>
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.java b/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.java
deleted file mode 100644
index 955d07ee6580..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/CommandInterfaceViewSwingImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface.swingView;
-
-import com.google.common.base.Preconditions;
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.MessageType;
-import com.intellij.openapi.ui.popup.*;
-import com.intellij.openapi.ui.popup.Balloon.Position;
-import com.intellij.ui.JBColor;
-import com.intellij.ui.awt.RelativePoint;
-import com.intellij.util.Range;
-import com.intellij.util.containers.HashSet;
-import com.jetbrains.python.PyBundle;
-import com.jetbrains.python.WordWithPosition;
-import com.jetbrains.python.commandInterface.CommandInterfacePresenter;
-import com.jetbrains.python.commandInterface.CommandInterfaceView;
-import com.jetbrains.python.suggestionList.SuggestionList;
-import com.jetbrains.python.suggestionList.SuggestionsBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.BadLocationException;
-import java.awt.*;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Command-interface view implementation based on Swing.
- * It uses balloons to display errors and infos, drop-down for suggestions and also underlines errors
- *
- * @author Ilya.Kazakevich
- */
-public class CommandInterfaceViewSwingImpl extends JBPopupAdapter implements CommandInterfaceView, DocumentListener, CaretListener {
-  private static final JBColor ERROR_COLOR = JBColor.RED;
-
-  /**
-   * We need to track balloons, so we have field with callback
-   */
-  @NotNull
-  private final BalloonManager myBalloonManager = new BalloonManager();
-  /**
-   * Pop-up we displayed in
-   */
-  @NotNull
-  private final JBPopup myMainPopUp;
-  private JPanel myPanel;
-  /**
-   * Upper label
-   */
-  private JLabel myLabel;
-  /**
-   * Text field
-   */
-  private SmartTextField myMainTextField;
-  /**
-   * Lower (sub) label
-   */
-  private JLabel mySubLabel;
-  /**
-   * "Suggestion area". Suggestion status is displayed when caret meets this area
-   */
-  private final List<Range<Integer>> myPlacesWhereSuggestionsAvailable = new ArrayList<Range<Integer>>();
-  @NotNull
-  private final CommandInterfacePresenter myPresenter;
-  /**
-   * List to display suggestions
-   */
-  @NotNull
-  private final SuggestionList mySuggestionList;
-  /**
-   * Displayed when there is no text
-   */
-  @Nullable
-  private final String myPlaceHolderText;
-
-  /**
-   * Information balloons that should be displayed when caret meets their boundaries.
-   */
-  @NotNull
-  private final List<WordWithPosition> myInfoBalloons = new ArrayList<WordWithPosition>();
-  /**
-   * Error balloons that should be displayed when caret meets their boundaries.
-   * Errors are always underlined, but balloons are displayed only if caret meets error
-   */
-  private final List<WordWithPosition> myErrorBalloons = new ArrayList<WordWithPosition>();
-  /**
-   * Default subtext to display when caret is out of {@link #myPlacesWhereSuggestionsAvailable "suggestion" area}
-   */
-  @Nullable
-  private String myDefaultSubText;
-
-  /**
-   * @param presenter       our presenter
-   * @param title           view title to display
-   * @param project         project
-   * @param placeholderText text for placeholder (to be displayed when there is not text)
-   */
-  public CommandInterfaceViewSwingImpl(@NotNull final CommandInterfacePresenter presenter,
-                                       @NotNull final String title,
-                                       @NotNull final Project project,
-                                       @Nullable final String placeholderText) {
-    myPresenter = presenter;
-    myLabel.setText(title);
-    myPlaceHolderText = placeholderText;
-
-    myMainPopUp = JBPopupFactory.getInstance().createComponentPopupBuilder(myPanel, myMainTextField)
-      .setFocusable(true)
-      .setRequestFocus(true)
-      .createPopup();
-    myMainTextField.setRequestFocusEnabled(true);
-    myMainTextField.setFocusable(true);
-
-
-    final int windowWidth = FileEditorManagerEx.getInstanceEx(project).getComponent().getRootPane().getWidth() - 10; // Little gap
-
-    myMainTextField
-      .setPreferredWidthInPx(windowWidth);
-    mySuggestionList = new SuggestionList(new MySuggestionListListener());
-  }
-
-
-  @Override
-  public void show() {
-    myMainTextField.getDocument().addDocumentListener(this);
-    myMainTextField.addCaretListener(this);
-    myMainPopUp.addListener(this);
-    if (myPlaceHolderText != null) {
-      myMainTextField.setWaterMarkPlaceHolderText(myPlaceHolderText);
-    }
-
-
-    myMainTextField.addFocusListener(new FocusAdapter() {
-      @Override
-      public void focusLost(final FocusEvent e) {
-        super.focusLost(e);
-        myMainPopUp.cancel();
-      }
-    });
-    myMainTextField.setFocusTraversalKeysEnabled(false);
-    myMainTextField.addKeyListener(new MyKeyListener()); // Up/down arrows are not handles with actions
-
-    // Register all available actions
-    for (final KeyStrokeInfo strokeInfo : KeyStrokeInfo.values()) {
-      strokeInfo.register(myPresenter, mySuggestionList, myMainTextField);
-    }
-    myMainPopUp.showInFocusCenter();
-  }
-
-
-  @Override
-  public void displaySuggestions(@NotNull final SuggestionsBuilder suggestions, final boolean absolute, @Nullable final String toSelect) {
-
-    int left = 0;
-    // Display text right after caret
-    if (!absolute) {
-      left = myMainTextField.getTextCaretPositionInPx();
-    }
-    mySuggestionList.showSuggestions(suggestions, new RelativePoint(myPanel, new Point(left, myPanel.getHeight())), toSelect);
-    configureAppropriateStatus();
-  }
-
-  @Override
-  public void onClosed(final LightweightWindowEvent event) {
-    super.onClosed(event);
-    mySuggestionList.close();
-  }
-
-
-  @Override
-  public void insertUpdate(final DocumentEvent e) {
-    processDocumentChange();
-  }
-
-
-  @Override
-  public void removeUpdate(final DocumentEvent e) {
-    processDocumentChange();
-  }
-
-  private void processDocumentChange() {
-    myMainTextField.hideUnderline();
-    myPresenter.textChanged();
-  }
-
-  @Override
-  public void changedUpdate(final DocumentEvent e) {
-
-  }
-
-  @Override
-  public void removeSuggestions() {
-    mySuggestionList.close();
-    configureAppropriateStatus();
-  }
-
-
-  @Override
-  public final void caretUpdate(final CaretEvent e) {
-
-
-    // When caret moved, we need to check if balloon has to be displayed
-    displayBalloonsIfRequired();
-    configureAppropriateStatus();
-  }
-
-  private void configureAppropriateStatus() {
-    if (!mySuggestionList.isClosed()) {
-      // Tell user she may use TAB to complete
-      mySubLabel.setText(PyBundle.message("commandLine.subText.key.complete", KeyStrokeInfo.COMPLETION.getText()));
-      return;
-    }
-
-    // If we are in "suggestion available" place -- tell it
-    for (final Range<Integer> range : myPlacesWhereSuggestionsAvailable) {
-      final boolean specialCaseAfterLastChar = isAfterLastCharRange(range) && getCaretPosition() == myMainTextField.getText().length();
-      if (range.isWithin(getCaretPosition()) || specialCaseAfterLastChar) {
-        mySubLabel.setText(PyBundle.message("commandLine.subText.key.suggestions", KeyStrokeInfo.SUGGESTION.getText()));
-        return;
-      }
-    }
-
-    // We may simply tell user she may execute command
-    if (myDefaultSubText != null) {
-      mySubLabel.setText(PyBundle.message("commandLine.subText.key.executeCommand", KeyStrokeInfo.EXECUTION.getText(), myDefaultSubText));
-    }
-    else {
-      mySubLabel.setText(PyBundle.message("commandLine.subText.key.executeUnknown", KeyStrokeInfo.EXECUTION.getText()));
-    }
-  }
-
-
-  private void displayBalloonsIfRequired() {
-    synchronized (myErrorBalloons) {
-      if (mySuggestionList.isClosed()) { // No need to display error popups when suggestion list is displayed. It intersects.
-        showBalloons(myErrorBalloons, Position.below, MessageType.ERROR);
-      }
-    }
-    synchronized (myInfoBalloons) {
-      showBalloons(myInfoBalloons, Position.above, MessageType.INFO);
-    }
-  }
-
-  /**
-   * Displays some balloons
-   *
-   * @param balloons      balloons to display
-   * @param popUpPosition where ti display them. Only {@link Position#above} and {@link Position#below} are supported!
-   * @param messageType   may be {@link MessageType#ERROR} or {@link MessageType#INFO} for example
-   */
-  private void showBalloons(@NotNull final List<WordWithPosition> balloons,
-                            @NotNull final Position popUpPosition,
-                            @NotNull final MessageType messageType) {
-    Preconditions.checkArgument(popUpPosition == Position.above || popUpPosition == Position.below, "Only above or below is supported");
-    for (final WordWithPosition balloon : balloons) {
-      if (balloon.getText().isEmpty()) {
-        continue; // Can't be displayed if empty
-      }
-      final int caretPosition = myMainTextField.getCaretPosition();
-      if ((caretPosition >= balloon.getFrom() && caretPosition <= balloon.getTo())) {
-        final int top = (popUpPosition == Position.above ? 0 : myMainTextField.getHeight() * 2); // Display below a little bit lower
-        final RelativePoint point = new RelativePoint(myMainTextField, new Point(myMainTextField.getTextCaretPositionInPx(), top));
-        final Balloon balloonToShow =
-          JBPopupFactory.getInstance().createBalloonBuilder(new JLabel(balloon.getText())).setFillColor(messageType.getPopupBackground())
-            .createBalloon();
-        balloonToShow.setAnimationEnabled(false);
-        myBalloonManager.registerBalloon(balloonToShow);
-        balloonToShow.show(point, popUpPosition);
-      }
-    }
-  }
-
-  @Override
-  public final void setInfoAndErrors(@NotNull final Collection<WordWithPosition> infoBalloons,
-                                     @NotNull final Collection<WordWithPosition> errors) {
-    synchronized (myInfoBalloons) {
-      myInfoBalloons.clear();
-      myInfoBalloons.addAll(infoBalloons);
-    }
-    synchronized (myErrorBalloons) {
-      myErrorBalloons.clear();
-      myErrorBalloons.addAll(errors);
-    }
-    for (final WordWithPosition error : errors) {
-      if (isAfterLastCharRange(error)) {
-        // In "special" case we use last char
-        myMainTextField.underlineText(ERROR_COLOR, myMainTextField.getText().length(), myMainTextField.getText().length() + 1);
-      }
-      else {
-        myMainTextField.underlineText(ERROR_COLOR, error.getFrom(), error.getTo());
-      }
-    }
-  }
-
-  /**
-   * Checks if some range is <strong>special case</strong> {@link #AFTER_LAST_CHARACTER_RANGE}.
-   *
-   * @param range range to check
-   * @return true if special case
-   */
-  private static boolean isAfterLastCharRange(@NotNull final Range<Integer> range) {
-    return AFTER_LAST_CHARACTER_RANGE.getFrom().equals(range.getFrom()) && AFTER_LAST_CHARACTER_RANGE.getTo().equals(range.getTo());
-  }
-
-  @Override
-  public final void insertTextAfterCaret(@NotNull final String text) {
-    try {
-      myMainTextField.getDocument().insertString(myMainTextField.getCaretPosition(), text, null);
-    }
-    catch (final BadLocationException e) {
-      // TODO: Display error somehow!
-      e.printStackTrace();
-    }
-  }
-
-  @Override
-  public final void replaceText(final int from, final int to, @NotNull final String newText) {
-    myMainTextField.select(from, to);
-    myMainTextField.replaceSelection(newText);
-    myBalloonManager.closeAllBalloons();
-    myPresenter.textChanged();
-    displayBalloonsIfRequired(); // This crunch but we need to recalculate balloons in this case (position is changed!)
-  }
-
-  @Override
-  public final int getCaretPosition() {
-    return myMainTextField.getCaretPosition();
-  }
-
-
-  @Override
-  public final void configureSubTexts(@Nullable final String defaultSubText,
-                                      @NotNull final List<Range<Integer>> suggestionAvailablePlaces) {
-    synchronized (myPlacesWhereSuggestionsAvailable) {
-      myPlacesWhereSuggestionsAvailable.clear();
-      myPlacesWhereSuggestionsAvailable.addAll(suggestionAvailablePlaces);
-      myDefaultSubText = defaultSubText;
-    }
-    configureAppropriateStatus();
-  }
-
-  /**
-   * Reacts on keys, pressed by user
-   */
-  private class MyKeyListener extends KeyAdapter {
-    @Override
-    public void keyPressed(final KeyEvent e) {
-      super.keyPressed(e);
-
-      final int keyCode = e.getKeyCode();
-      if (keyCode == KeyEvent.VK_UP) {
-        mySuggestionList.moveSelection(true);
-      }
-      else if (keyCode == KeyEvent.VK_DOWN) {
-        mySuggestionList.moveSelection(false);
-      }
-    }
-  }
-
-  @NotNull
-  @Override
-  public String getText() {
-    return myMainTextField.getText();
-  }
-
-
-  /**
-   * Listener for suggestion list
-   */
-  private class MySuggestionListListener extends JBPopupAdapter {
-
-    @Override
-    public void onClosed(final LightweightWindowEvent event) {
-      super.onClosed(event);
-      removeSuggestions();
-    }
-  }
-
-  /**
-   * Keeps tracks for baloons to close all of them in case of text inserion
-   */
-  private static final class BalloonManager extends JBPopupAdapter {
-    @NotNull
-    private final Set<Balloon> myCurrentBaloons = new HashSet<Balloon>();
-
-    void registerBalloon(final Balloon balloon) {
-      synchronized (myCurrentBaloons) {
-        myCurrentBaloons.add(balloon);
-        balloon.addListener(this);
-      }
-    }
-
-    @Override
-    public void onClosed(final LightweightWindowEvent event) {
-      synchronized (myCurrentBaloons) {
-        myCurrentBaloons.remove(event.asBalloon());
-      }
-      super.onClosed(event);
-    }
-
-    void closeAllBalloons() {
-      synchronized (myCurrentBaloons) {
-        for (final Balloon balloon : myCurrentBaloons) {
-          balloon.dispose();
-        }
-      }
-    }
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/CompletionKeyStrokeAction.java b/python/src/com/jetbrains/python/commandInterface/swingView/CompletionKeyStrokeAction.java
deleted file mode 100644
index 8ed0c5af06ed..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/CompletionKeyStrokeAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.swingView;
-
-import java.awt.event.ActionEvent;
-
-/**
- * "Complete current command or argument" action
- *
- * @author Ilya.Kazakevich
- */
-final class CompletionKeyStrokeAction extends KeyStrokeAction {
-  CompletionKeyStrokeAction() {
-    super(KeyStrokeInfo.COMPLETION);
-  }
-
-  @Override
-  public void actionPerformed(final ActionEvent e) {
-    myPresenter.completionRequested(mySuggestionList.getValue());
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeAction.java b/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeAction.java
deleted file mode 100644
index a801580a5bf6..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.swingView;
-
-import com.jetbrains.python.commandInterface.CommandInterfacePresenter;
-import com.jetbrains.python.suggestionList.SuggestionList;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.text.TextAction;
-
-/**
- * Action that should be taken for certain {@link javax.swing.KeyStroke} (wrapped in {@link com.jetbrains.python.commandInterface.swingView.KeyStrokeInfo}).
- * You need to call {@link #configure(com.jetbrains.python.commandInterface.CommandInterfacePresenter, com.jetbrains.python.suggestionList.SuggestionList)}
- * to enable one.
- *
- * @author Ilya.Kazakevich
- */
-@SuppressWarnings({"InstanceVariableMayNotBeInitialized", "NonSerializableFieldInSerializableClass"}) // Will never serialize
-abstract class KeyStrokeAction extends TextAction {
-  @NotNull
-  private final String myName;
-  @NotNull
-  private final KeyStrokeInfo myStroke;
-
-  protected CommandInterfacePresenter myPresenter;
-  protected SuggestionList mySuggestionList;
-
-  /**
-   * @param stroke key stroke to bind this info to
-   */
-  KeyStrokeAction(@NotNull final KeyStrokeInfo stroke) {
-    super(stroke.name());
-    myName = stroke.name();
-    myStroke = stroke;
-  }
-
-
-  /**
-   * Configures action.
-   *
-   * @param presenter      presenter to be used for call back.
-   * @param suggestionList list of suggestions to be used for call back
-   * @return name of this action to add to {@link javax.swing.InputMap}
-   */
-  @NotNull
-  final String configure(@NotNull final CommandInterfacePresenter presenter, @NotNull final SuggestionList suggestionList) {
-    myPresenter = presenter;
-    mySuggestionList = suggestionList;
-    return myName;
-  }
-
-  /**
-   * @return stroke bound to this action
-   */
-  @NotNull
-  final KeyStrokeInfo getStroke() {
-    return myStroke;
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeInfo.java b/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeInfo.java
deleted file mode 100644
index dcf8278e6612..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/KeyStrokeInfo.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.swingView;
-
-import com.intellij.openapi.keymap.KeymapUtil;
-import com.jetbrains.python.commandInterface.CommandInterfacePresenter;
-import com.jetbrains.python.suggestionList.SuggestionList;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
-/**
- * Key strokes to be used with view.
- * Strokes paired with action. You need to register each action via {@link javax.swing.InputMap}
- *
- * @author Ilya.Kazakevich
- */
-enum KeyStrokeInfo {
-  /**
-   * "Execute command" keystroke
-   */
-  EXECUTION(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)),
-  /**
-   * "Complete current command or argument" keystroke
-   */
-  COMPLETION(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0)),
-  /**
-   * "Display suggestions" keystroke.
-   */
-  SUGGESTION(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK)),;
-
-  /**
-   * List of actions. Each action should be bound to some {@link com.jetbrains.python.commandInterface.swingView.KeyStrokeInfo}
-   */
-  @NotNull
-  private static final KeyStrokeAction[] ACTIONS = {
-    new CompletionKeyStrokeAction(),
-    new ExecutionKeyStrokeAction(),
-    new SuggestionKeyStrokeAction()};
-
-  private final KeyStroke myStroke;
-
-  KeyStrokeInfo(@NotNull final KeyStroke stroke) {
-    myStroke = stroke;
-  }
-
-  /**
-   * Registers  action and binds it appropriate stroke. Call if for all instances to make all actions available.
-   *
-   * @param presenter      presenter to be used as call back
-   * @param suggestionList suggestion list to be used as call back
-   * @param source         Component with {@link javax.swing.InputMap} and {@link javax.swing.ActionMap} (swing view itself)
-   */
-  void register(@NotNull final CommandInterfacePresenter presenter,
-                @NotNull final SuggestionList suggestionList,
-                @NotNull final JComponent source) {
-    final KeyStrokeAction action = getAction();
-    final String strokeName = action.configure(presenter, suggestionList);
-    source.getInputMap().put(myStroke, strokeName);
-    source.getActionMap().put(strokeName, action);
-  }
-
-  /**
-   * @return Human-readable name of this action (to display it to user)
-   */
-  @NotNull
-  String getText() {
-    return KeymapUtil.getKeystrokeText(myStroke);
-  }
-
-
-  /**
-   * @return action paired with stroke
-   */
-  @NotNull
-  private KeyStrokeAction getAction() {
-    for (final KeyStrokeAction action : ACTIONS) {
-      if (action.getStroke() == this) {
-        return action;
-      }
-    }
-    throw new IllegalStateException("Failed to find action for " + name());
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/SmartTextField.java b/python/src/com/jetbrains/python/commandInterface/swingView/SmartTextField.java
deleted file mode 100644
index 2e7ff1a07352..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/SmartTextField.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2000-2014 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.jetbrains.python.commandInterface.swingView;
-
-import com.intellij.openapi.editor.colors.EditorColorsManager;
-import com.intellij.openapi.editor.colors.EditorFontType;
-import com.intellij.util.Range;
-import com.intellij.util.ui.StatusText;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Text field that has width to be changed and accepts error underline
- *
- * @author Ilya.Kazakevich
- */
-@SuppressWarnings({"NonSerializableFieldInSerializableClass", "SerializableHasSerializationMethods"}) // Will never serialize it
-public class SmartTextField extends JTextField {
-  /**
-   * Placeholder for this textbox
-   */
-  private StatusText myPlaceHolder;
-  /**
-   * Error (underline) info to display. Check {@link UnderlineInfo} class for more info
-   */
-  @NotNull
-  private final Collection<UnderlineInfo> myUnderlineInfo = new ArrayList<UnderlineInfo>();
-  private int myPreferredWidth;
-
-  public SmartTextField() {
-    setFont(EditorColorsManager.getInstance().getGlobalScheme().getFont(EditorFontType.CONSOLE_PLAIN));
-  }
-
-  @Override
-  protected void paintComponent(final Graphics g) {
-    super.paintComponent(g);
-    if (myPlaceHolder != null) {
-      myPlaceHolder.paint(this, g);
-    }
-    synchronized (myUnderlineInfo) {
-      for (final UnderlineInfo underlineInfo : myUnderlineInfo) {
-        g.setColor(underlineInfo.myColor);
-        // To prevent too long underlines: last char should really be last
-        underline(g, underlineInfo.getFrom(), underlineInfo.getTo());
-      }
-    }
-  }
-
-  /**
-   * Underlines certain place
-   *
-   * @param g    canvas
-   * @param from from where (int px)
-   * @param to   to where (int px)
-   */
-  private void underline(@NotNull final Graphics g, final int from, final int to) {
-    final int verticalPosition = getHeight() - 5;
-    g.drawLine(from + getColumnWidth(), verticalPosition, to + getColumnWidth(), verticalPosition);
-  }
-
-
-  /**
-   * @return place (in px) where caret.
-   */
-  int getTextCaretPositionInPx() {
-    return (getCaretPosition() + 1) * getColumnWidth();
-  }
-
-  void setWaterMarkPlaceHolderText(@NotNull final String watermark) {
-    myPlaceHolder = new MyStatusText(this);
-    myPlaceHolder.setText(watermark);
-  }
-
-
-  @Override
-  public Dimension getPreferredSize() {
-    final Dimension dimension = super.getPreferredSize();
-    final int placeHolderTextLength = ((myPlaceHolder != null) ? myPlaceHolder.getText().length() : 0);
-    final int columns = Math.max(Math.max(getText().length(), placeHolderTextLength), getColumns());
-    final int desiredSize = columns * getColumnWidth();
-    return new Dimension(Math.max(Math.max(myPreferredWidth, dimension.width), desiredSize), dimension.height);
-  }
-
-  /**
-   * Display underline
-   *
-   * @param color color to underline
-   * @param from  from (in chars)
-   * @param to    (in chars)
-   */
-  final void underlineText(@NotNull final Color color, final int from, final int to) {
-    final int columnWidth = getColumnWidth();
-    synchronized (myUnderlineInfo) {
-      myUnderlineInfo.add(new UnderlineInfo(from * columnWidth, to * columnWidth, color));
-    }
-  }
-
-  /**
-   * Removes underline
-   */
-  void hideUnderline() {
-    synchronized (myUnderlineInfo) {
-      myUnderlineInfo.clear();
-    }
-  }
-
-  /**
-   * Sets appropriate width in pixels
-   *
-   * @param width width in px
-   */
-  void setPreferredWidthInPx(final int width) {
-    myPreferredWidth = width;
-  }
-
-
-  /**
-   * Wrapper to display placeholder
-   */
-  private class MyStatusText extends StatusText {
-    MyStatusText(final JComponent owner) {
-      super(owner);
-    }
-
-    @Override
-    protected boolean isStatusVisible() {
-      return SmartTextField.this.getText().isEmpty();
-    }
-  }
-
-  /**
-   * Information about underline
-   *
-   * @author Ilya.Kazakevich
-   */
-  private static final class UnderlineInfo extends Range<Integer> {
-    /**
-     * Color to use to underline
-     */
-    @NotNull
-    private final Color myColor;
-
-    /**
-     * @param from  underline from where (in px)
-     * @param to    underline to where (in px)
-     * @param color color to use to underline
-     */
-    UnderlineInfo(final int from, final int to, @NotNull final Color color) {
-      super(from, to);
-      myColor = color;
-    }
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/SuggestionKeyStrokeAction.java b/python/src/com/jetbrains/python/commandInterface/swingView/SuggestionKeyStrokeAction.java
deleted file mode 100644
index 088ff8c3fe27..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/SuggestionKeyStrokeAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandInterface.swingView;
-
-import java.awt.event.ActionEvent;
-
-/**
- * "Suggestion request" action
- *
- * @author Ilya.Kazakevich
- */
-final class SuggestionKeyStrokeAction extends KeyStrokeAction {
-  SuggestionKeyStrokeAction() {
-    super(KeyStrokeInfo.SUGGESTION);
-  }
-
-  @Override
-  public void actionPerformed(final ActionEvent e) {
-    myPresenter.suggestionRequested();
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandInterface/swingView/package-info.java b/python/src/com/jetbrains/python/commandInterface/swingView/package-info.java
deleted file mode 100644
index 56a257230d03..000000000000
--- a/python/src/com/jetbrains/python/commandInterface/swingView/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2000-2014 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.
- */
-
-/**
- * Command-line like interface view GUI. See {@link com.jetbrains.python.commandInterface.swingView.CommandInterfaceViewSwingImpl}
- * @author Ilya.Kazakevich
- */
-package com.jetbrains.python.commandInterface.swingView;
\ No newline at end of file
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLine.java b/python/src/com/jetbrains/python/commandLineParser/CommandLine.java
deleted file mode 100644
index 201a779554a8..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLine.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser;
-
-import com.intellij.openapi.util.text.StringUtil;
-import com.jetbrains.python.WordWithPosition;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Command line getCommandLineInfo result.
- * It consists of command itself and its parts.
- * Each part may be {@link com.jetbrains.python.commandLineParser.CommandLinePartType#ARGUMENT argument} or
- * {@link com.jetbrains.python.commandLineParser.CommandLinePartType#OPTION option} or something else.
- *
- * @author Ilya.Kazakevich
- */
-public final class CommandLine {
-  @NotNull
-  private final List<CommandLinePart> myParts = new ArrayList<CommandLinePart>();
-  @NotNull
-  private final WordWithPosition myCommand;
-
-  public CommandLine(
-    @NotNull final WordWithPosition command,
-    @NotNull final Collection<CommandLinePart> parts) {
-    myCommand = command;
-    myParts.addAll(parts);
-  }
-
-  /**
-   * @return command (i.e. "startapp" in "startapp my_app")
-   */
-  @NotNull
-  public WordWithPosition getCommand() {
-    return myCommand;
-  }
-
-  @NotNull
-  public List<CommandLinePart> getParts() {
-    return Collections.unmodifiableList(myParts);
-  }
-
-  /**
-   * @return all command parts as text (actually by bindning them back together)
-   */
-  @NotNull
-  public String getPartsAsText() {
-    final StringBuilder builder = new StringBuilder();
-    int lastPosition = 0;
-    for (final CommandLinePart part : getParts()) {
-      final WordWithPosition partWord = part.getWord();
-      if (lastPosition != partWord.getFrom()) {
-        builder.append(' ');
-      }
-      builder.append(partWord.getText());
-      lastPosition = partWord.getTo();
-    }
-    return StringUtil.trim(builder.toString());
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLineOption.java b/python/src/com/jetbrains/python/commandLineParser/CommandLineOption.java
deleted file mode 100644
index 217b4fa44dc0..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLineOption.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser;
-
-import com.jetbrains.python.WordWithPosition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Option. Each option has name and may also have attached argument like "--long-option=attached_arg" or "-sATTACHED_ARG"
- *
- * @author Ilya.Kazakevich
- */
-public final class CommandLineOption extends CommandLinePart {
-
-  @NotNull
-  private final String myOptionName;
-
-  @Nullable
-  private final WordWithPosition myAttachedArgument;
-
-  /**
-   * @param option           option (text and position)
-   * @param optionName       option name (like "--foo")
-   * @param attachedArgument option  attached argument (like --foo=ATTACHED_ARG)
-   */
-  public CommandLineOption(@NotNull final WordWithPosition option,
-                           @NotNull final String optionName,
-                           @Nullable final WordWithPosition attachedArgument) {
-    super(option);
-    myOptionName = optionName;
-    myAttachedArgument = attachedArgument;
-  }
-
-
-  /**
-   * @return option name (like "--foo")
-   */
-  @NotNull
-  public String getOptionName() {
-    return myOptionName;
-  }
-
-  /**
-   * @return option  attached argument (like --foo=ATTACHED_ARG)
-   */
-  @Nullable
-  public WordWithPosition getAttachedArgument() {
-    return myAttachedArgument;
-  }
-
-  @Override
-  public void accept(@NotNull final CommandLinePartVisitor visitor) {
-    visitor.visitOption(this);
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLineParser.java b/python/src/com/jetbrains/python/commandLineParser/CommandLineParser.java
deleted file mode 100644
index b52d785f54c9..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLineParser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser;
-
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Engine to {@link CommandLine} structure from text.
- *
- * @author Ilya.Kazakevich
- */
-public interface CommandLineParser {
-  /**
-   *
-   * @param commandLineText command line to parse
-   * @return command line information
-   * @throws MalformedCommandLineException in case of bad commandline
-   */
-  @NotNull
-  CommandLine parse(@NotNull String commandLineText) throws MalformedCommandLineException;
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/CommandLinePart.java b/python/src/com/jetbrains/python/commandLineParser/CommandLinePart.java
deleted file mode 100644
index 93af9e0d92ea..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/CommandLinePart.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser;
-
-import com.jetbrains.python.WordWithPosition;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Part of command line. Known subclasses are {@link CommandLineOption} and {@link CommandLineArgument}
- *
- * @author Ilya.Kazakevich
- * @see CommandLineArgument
- * @see CommandLineOption
- */
-public abstract class CommandLinePart {
-  @NotNull
-  private final WordWithPosition myWord;
-
-  /**
-   * @param word word (and its position) this part represents
-   */
-  protected CommandLinePart(@NotNull final WordWithPosition word) {
-    myWord = word;
-  }
-
-  /**
-   * @return word (and its position) this part represents
-   */
-  @NotNull
-  public final WordWithPosition getWord() {
-    return myWord;
-  }
-
-  /**
-   * @param visitor visitor to accept
-   */
-  public abstract void accept(@NotNull CommandLinePartVisitor visitor);
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/OptParseCommandLineParser.java b/python/src/com/jetbrains/python/commandLineParser/optParse/OptParseCommandLineParser.java
deleted file mode 100644
index 4612b87dc9a4..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/OptParseCommandLineParser.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser.optParse;
-
-import com.intellij.openapi.util.Pair;
-import com.jetbrains.python.WordWithPosition;
-import com.jetbrains.python.commandLineParser.*;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-
-/**
- * <p>
- * <a href="https://docs.python.org/2/library/optparse.html">Optparse</a>-based commandline parses.
- * According to optparse manual, commandline should look like:
- * <pre>command arg1 arg2 --long-bool-opt -s --another-opt opt_arg1 opt_arg2 --yet-another-opt=opt_arg3 arg4 </pre>.
- * You should understand difference between argument, long option, short option, and option argument before using this class.
- * It is documented in optparse manual.
- * </p>
- * <p>
- * This class provides not only args and options (like many other parsers do), but also <strong>position in command line</strong>
- * which may be useful when you want to mark argument somehow.
- * </p>
- *
- * @author Ilya.Kazakevich
- */
-public final class OptParseCommandLineParser implements CommandLineParser {
-  /**
-   * Supported option parsers (option types, actually)
-   * Short (-o) and long (--option) strategies are used here
-   */
-
-  private static final OptionParser[] OPTION_PARSERS = {new ShortOptionParser(), new LongOptionParser()};
-
-
-  @NotNull
-  @Override
-  public CommandLine parse(@NotNull final String commandLineText) throws MalformedCommandLineException {
-    final Deque<WordWithPosition> parts = new ArrayDeque<WordWithPosition>(WordWithPosition.splitText(commandLineText));
-    if (parts.isEmpty()) {
-      throw new MalformedCommandLineException("No command provided");
-    }
-    final WordWithPosition command = parts.pop();
-
-    final List<CommandLinePart> optionsAndArguments = new ArrayList<CommandLinePart>();
-
-    for (final WordWithPosition part : parts) {
-      final Pair<String, String> optionTextAndName = findOptionTextAndName(part.getText());
-      if (optionTextAndName != null) {
-        final String optionText = optionTextAndName.first;
-        final String optionName = optionTextAndName.second;
-        final WordWithPosition option = new WordWithPosition(optionText, part.getFrom(), part.getFrom() + optionText.length());
-
-        final WordWithPosition optionArgument;
-        if (optionText.length() == part.getText().length()) {
-          optionArgument = null;
-        }
-        else {
-          // Looks like we have option argument here.
-          final String argumentText = part.getText().substring(optionText.length());
-          optionArgument = new WordWithPosition(argumentText, option.getTo(), part.getTo());
-        }
-        optionsAndArguments.add(new CommandLineOption(option, optionName, optionArgument)); //Option
-        if (optionArgument != null) {
-          optionsAndArguments.add(new CommandLineArgument(optionArgument)); // And its argument
-        }
-      }
-      else {
-        optionsAndArguments.add(new CommandLineArgument(part)); //Not an option. Should be argument
-      }
-    }
-    return new CommandLine(command, optionsAndArguments);
-  }
-
-
-  /**
-   * Parse out option and its value iterating through the parsers
-   *
-   * @param text text believed to be an option like "--foo=123"
-   * @return [option_text, option_name] or null of no such option
-   * @see OptionParser#findOptionTextAndName(String)
-   */
-  @Nullable
-  private static Pair<String, String> findOptionTextAndName(@NotNull final String optionText) {
-    for (final OptionParser parser : OPTION_PARSERS) {
-      final Pair<String, String> optionTextAndName = parser.findOptionTextAndName(optionText);
-      if (optionTextAndName != null) {
-        return optionTextAndName;
-      }
-    }
-    return null;
-  }
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParser.java b/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParser.java
deleted file mode 100644
index 246e51fb47f9..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParser.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser.optParse;
-
-import com.intellij.openapi.util.Pair;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Engine that knows how to deal with option of certain style (like long and short)
- *
- * @author Ilya.Kazakevich
- */
-interface OptionParser {
-  /**
-   * @param optionText text to parse (like --foo=bar)
-   * @return null if option can't be parsed. Otherwise pair of [option_text, option_name]. That may match each other in some cases.
-   */
-  @Nullable
-  Pair<String, String> findOptionTextAndName(@NotNull String optionText);
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParserRegexBased.java b/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParserRegexBased.java
deleted file mode 100644
index 628bf4114550..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/optParse/OptionParserRegexBased.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 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.jetbrains.python.commandLineParser.optParse;
-
-import com.intellij.openapi.util.Pair;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Parses options using regex and template method
- *
- * @author Ilya.Kazakevich
- */
-abstract class OptionParserRegexBased implements OptionParser {
-  @NotNull
-  private final Pattern myPattern;
-
-  /**
-   * @param pattern regex. If option matches pattern, ({@link Matcher#find() opened matcher}) would be passed to template method
-   *                {@link #getOptionTextAndNameFromMatcher(Matcher)}
-   */
-  protected OptionParserRegexBased(@NotNull final Pattern pattern) {
-    myPattern = pattern;
-  }
-
-  @Nullable
-  @Override
-  public final Pair<String, String> findOptionTextAndName(@NotNull final String optionText) {
-    final Matcher matcher = myPattern.matcher(optionText);
-    if (!matcher.find()) {
-      return null;
-    }
-    return getOptionTextAndNameFromMatcher(matcher);
-  }
-
-  /**
-   * Obtains [option_text, option_name] from matcher
-   *
-   * @param matcher opened (with find() called) matcher
-   * @return pair [option_text, option_name]
-   */
-  @NotNull
-  protected abstract Pair<String, String> getOptionTextAndNameFromMatcher(@NotNull Matcher matcher);
-}
diff --git a/python/src/com/jetbrains/python/commandLineParser/package-info.java b/python/src/com/jetbrains/python/commandLineParser/package-info.java
deleted file mode 100644
index 23d92d7c45c6..000000000000
--- a/python/src/com/jetbrains/python/commandLineParser/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000-2015 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.
- */
-
-/**
- * Engine to parse commandline from string to {@link com.jetbrains.python.commandLineParser.CommandLine} structure.
- *
- * Command line consists of command itself,  {@link com.jetbrains.python.commandLineParser.CommandLineArgument arguments}
- * and {@link com.jetbrains.python.commandLineParser.CommandLineOption options}.
- * Use need to pass text to {@link com.jetbrains.python.commandLineParser.CommandLineParser parser} and obtain {@link com.jetbrains.python.commandLineParser.CommandLine}.
- * <p/>
- * Not like any other parsers, this package supports {@link com.jetbrains.python.WordWithPosition} telling you exactly with part of
- * command line is command or argument. That helps you to underline or emphisize some parts.
- *
- * @author Ilya.Kazakevich
- */
-package com.jetbrains.python.commandLineParser;
\ No newline at end of file
diff --git a/python/testData/commandLine/badCommandLineNoCommand.cmdline b/python/testData/commandLine/badCommandLineNoCommand.cmdline
new file mode 100644
index 000000000000..9a85201b350d
--- /dev/null
+++ b/python/testData/commandLine/badCommandLineNoCommand.cmdline
@@ -0,0 +1 @@
+<warning descr="Bad or unknown command. make sure this command really exists.">bad_command</warning> positional_argument --available-option=available_argument
\ No newline at end of file
diff --git a/python/testData/commandLine/badCommandLineWithCommand.cmdline b/python/testData/commandLine/badCommandLineWithCommand.cmdline
new file mode 100644
index 000000000000..284932b07a6a
--- /dev/null
+++ b/python/testData/commandLine/badCommandLineWithCommand.cmdline
@@ -0,0 +1 @@
+command <warning descr="Argument can't have this value. use autocompletion to check list of possible values.">bad_positional_value</warning> --available-option=<warning descr="Argument can't have this value. use autocompletion to check list of possible values.">bad_argument</warning> <warning descr="Bad or unknown option. make sure this option really exists.">--bad-option</warning> <warning descr="Excess argument or argument is not possible here">unexpected_argument</warning> --option-no-argument=<warning descr="Excess argument or argument is not possible here">asd</warning>
\ No newline at end of file
diff --git a/python/testData/commandLine/commandLine.cmdline b/python/testData/commandLine/commandLine.cmdline
new file mode 100644
index 000000000000..f7c4b2e577b4
--- /dev/null
+++ b/python/testData/commandLine/commandLine.cmdline
@@ -0,0 +1 @@
+command_name positional_argument_1 positional_argument_2 -sSMALL_OPTION_VALUE -a --long-option --long-option-2=long_option_value --long-option-3 argument_for_long_option
\ No newline at end of file
diff --git a/python/testData/commandLine/commandLine.txt b/python/testData/commandLine/commandLine.txt
new file mode 100644
index 000000000000..78055130d8fa
--- /dev/null
+++ b/python/testData/commandLine/commandLine.txt
@@ -0,0 +1,32 @@
+FILE
+  CommandLineCommandImpl(COMMAND)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('command_name')
+  PsiWhiteSpace(' ')
+  CommandLineArgumentImpl(ARGUMENT)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('positional_argument_1')
+  PsiWhiteSpace(' ')
+  CommandLineArgumentImpl(ARGUMENT)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('positional_argument_2')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(SHORT_OPTION_NAME_TOKEN)('-s')
+  CommandLineArgumentImpl(ARGUMENT)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('SMALL_OPTION_VALUE')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(SHORT_OPTION_NAME_TOKEN)('-a')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(LONG_OPTION_NAME_TOKEN)('--long-option')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(LONG_OPTION_NAME_TOKEN)('--long-option-2')
+    PsiElement(=)('=')
+  CommandLineArgumentImpl(ARGUMENT)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('long_option_value')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(LONG_OPTION_NAME_TOKEN)('--long-option-3')
+  PsiWhiteSpace(' ')
+  CommandLineArgumentImpl(ARGUMENT)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('argument_for_long_option')
\ No newline at end of file
diff --git a/python/testData/commandLine/goodCommandLine.cmdline b/python/testData/commandLine/goodCommandLine.cmdline
new file mode 100644
index 000000000000..c6b4fd34754d
--- /dev/null
+++ b/python/testData/commandLine/goodCommandLine.cmdline
@@ -0,0 +1 @@
+command positional_argument --available-option=available_argument
\ No newline at end of file
diff --git a/python/testData/commandLine/junk.cmdline b/python/testData/commandLine/junk.cmdline
new file mode 100644
index 000000000000..a5470be3af25
--- /dev/null
+++ b/python/testData/commandLine/junk.cmdline
@@ -0,0 +1 @@
+--can_t_be
\ No newline at end of file
diff --git a/python/testData/commandLine/junk.txt b/python/testData/commandLine/junk.txt
new file mode 100644
index 000000000000..a8129715640c
--- /dev/null
+++ b/python/testData/commandLine/junk.txt
@@ -0,0 +1,3 @@
+FILE
+  PsiErrorElement:LITERAL_STARTS_FROM_LETTER expected, got '--can_t_be'
+    PsiElement(LONG_OPTION_NAME_TOKEN)('--can_t_be')
\ No newline at end of file
diff --git a/python/testData/commandLine/optionNoValueJunk.cmdline b/python/testData/commandLine/optionNoValueJunk.cmdline
new file mode 100644
index 000000000000..5a95d4958e5c
--- /dev/null
+++ b/python/testData/commandLine/optionNoValueJunk.cmdline
@@ -0,0 +1 @@
+command --bad_value=
\ No newline at end of file
diff --git a/python/testData/commandLine/optionNoValueJunk.txt b/python/testData/commandLine/optionNoValueJunk.txt
new file mode 100644
index 000000000000..1d4e5fc0b398
--- /dev/null
+++ b/python/testData/commandLine/optionNoValueJunk.txt
@@ -0,0 +1,9 @@
+FILE
+  CommandLineCommandImpl(COMMAND)
+    PsiElement(LITERAL_STARTS_FROM_LETTER)('command')
+  PsiWhiteSpace(' ')
+  CommandLineOptionImpl(OPTION)
+    PsiElement(LONG_OPTION_NAME_TOKEN)('--bad_value')
+    PsiErrorElement:Space between argument is its value is unexpected
+      <empty list>
+    PsiElement(=)('=')
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspectionTest.java b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspectionTest.java
new file mode 100644
index 000000000000..1d17f701e68b
--- /dev/null
+++ b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineInspectionTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.psi.PsiFile;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.python.fixtures.PyTestCase;
+import org.junit.Assert;
+
+
+/**
+ * Tests command line inspection
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineInspectionTest extends PyTestCase {
+
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    CommandTestTools.initFileType();
+  }
+
+  /**
+   * Everything should be ok
+   */
+  public void testGoodCommandLine() throws Exception {
+    doTest();
+  }
+
+  /**
+   * No command provided in file
+   */
+  public void testBadCommandLineNoCommand() throws Exception {
+    doTest();
+  }
+
+  /**
+   * Command provided, but args and opts have errors
+   */
+  public void testBadCommandLineWithCommand() throws Exception {
+    doTest();
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return CommandTestTools.TEST_PATH;
+  }
+
+  /**
+   * Enables inspection on testName.cmdline and checks it.
+   */
+  private void doTest() {
+    final PsiFile file = myFixture.configureByFile(getTestName(true) + '.' + CommandLineFileType.EXTENSION);
+    Assert.assertSame("Bad file type!", CommandLineFile.class, file.getClass());
+    final CommandLineFile commandLineFile = (CommandLineFile)file;
+    commandLineFile.setCommands(CommandTestTools.createCommands());
+    myFixture.enableInspections(CommandLineInspection.class);
+    myFixture.checkHighlighting();
+  }
+}
diff --git a/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserTest.java b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserTest.java
new file mode 100644
index 000000000000..cf7424ffb8bc
--- /dev/null
+++ b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineParserTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+
+import com.intellij.testFramework.ParsingTestCase;
+
+import com.jetbrains.python.PythonTestUtil;
+
+
+/**
+ * Tests command line parser
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineParserTest extends ParsingTestCase {
+  public CommandLineParserTest() {
+    super("", CommandLineFileType.EXTENSION, true, new CommandLineParserDefinition());
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return CommandTestTools.TEST_PATH;
+  }
+
+
+  /**
+   * Should be ok
+   */
+  public void testCommandLine() throws Exception {
+    doTest(true);
+  }
+
+  /**
+   * Should have a lot of errors
+   */
+  public void testJunk() throws Exception {
+    doTest(true);
+  }
+
+  /**
+   * Should have error because option ends with "="
+   */
+  public void testOptionNoValueJunk() throws Exception {
+    doTest(true);
+  }
+}
diff --git a/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSuggestionTest.java b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSuggestionTest.java
new file mode 100644
index 000000000000..fa3d40e56c79
--- /dev/null
+++ b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandLineSuggestionTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.util.containers.HashSet;
+import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.python.fixtures.PyTestCase;
+import org.hamcrest.Matchers;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+
+
+import java.util.Set;
+
+
+/**
+ * Tests references provide correct suggestions for commands, options and argument in command line
+ *
+ * @author Ilya.Kazakevich
+ */
+public final class CommandLineSuggestionTest extends PyTestCase {
+  /**
+   * Ensures suggestions are correct
+   */
+  public void testSuggestions() throws Exception {
+    CommandTestTools.initFileType();
+    final CommandLineFile file =
+      (CommandLineFile)myFixture.configureByText(CommandLineFileType.INSTANCE, "command positional_ar --a");
+    file.setCommands(CommandTestTools.createCommands());
+
+    ensureSuggestions("command", "command");
+    ensureSuggestions("positional_ar", "positional_argument", "--option-no-argument", "--available-option");
+    ensureSuggestions("--a", "--option-no-argument", "--available-option");
+  }
+
+  /**
+   * @param initialPositionText place to move cusor to
+   * @param expectedSuggestions expected suggestions
+   */
+  private void ensureSuggestions(@NotNull final String initialPositionText, @NotNull final String... expectedSuggestions) {
+    moveByText(initialPositionText);
+    final Set<String> completions = new HashSet<String>();
+    for (final LookupElement element : myFixture.completeBasic()) {
+      completions.add(element.getLookupString());
+    }
+
+    Assert.assertThat("Bad suggestions", completions,
+                      Matchers.containsInAnyOrder(expectedSuggestions));
+  }
+
+
+  @Override
+  protected String getTestDataPath() {
+    return CommandTestTools.TEST_PATH;
+  }
+}
diff --git a/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandTestTools.java b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandTestTools.java
new file mode 100644
index 000000000000..360324e97cc8
--- /dev/null
+++ b/python/testSrc/com/jetbrains/commandInterface/gnuCommandLine/CommandTestTools.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2000-2015 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.jetbrains.commandInterface.gnuCommandLine;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.util.Pair;
+import com.jetbrains.commandInterface.command.*;
+import com.jetbrains.python.PythonTestUtil;
+import org.easymock.EasyMock;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Shared tools to testing command line
+ * @author Ilya.Kazakevich
+ */
+final class CommandTestTools {
+  @NotNull
+  static final String TEST_PATH = PythonTestUtil.getTestDataPath() + "/commandLine/";
+
+  private CommandTestTools() {
+  }
+
+  /**
+   * <pre>command --available-option=available_argument --option-no-argument positional_argument</pre>
+   * @return list cosists of fake command with opts and arguments
+   */
+  @TestOnly
+  @NotNull
+  static List<Command> createCommands() {
+    //command positional_argument --available-option=available_argument
+    final Command command = EasyMock.createMock(Command.class);
+    EasyMock.expect(command.getName()).andReturn("command").anyTimes();
+    EasyMock.expect(command.getHelp(true)).andReturn("some_text").anyTimes();
+    EasyMock.expect(command.getHelp(false)).andReturn("some_text").anyTimes();
+    final List<Option> options = new ArrayList<Option>();
+
+
+    options.add(new Option(Pair.create(1, new Argument(Collections.singletonList("available_argument"))), "",
+                           Collections.<String>emptyList(),
+                           Collections.singletonList("--available-option")));
+
+
+    options.add(new Option(null, "",
+                           Collections.<String>emptyList(),
+                           Collections.singletonList("--option-no-argument")));
+
+    EasyMock.expect(command.getOptions()).andReturn(options).anyTimes();
+
+
+    final ArgumentsInfo argumentInfo = new KnownArgumentsInfo(Collections.singletonList(
+      new Argument("positional_argument",
+                   Collections.singletonList("positional_argument"))), 1, 1);
+
+    EasyMock.expect(command.getArgumentsInfo()).andReturn(argumentInfo)
+      .anyTimes();
+
+    EasyMock.replay(command);
+    return Collections.singletonList(command);
+  }
+
+  /**
+   * Hack to register file type (not registered for some reason?)
+   */
+  static void initFileType() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        FileTypeManager.getInstance().associateExtension(CommandLineFileType.INSTANCE, CommandLineFileType.EXTENSION);
+      }
+    });
+  }
+}

From fe30e9aebbb660fed938ee40d6ebc47b17c33666 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 13 Mar 2015 15:36:01 +0300
Subject: [PATCH 07/27] maven: honor maven-compiler-plugin default source and
 target settings, it's 1.5

---
 .../importing/configurers/MavenCompilerConfigurer.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
index 50f6f46baa23..28658f06f5b1 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
@@ -36,11 +36,13 @@ public class MavenCompilerConfigurer extends MavenModuleConfigurer {
     if (module == null) return;
 
     String targetLevel = mavenProject.getTargetLevel();
-    if (targetLevel != null) {
-      CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(project);
-      configuration.setBytecodeTargetLevel(module, targetLevel);
+    if (targetLevel == null) {
+      targetLevel = "1.5";
     }
 
+    CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(project);
+    configuration.setBytecodeTargetLevel(module, targetLevel);
+
     VirtualFile directoryFile = mavenProject.getDirectoryFile();
 
     // Exclude src/main/archetype-resources

From 8a06a70b35656916f84aa26788ce3ac8813725e3 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 13 Mar 2015 13:40:54 +0100
Subject: [PATCH 08/27] protocol generator: convert to Kotlin firefox 36:
 script url could be null.

---
 .../src/org/jetbrains/io/JsonReaderEx.java    |  25 ++
 .../debugger/BreakpointManagerBase.java       |   3 +-
 .../protocol-model-generator.iml              |   8 +-
 .../jetbrains/protocolReader/BoxableType.java |  17 -
 .../jetbrains/protocolReader/BoxableType.kt   |  20 +
 .../protocolReader/ClassNameScheme.java       |  75 ----
 .../protocolReader/ClassNameScheme.kt         |  54 +++
 .../jetbrains/protocolReader/ClassScope.java  |  48 ---
 .../jetbrains/protocolReader/ClassScope.kt    |  30 ++
 ...reateStandaloneTypeBindingVisitorBase.java |  54 ---
 .../CreateStandaloneTypeBindingVisitorBase.kt |  32 ++
 .../protocolReader/DomainGenerator.java       | 394 ------------------
 .../protocolReader/DomainGenerator.kt         | 348 ++++++++++++++++
 .../org/jetbrains/protocolReader/FileSet.java |  66 ---
 .../org/jetbrains/protocolReader/FileSet.kt   |  56 +++
 .../jetbrains/protocolReader/Generator.java   | 314 --------------
 .../org/jetbrains/protocolReader/Generator.kt | 288 +++++++++++++
 .../protocolReader/InputClassScope.java       |  86 ----
 .../protocolReader/InputClassScope.kt         |  73 ++++
 .../jetbrains/protocolReader/ListType.java    |  44 --
 .../org/jetbrains/protocolReader/ListType.kt  |  34 ++
 .../jetbrains/protocolReader/MemberScope.java |  42 --
 .../jetbrains/protocolReader/MemberScope.kt   |  17 +
 ...reateStandaloneTypeBindingVisitorBase.java |  75 ----
 ...yCreateStandaloneTypeBindingVisitorBase.kt |  44 ++
 .../jetbrains/protocolReader/NamePath.java    |  45 --
 .../org/jetbrains/protocolReader/NamePath.kt  |  30 ++
 .../protocolReader/OutputClassScope.java      | 245 -----------
 .../protocolReader/OutputClassScope.kt        | 225 ++++++++++
 .../ParserRootInterfaceItem.java              |  35 --
 .../protocolReader/ParserRootInterfaceItem.kt |  26 ++
 .../ProtocolModelGenerator.java               |  45 --
 .../protocolReader/ProtocolModelGenerator.kt  |  40 ++
 .../ResolveAndGenerateScope.java              |  16 -
 .../protocolReader/ResolveAndGenerateScope.kt |  10 +
 .../protocolReader/StandaloneType.java        |  62 ---
 .../protocolReader/StandaloneType.kt          |  53 +++
 .../protocolReader/StandaloneTypeBinding.java |  45 --
 .../protocolReader/StandaloneTypeBinding.kt   |  35 ++
 .../protocolReader/TextOutConsumer.java       |   5 -
 .../protocolReader/TextOutConsumer.kt         |   5 +
 .../jetbrains/protocolReader/TypeData.java    | 176 --------
 .../org/jetbrains/protocolReader/TypeData.kt  | 159 +++++++
 .../protocolReader/TypeDescriptor.java        |  50 ---
 .../protocolReader/TypeDescriptor.kt          |  28 ++
 .../org/jetbrains/protocolReader/TypeMap.java |  61 ---
 .../org/jetbrains/protocolReader/TypeMap.kt   |  50 +++
 .../jetbrains/protocolReader/TypeVisitor.java |  27 --
 .../jetbrains/protocolReader/TypeVisitor.kt   |  23 +
 .../jsonProtocol/JsonOptionalField.java       |   1 -
 .../protocol-reader/protocol-reader.iml       |   2 +-
 .../protocol-reader/src/FieldProcessor.kt     |   9 +-
 .../protocol-reader/src/GlobalScope.kt        |   2 +-
 .../protocol-reader/src/InterfaceReader.kt    |  11 +-
 .../src/PrimitiveValueReader.kt               |  19 +-
 .../protocol-reader/src/ReaderGenerator.kt    |   5 +-
 .../schema-reader-generator.iml               |   7 +-
 .../jsonProtocol/ItemDescriptor.java          |  30 --
 .../jetbrains/jsonProtocol/ItemDescriptor.kt  |  28 ++
 .../jsonProtocol/ProtocolMetaModel.java       | 223 ----------
 .../jsonProtocol/ProtocolMetaModel.kt         | 196 +++++++++
 .../jsonProtocol/ProtocolSchemaReader.java    |  15 -
 .../jsonProtocol/ProtocolSchemaReader.kt      |  12 +
 .../jsonProtocol/SchemaReaderGenerator.java   |  11 -
 .../jsonProtocol/SchemaReaderGenerator.kt     |   5 +
 65 files changed, 1981 insertions(+), 2338 deletions(-)
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.kt
 delete mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.java
 create mode 100644 platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.kt
 delete mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.java
 create mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.kt
 delete mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.java
 create mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.kt
 delete mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.java
 create mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.kt
 delete mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.java
 create mode 100644 platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.kt

diff --git a/platform/platform-impl/src/org/jetbrains/io/JsonReaderEx.java b/platform/platform-impl/src/org/jetbrains/io/JsonReaderEx.java
index a8dd68264ab6..37cf6bf7066c 100644
--- a/platform/platform-impl/src/org/jetbrains/io/JsonReaderEx.java
+++ b/platform/platform-impl/src/org/jetbrains/io/JsonReaderEx.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2015 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 org.jetbrains.io;
 
 import com.google.gson.JsonParseException;
@@ -768,6 +783,16 @@ public final class JsonReaderEx implements Closeable {
     return peek() == JsonToken.STRING ? nextString() : null;
   }
 
+  public String nextNullableString() {
+    if (peek() == JsonToken.NULL) {
+      nextNull();
+      return null;
+    }
+    else {
+      return nextString();
+    }
+  }
+
   public String nextString() {
     return nextString(false);
   }
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManagerBase.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManagerBase.java
index ef975a9508f8..f67096bea6eb 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManagerBase.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/BreakpointManagerBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -149,6 +149,7 @@ public abstract class BreakpointManagerBase<T extends BreakpointBase<?>> impleme
   @NotNull
   @Override
   public Promise<Void> flush(@NotNull Breakpoint breakpoint) {
+    //noinspection unchecked
     return ((T)breakpoint).flush(this);
   }
 
diff --git a/platform/script-debugger/protocol/protocol-model-generator/protocol-model-generator.iml b/platform/script-debugger/protocol/protocol-model-generator/protocol-model-generator.iml
index f8843ee65867..ebbedb121590 100644
--- a/platform/script-debugger/protocol/protocol-model-generator/protocol-model-generator.iml
+++ b/platform/script-debugger/protocol/protocol-model-generator/protocol-model-generator.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -13,6 +13,8 @@
     <orderEntry type="module" module-name="protocol-reader" />
     <orderEntry type="library" name="Trove4j" level="project" />
     <orderEntry type="module" module-name="annotations" />
+    <orderEntry type="module" module-name="util-rt" />
+    <orderEntry type="module" module-name="platform-impl" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.java
deleted file mode 100644
index 3f4b8ea839ac..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jetbrains.protocolReader;
-
-abstract class BoxableType {
-  static final BoxableType STRING = new StandaloneType(new NamePath("String"), "writeString");
-  static final BoxableType ANY_STRING = new StandaloneType(new NamePath("String"), "writeString");
-  static final BoxableType INT = new StandaloneType(new NamePath("int"), "writeInt");
-  static final BoxableType LONG = new StandaloneType(new NamePath("long"), "writeLong");
-  static final BoxableType NUMBER = new StandaloneType(new NamePath("double"), "writeDouble");
-  static final BoxableType BOOLEAN = new StandaloneType(new NamePath("boolean"), "writeBoolean");
-  static final BoxableType MAP = new StandaloneType(new NamePath("java.util.Map<String, String>"), "writeMap");
-
-  abstract CharSequence getFullText();
-
-  abstract String getShortText(NamePath contextNamespace);
-
-  abstract String getWriteMethodName();
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.kt
new file mode 100644
index 000000000000..7758ea1fa8ee
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/BoxableType.kt
@@ -0,0 +1,20 @@
+package org.jetbrains.protocolReader
+
+abstract class BoxableType {
+
+  abstract fun getFullText(): CharSequence
+
+  abstract fun getShortText(contextNamespace: NamePath): String
+
+  abstract fun getWriteMethodName(): String
+
+  default object {
+    val STRING: BoxableType = StandaloneType(NamePath("String"), "writeString")
+    val ANY_STRING: BoxableType = StandaloneType(NamePath("String"), "writeString")
+    val INT: BoxableType = StandaloneType(NamePath("int"), "writeInt")
+    val LONG: BoxableType = StandaloneType(NamePath("long"), "writeLong")
+    val NUMBER: BoxableType = StandaloneType(NamePath("double"), "writeDouble")
+    val BOOLEAN: BoxableType = StandaloneType(NamePath("boolean"), "writeBoolean")
+    val MAP: BoxableType = StandaloneType(NamePath("java.util.Map<String, String>"), "writeMap")
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.java
deleted file mode 100644
index 43fc7d6b0534..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-
-abstract class ClassNameScheme {
-  private final String suffix;
-  private final String rootPackage;
-
-  private ClassNameScheme(@NotNull String suffix, String rootPackage) {
-    this.suffix = suffix;
-    this.rootPackage = rootPackage;
-  }
-
-  @NotNull
-  NamePath getFullName(@NotNull String domainName, String baseName) {
-    return new NamePath(getShortName(baseName), new NamePath(getPackageNameVirtual(domainName)));
-  }
-
-  @NotNull
-  String getShortName(@NotNull String baseName) {
-    return baseName.endsWith("Descriptor") ? baseName : new String(getShortNameChars(baseName));
-  }
-
-  private char[] getShortNameChars(@NotNull String baseName) {
-    char[] name = new char[baseName.length() + suffix.length()];
-    baseName.getChars(0, baseName.length(), name, 0);
-    if (!suffix.isEmpty()) {
-      suffix.getChars(0, suffix.length(), name, baseName.length());
-    }
-    if (Character.isLowerCase(name[0])) {
-      name[0] = Character.toUpperCase(name[0]);
-    }
-    if (baseName.endsWith("breakpoint")) {
-      name[baseName.length() - "breakpoint".length()] = 'B';
-    }
-    else if (baseName.endsWith("breakpoints")) {
-      name[baseName.length() - "breakpoints".length()] = 'B';
-    }
-    return name;
-  }
-
-  protected String getPackageNameVirtual(String domainName) {
-    return getPackageName(rootPackage, domainName);
-  }
-
-  @NotNull
-  public static String getPackageName(@NotNull String rootPackage, @NotNull String domain) {
-    if (domain.isEmpty()) {
-      return rootPackage;
-    }
-    return rootPackage + '.' + domain.toLowerCase();
-  }
-
-  static class Input extends ClassNameScheme {
-    Input(@NotNull String suffix, String rootPackage) {
-      super(suffix, rootPackage);
-    }
-
-    String getParseMethodName(String domain, String name) {
-      return "read" + Generator.capitalizeFirstChar(domain) + getShortName(name);
-    }
-  }
-
-  static class Output extends ClassNameScheme {
-    Output(String suffix, String rootPackage) {
-      super(suffix, rootPackage);
-    }
-  }
-
-  static class Common extends ClassNameScheme {
-    Common(String suffix, String rootPackage) {
-      super(suffix, rootPackage);
-    }
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.kt
new file mode 100644
index 000000000000..19e3170e1201
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassNameScheme.kt
@@ -0,0 +1,54 @@
+package org.jetbrains.protocolReader
+
+abstract class ClassNameScheme private(private val suffix: String, private val rootPackage: String) {
+  fun getFullName(domainName: String, baseName: String): NamePath {
+    return NamePath(getShortName(baseName), NamePath(getPackageNameVirtual(domainName)))
+  }
+
+  fun getShortName(baseName: String): String {
+    return if (baseName.endsWith("Descriptor")) baseName else String(getShortNameChars(baseName))
+  }
+
+  private fun getShortNameChars(baseName: String): CharArray {
+    val name = CharArray(baseName.length() + suffix.length())
+    baseName.getChars(0, baseName.length(), name, 0)
+    if (!suffix.isEmpty()) {
+      suffix.getChars(0, suffix.length(), name, baseName.length())
+    }
+    if (Character.isLowerCase(name[0])) {
+      name[0] = Character.toUpperCase(name[0])
+    }
+    if (baseName.endsWith("breakpoint")) {
+      name[baseName.length() - "breakpoint".length()] = 'B'
+    }
+    else if (baseName.endsWith("breakpoints")) {
+      name[baseName.length() - "breakpoints".length()] = 'B'
+    }
+    return name
+  }
+
+  fun getPackageNameVirtual(domainName: String): String {
+    return getPackageName(rootPackage, domainName)
+  }
+
+  class Input(suffix: String, rootPackage: String) : ClassNameScheme(suffix, rootPackage) {
+
+    fun getParseMethodName(domain: String, name: String): String {
+      return "read" + Generator.capitalizeFirstChar(domain) + getShortName(name)
+    }
+  }
+
+  class Output(suffix: String, rootPackage: String) : ClassNameScheme(suffix, rootPackage)
+
+  class Common(suffix: String, rootPackage: String) : ClassNameScheme(suffix, rootPackage)
+
+  default object {
+
+    public fun getPackageName(rootPackage: String, domain: String): String {
+      if (domain.isEmpty()) {
+        return rootPackage
+      }
+      return rootPackage + '.' + domain.toLowerCase()
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.java
deleted file mode 100644
index ccf0bee043fe..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-abstract class ClassScope {
-  private final List<TextOutConsumer> additionalMemberTexts = new ArrayList<>(2);
-  private final NamePath contextNamespace;
-  final DomainGenerator generator;
-
-  ClassScope(@NotNull DomainGenerator generator, @NotNull NamePath classNamespace) {
-    contextNamespace = classNamespace;
-    this.generator = generator;
-  }
-
-  protected String getShortClassName() {
-    return contextNamespace.getLastComponent();
-  }
-
-  NamePath getClassContextNamespace() {
-    return contextNamespace;
-  }
-
-  void addMember(@NotNull TextOutConsumer out) {
-    additionalMemberTexts.add(out);
-  }
-
-  void writeAdditionalMembers(@NotNull TextOutput out) {
-    if (additionalMemberTexts.isEmpty()) {
-      return;
-    }
-
-    out.newLine();
-    for (TextOutConsumer deferredWriter : additionalMemberTexts) {
-      deferredWriter.append(out);
-    }
-  }
-
-  protected abstract TypeData.Direction getTypeDirection();
-
-  @NotNull
-  protected static String getName(@NotNull ItemDescriptor.Named named) {
-    return named.shortName() == null ? named.name() : named.shortName();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.kt
new file mode 100644
index 000000000000..2e0c48cd6c1e
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ClassScope.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.protocolReader
+
+abstract class ClassScope(val generator: DomainGenerator, val classContextNamespace: NamePath) {
+  private val additionalMemberTexts = ArrayList<TextOutConsumer>(2)
+
+  protected fun getShortClassName(): String {
+    return classContextNamespace.lastComponent
+  }
+
+  fun addMember(out: TextOutConsumer) {
+    additionalMemberTexts.add(out)
+  }
+
+  fun writeAdditionalMembers(out: TextOutput) {
+    if (additionalMemberTexts.isEmpty()) {
+      return
+    }
+
+    out.newLine()
+    for (deferredWriter in additionalMemberTexts) {
+      deferredWriter.append(out)
+    }
+  }
+
+  abstract fun getTypeDirection(): TypeData.Direction
+
+  default object {
+    fun getName(named: ItemDescriptor.Named) = named.shortName() ?: named.name()
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.java
deleted file mode 100644
index d0653004cc42..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-abstract class CreateStandaloneTypeBindingVisitorBase implements TypeVisitor<StandaloneTypeBinding> {
-  private final ProtocolMetaModel.StandaloneType type;
-  private final DomainGenerator generator;
-
-  CreateStandaloneTypeBindingVisitorBase(DomainGenerator generator, ProtocolMetaModel.StandaloneType type) {
-    this.generator = generator;
-    this.type = type;
-  }
-
-  protected ProtocolMetaModel.StandaloneType getType() {
-    return type;
-  }
-
-  @Override
-  public StandaloneTypeBinding visitString() {
-    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.STRING, generator.generator.naming.commonTypedef, null);
-  }
-
-  @Override
-  public StandaloneTypeBinding visitInteger() {
-    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.INT, generator.generator.naming.commonTypedef, null);
-  }
-
-  @Override
-  public StandaloneTypeBinding visitRef(String refName) {
-    throw new RuntimeException();
-  }
-
-  @Override
-  public StandaloneTypeBinding visitBoolean() {
-    throw new RuntimeException();
-  }
-
-  @Override
-  public StandaloneTypeBinding visitNumber() {
-    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.NUMBER,
-                                              generator.generator.naming.commonTypedef, null);
-  }
-
-  @Override
-  public StandaloneTypeBinding visitMap() {
-    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.MAP,
-                                              generator.generator.naming.commonTypedef, null);
-  }
-
-  @Override
-  public StandaloneTypeBinding visitUnknown() {
-    throw new RuntimeException();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.kt
new file mode 100644
index 000000000000..dbe0f87e7da7
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/CreateStandaloneTypeBindingVisitorBase.kt
@@ -0,0 +1,32 @@
+package org.jetbrains.protocolReader
+
+abstract class CreateStandaloneTypeBindingVisitorBase(private val generator: DomainGenerator, protected val type: ProtocolMetaModel.StandaloneType) : TypeVisitor<StandaloneTypeBinding> {
+
+  override fun visitString(): StandaloneTypeBinding {
+    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.STRING, generator.generator.naming.commonTypedef, null)
+  }
+
+  override fun visitInteger(): StandaloneTypeBinding {
+    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.INT, generator.generator.naming.commonTypedef, null)
+  }
+
+  override fun visitRef(refName: String): StandaloneTypeBinding {
+    throw RuntimeException()
+  }
+
+  override fun visitBoolean(): StandaloneTypeBinding {
+    throw RuntimeException()
+  }
+
+  override fun visitNumber(): StandaloneTypeBinding {
+    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.NUMBER, generator.generator.naming.commonTypedef, null)
+  }
+
+  override fun visitMap(): StandaloneTypeBinding {
+    return generator.createTypedefTypeBinding(type, StandaloneTypeBinding.PredefinedTarget.MAP, generator.generator.naming.commonTypedef, null)
+  }
+
+  override fun visitUnknown(): StandaloneTypeBinding {
+    throw RuntimeException()
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.java
deleted file mode 100644
index 92775a1c6393..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.io.IOException;
-import java.util.List;
-
-class DomainGenerator {
-  final ProtocolMetaModel.Domain domain;
-  final Generator generator;
-
-  DomainGenerator(Generator generator, ProtocolMetaModel.Domain domain) {
-    this.generator = generator;
-    this.domain = domain;
-  }
-
-  void registerTypes() {
-    if (domain.types() != null) {
-      for (ProtocolMetaModel.StandaloneType type : domain.types()) {
-        generator.typeMap.getTypeData(domain.domain(), type.id()).setType(type);
-      }
-    }
-  }
-
-  @NotNull
-  static String fixMethodName(@NotNull String name) {
-    int i = name.indexOf("breakpoint");
-    return i > 0 ? name.substring(0, i) + 'B' + name.substring(i + 1) : name;
-  }
-
-  void generateCommandsAndEvents() throws IOException {
-    FileUpdater requestsFileUpdater = generator.startJavaFile(generator.naming.params.getPackageNameVirtual(domain.domain()), "Requests.java");
-    TextOutput out = requestsFileUpdater.out;
-    out.append("import org.jetbrains.annotations.NotNull;").newLine();
-    out.append("import org.jetbrains.jsonProtocol.Request;").newLine();
-    out.newLine().append("public final class ").append("Requests");
-    out.openBlock();
-
-    boolean isFirst = true;
-
-    for (ProtocolMetaModel.Command command : domain.commands()) {
-      boolean hasResponse = command.returns() != null;
-
-      boolean onlyMandatoryParams = true;
-      List<ProtocolMetaModel.Parameter> params = command.parameters();
-      boolean hasParams = params != null && !params.isEmpty();
-      if (hasParams) {
-        for (ProtocolMetaModel.Parameter parameter : params) {
-          if (parameter.optional()) {
-            onlyMandatoryParams = false;
-          }
-        }
-      }
-
-      String returnType = hasResponse ? generator.naming.commandResult.getShortName(command.name()) : "Void";
-      if (onlyMandatoryParams) {
-        if (isFirst) {
-          isFirst = false;
-        }
-        else {
-          out.newLine().newLine();
-        }
-        out.append("@NotNull").newLine().append("public static Request<");
-        out.append(returnType);
-        out.append(">").space().append(fixMethodName(command.name())).append("(");
-
-        OutputClassScope classScope = new OutputClassScope(this, generator.naming.params.getFullName(domain.domain(), command.name()));
-        BoxableType[] parameterTypes = hasParams ? new BoxableType[params.size()] : null;
-        if (hasParams) {
-          classScope.writeMethodParameters(out, params, parameterTypes);
-        }
-
-        out.append(')').openBlock();
-
-        if (hasParams) {
-          out.append("V8SimpleRequest<").append(returnType).append(">").append(" r =");
-        }
-        else {
-          out.append("return");
-        }
-
-        out.append(" new V8SimpleRequest<").append(returnType).append(">(\"");
-        if (!domain.domain().isEmpty()) {
-          out.append(domain.domain()).append('.');
-        }
-        out.append(command.name()).append("\")").semi();
-
-        if (hasParams) {
-          classScope.writeWriteCalls(out, params, parameterTypes, "r");
-          out.newLine().append("return r").semi();
-        }
-
-        out.closeBlock();
-      }
-      else {
-        generateRequest(command, returnType);
-      }
-
-      if (hasResponse) {
-        FileUpdater fileUpdater = generator.startJavaFile(generator.naming.commandResult, domain, command.name());
-        generateJsonProtocolInterface(fileUpdater.out, generator.naming.commandResult.getShortName(command.name()), command.description(), command.returns(), null);
-        fileUpdater.update();
-        generator.jsonProtocolParserClassNames.add(generator.naming.commandResult.getFullName(domain.domain(), command.name()).getFullText());
-        generator.parserRootInterfaceItems.add(new ParserRootInterfaceItem(domain.domain(), command.name(), generator.naming.commandResult));
-      }
-    }
-
-    out.closeBlock();
-    requestsFileUpdater.update();
-
-    if (domain.events() != null) {
-      for (ProtocolMetaModel.Event event : domain.events()) {
-        generateEvenData(event);
-        generator.jsonProtocolParserClassNames.add(generator.naming.eventData.getFullName(domain.domain(), event.name()).getFullText());
-        generator.parserRootInterfaceItems.add(new ParserRootInterfaceItem(domain.domain(), event.name(), generator.naming.eventData));
-      }
-    }
-  }
-
-  private void generateRequest(@NotNull final ProtocolMetaModel.Command command, @NotNull final String returnType) throws IOException {
-    TextOutConsumer baseTypeBuilder = new TextOutConsumer() {
-      @Override
-      public void append(TextOutput out) {
-        out.space().append("extends ").append(generator.naming.requestClassName).append('<').append(returnType).append('>');
-      }
-    };
-
-    TextOutConsumer memberBuilder = new TextOutConsumer() {
-      @Override
-      public void append(TextOutput out) {
-        out.append("@NotNull").newLine().append("@Override").newLine().append("public String getMethodName()").openBlock();
-        out.append("return \"");
-        if (!domain.domain().isEmpty()) {
-          out.append(domain.domain()).append('.');
-        }
-        out.append(command.name()).append("\";").closeBlock();
-      }
-    };
-    generateTopLevelOutputClass(generator.naming.params, command.name(), command.description(), baseTypeBuilder,
-                                memberBuilder, command.parameters());
-  }
-
-  void generateCommandAdditionalParam(ProtocolMetaModel.StandaloneType type) throws IOException {
-    generateTopLevelOutputClass(generator.naming.additionalParam, type.id(), type.description(), null, null, type.properties());
-  }
-
-  private <P extends ItemDescriptor.Named> void generateTopLevelOutputClass(@NotNull ClassNameScheme nameScheme,
-                                                                            String baseName,
-                                                                            String description,
-                                                                            @Nullable TextOutConsumer baseType,
-                                                                            @Nullable TextOutConsumer additionalMemberText,
-                                                                            List<P> properties) throws IOException {
-    FileUpdater fileUpdater = generator.startJavaFile(nameScheme, domain, baseName);
-    if (nameScheme == generator.naming.params) {
-      fileUpdater.out.append("import org.jetbrains.annotations.NotNull;").newLine().newLine();
-    }
-    generateOutputClass(fileUpdater.out, nameScheme.getFullName(domain.domain(), baseName), description, baseType, additionalMemberText, properties);
-    fileUpdater.update();
-  }
-
-  private <P extends ItemDescriptor.Named> void generateOutputClass(@NotNull TextOutput out,
-                                                                    NamePath classNamePath,
-                                                                    String description,
-                                                                    @Nullable TextOutConsumer baseType,
-                                                                    TextOutConsumer additionalMemberText,
-                                                                    List<P> properties) {
-    out.doc(description);
-    out.append("public final class ").append(classNamePath.getLastComponent());
-    if (baseType == null) {
-      out.append(" extends ").append("org.jetbrains.jsonProtocol.OutMessage");
-    }
-    else {
-      baseType.append(out);
-    }
-
-    OutputClassScope classScope = new OutputClassScope(this, classNamePath);
-    if (additionalMemberText != null) {
-      classScope.addMember(additionalMemberText);
-    }
-
-    out.openBlock();
-    classScope.generate(out, properties);
-    classScope.writeAdditionalMembers(out);
-    out.closeBlock();
-  }
-
-  StandaloneTypeBinding createStandaloneOutputTypeBinding(@NotNull ProtocolMetaModel.StandaloneType type, @NotNull String name) {
-    return Generator.switchByType(type, new MyCreateStandaloneTypeBindingVisitorBase(this, type, name));
-  }
-
-  StandaloneTypeBinding createStandaloneInputTypeBinding(ProtocolMetaModel.StandaloneType type) {
-    return Generator.switchByType(type, new CreateStandaloneTypeBindingVisitorBase(this, type) {
-      @Override
-      public StandaloneTypeBinding visitObject(List<ProtocolMetaModel.ObjectProperty> properties) {
-        return createStandaloneObjectInputTypeBinding(getType(), properties);
-      }
-
-      @Override
-      public StandaloneTypeBinding visitEnum(List<String> enumConstants) {
-        return createStandaloneEnumInputTypeBinding(getType(), enumConstants,
-                                                    TypeData.Direction.INPUT);
-      }
-
-      @Override
-      public StandaloneTypeBinding visitArray(ProtocolMetaModel.ArrayItemType items) {
-        ResolveAndGenerateScope resolveAndGenerateScope = new ResolveAndGenerateScope() {
-          // This class is responsible for generating ad hoc type.
-          // If we ever are to do it, we should generate into string buffer and put strings
-          // inside TypeDef class.
-          @Override
-          public String getDomainName() {
-            return domain.domain();
-          }
-
-          @Override
-          public TypeData.Direction getTypeDirection() {
-            return TypeData.Direction.INPUT;
-          }
-
-          @Override
-          public <T extends ItemDescriptor> TypeDescriptor resolveType(T typedObject) {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public BoxableType generateNestedObject(String description, List<ProtocolMetaModel.ObjectProperty> properties) {
-            throw new UnsupportedOperationException();
-          }
-        };
-        BoxableType itemBoxableType = generator.resolveType(items, resolveAndGenerateScope).getType();
-
-        final BoxableType arrayType = new ListType(itemBoxableType);
-        StandaloneTypeBinding.Target target = new StandaloneTypeBinding.Target() {
-          @Override
-          public BoxableType resolve(ResolveContext context) {
-            return arrayType;
-          }
-        };
-
-        return createTypedefTypeBinding(getType(), target, generator.naming.inputTypedef, TypeData.Direction.INPUT);
-      }
-    });
-  }
-
-  StandaloneTypeBinding createStandaloneObjectInputTypeBinding(@NotNull final ProtocolMetaModel.StandaloneType type, @Nullable final List<ProtocolMetaModel.ObjectProperty> properties) {
-    final String name = type.id();
-    final NamePath fullTypeName = generator.naming.inputValue.getFullName(domain.domain(), name);
-    generator.jsonProtocolParserClassNames.add(fullTypeName.getFullText());
-
-    return new StandaloneTypeBinding() {
-      @Override
-      public BoxableType getJavaType() {
-        return new StandaloneType(fullTypeName, "writeMessage");
-      }
-
-      @Override
-      public void generate() throws IOException {
-        NamePath className = generator.naming.inputValue.getFullName(domain.domain(), name);
-        FileUpdater fileUpdater = generator.startJavaFile(generator.naming.inputValue, domain, name);
-        TextOutput out = fileUpdater.out;
-        if (type.description() != null) {
-          out.doc(type.description());
-        }
-
-        out.append("@org.jetbrains.jsonProtocol.JsonType").newLine();
-        out.append("public interface ").append(className.getLastComponent()).openBlock();
-        InputClassScope classScope = new InputClassScope(DomainGenerator.this, className);
-        if (properties != null) {
-          classScope.generateDeclarationBody(out, properties);
-        }
-        classScope.writeAdditionalMembers(out);
-        out.closeBlock();
-        fileUpdater.update();
-      }
-
-      @Override public TypeData.Direction getDirection() {
-        return TypeData.Direction.INPUT;
-      }
-    };
-  }
-
-  StandaloneTypeBinding createStandaloneEnumInputTypeBinding(final ProtocolMetaModel.StandaloneType type,
-                                                             final List<String> enumConstants, final TypeData.Direction direction) {
-    final String name = type.id();
-    return new StandaloneTypeBinding() {
-      @Override
-      public BoxableType getJavaType() {
-        return new StandaloneType(generator.naming.inputEnum.getFullName(domain.domain(), name), "writeEnum");
-      }
-
-      @Override
-      public void generate() throws IOException {
-        FileUpdater fileUpdater = generator.startJavaFile(generator.naming.inputEnum, domain, name);
-        fileUpdater.out.doc(type.description());
-        Enums.appendEnums(enumConstants, generator.naming.inputEnum.getShortName(name), true, fileUpdater.out);
-        fileUpdater.update();
-      }
-
-      @Override
-      public TypeData.Direction getDirection() {
-        return direction;
-      }
-    };
-  }
-
-  /**
-   * Typedef is an empty class that just holds description and
-   * refers to an actual type (such as String).
-   */
-  StandaloneTypeBinding createTypedefTypeBinding(final ProtocolMetaModel.StandaloneType type, StandaloneTypeBinding.Target target,
-                                                 final ClassNameScheme nameScheme, final TypeData.Direction direction) {
-    final String name = type.id();
-    final NamePath typedefJavaName = nameScheme.getFullName(domain.domain(), name);
-    final BoxableType actualJavaType = target.resolve(new StandaloneTypeBinding.Target.ResolveContext() {
-      @Override
-      public BoxableType generateNestedObject(String shortName, String description, List<ProtocolMetaModel.ObjectProperty> properties) {
-        NamePath classNamePath = new NamePath(shortName, typedefJavaName);
-        if (direction == null) {
-          throw new RuntimeException("Unsupported");
-        }
-
-        switch (direction) {
-          case INPUT:
-            throw new RuntimeException("TODO");
-          case OUTPUT:
-            TextOutput out = new TextOutput(new StringBuilder());
-            generateOutputClass(out, classNamePath, description, null, null, properties);
-            break;
-          default:
-            throw new RuntimeException();
-        }
-        return new StandaloneType(new NamePath(shortName, typedefJavaName), "writeMessage");
-      }
-    });
-
-    return new StandaloneTypeBinding() {
-      @Override
-      public BoxableType getJavaType() {
-        return actualJavaType;
-      }
-
-      @Override
-      public void generate() {
-      }
-
-      @Override
-      public TypeData.Direction getDirection() {
-        return direction;
-      }
-    };
-  }
-
-  private void generateEvenData(final ProtocolMetaModel.Event event) throws IOException {
-    String className = generator.naming.eventData.getShortName(event.name());
-    FileUpdater fileUpdater = generator.startJavaFile(generator.naming.eventData, domain, event.name());
-    final String domainName = domain.domain();
-    final CharSequence fullName = generator.naming.eventData.getFullName(domainName, event.name()).getFullText();
-    generateJsonProtocolInterface(fileUpdater.out, className, event.description(), event.parameters(), new TextOutConsumer() {
-      @Override
-      public void append(TextOutput out) {
-        out.newLine().append("org.jetbrains.wip.protocol.WipEventType<").append(fullName).append("> TYPE").newLine();
-        out.append("\t= new org.jetbrains.wip.protocol.WipEventType<").append(fullName).append(">");
-        out.append("(\"").append(domainName).append('.').append(event.name()).append("\", ").append(fullName).append(".class)").openBlock();
-        {
-          out.append("@Override").newLine().append("public ").append(fullName).append(" read(");
-          out.append(generator.naming.inputPackage).append('.').append(Generator.READER_INTERFACE_NAME + " protocolReader, ").append(Util.JSON_READER_PARAMETER_DEF).append(")").openBlock();
-          out.append("return protocolReader.").append(generator.naming.eventData.getParseMethodName(domainName, event.name())).append("(reader);").closeBlock();
-        }
-        out.closeBlock();
-        out.semi();
-      }
-    });
-    fileUpdater.update();
-  }
-
-  private void generateJsonProtocolInterface(TextOutput out, String className, String description, List<ProtocolMetaModel.Parameter> parameters, TextOutConsumer additionalMembersText) {
-    if (description != null) {
-      out.doc(description);
-    }
-    out.append("@org.jetbrains.jsonProtocol.JsonType").newLine().append("public interface ").append(className).openBlock();
-    InputClassScope classScope = new InputClassScope(this, new NamePath(className, new NamePath(ClassNameScheme.getPackageName(generator.naming.inputPackage, domain.domain()))));
-    if (additionalMembersText != null) {
-      classScope.addMember(additionalMembersText);
-    }
-    if (parameters != null) {
-      classScope.generateDeclarationBody(out, parameters);
-    }
-    classScope.writeAdditionalMembers(out);
-    out.closeBlock();
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.kt
new file mode 100644
index 000000000000..4b45aa5edbaa
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/DomainGenerator.kt
@@ -0,0 +1,348 @@
+package org.jetbrains.protocolReader
+
+class DomainGenerator(val generator: Generator, val domain: ProtocolMetaModel.Domain) {
+
+  fun registerTypes() {
+    if (domain.types() != null) {
+      for (type in domain.types()!!) {
+        generator.typeMap.getTypeData(domain.domain(), type.id()).setType(type)
+      }
+    }
+  }
+
+  throws(javaClass<IOException>())
+  fun generateCommandsAndEvents() {
+    val requestsFileUpdater = generator.startJavaFile(generator.naming.params.getPackageNameVirtual(domain.domain()), "Requests.java")
+    val out = requestsFileUpdater.out
+    out.append("import org.jetbrains.annotations.NotNull;").newLine()
+    out.append("import org.jetbrains.jsonProtocol.Request;").newLine()
+    out.newLine().append("public final class ").append("Requests")
+    out.openBlock()
+
+    var isFirst = true
+
+    for (command in domain.commands()) {
+      val hasResponse = command.returns() != null
+
+      var onlyMandatoryParams = true
+      val params = command.parameters()
+      val hasParams = params != null && !params.isEmpty()
+      if (hasParams) {
+        for (parameter in params!!) {
+          if (parameter.optional()) {
+            onlyMandatoryParams = false
+          }
+        }
+      }
+
+      val returnType = if (hasResponse) generator.naming.commandResult.getShortName(command.name()) else "Void"
+      if (onlyMandatoryParams) {
+        if (isFirst) {
+          isFirst = false
+        }
+        else {
+          out.newLine().newLine()
+        }
+        out.append("@NotNull").newLine().append("public static Request<")
+        out.append(returnType)
+        out.append(">").space().append(fixMethodName(command.name())).append("(")
+
+        val classScope = OutputClassScope(this, generator.naming.params.getFullName(domain.domain(), command.name()))
+        val parameterTypes = if (hasParams) arrayOfNulls<BoxableType>(params!!.size()) else null
+        if (hasParams) {
+          classScope.writeMethodParameters<ProtocolMetaModel.Parameter>(out, params!!, parameterTypes!!)
+        }
+
+        out.append(')').openBlock()
+
+        if (hasParams) {
+          out.append("V8SimpleRequest<").append(returnType).append(">").append(" r =")
+        }
+        else {
+          out.append("return")
+        }
+
+        out.append(" new V8SimpleRequest<").append(returnType).append(">(\"")
+        if (!domain.domain().isEmpty()) {
+          out.append(domain.domain()).append('.')
+        }
+        out.append(command.name()).append("\")").semi()
+
+        if (hasParams) {
+          classScope.writeWriteCalls<ProtocolMetaModel.Parameter>(out, params!!, parameterTypes!!, "r")
+          out.newLine().append("return r").semi()
+        }
+
+        out.closeBlock()
+      }
+      else {
+        generateRequest(command, returnType)
+      }
+
+      if (hasResponse) {
+        val fileUpdater = generator.startJavaFile(generator.naming.commandResult, domain, command.name())
+        generateJsonProtocolInterface(fileUpdater.out, generator.naming.commandResult.getShortName(command.name()), command.description(), command.returns(), null)
+        fileUpdater.update()
+        generator.jsonProtocolParserClassNames.add(generator.naming.commandResult.getFullName(domain.domain(), command.name()).getFullText())
+        generator.parserRootInterfaceItems.add(ParserRootInterfaceItem(domain.domain(), command.name(), generator.naming.commandResult))
+      }
+    }
+
+    out.closeBlock()
+    requestsFileUpdater.update()
+
+    if (domain.events() != null) {
+      for (event in domain.events()!!) {
+        generateEvenData(event)
+        generator.jsonProtocolParserClassNames.add(generator.naming.eventData.getFullName(domain.domain(), event.name()).getFullText())
+        generator.parserRootInterfaceItems.add(ParserRootInterfaceItem(domain.domain(), event.name(), generator.naming.eventData))
+      }
+    }
+  }
+
+  throws(javaClass<IOException>())
+  private fun generateRequest(command: ProtocolMetaModel.Command, returnType: String) {
+    val baseTypeBuilder = object : TextOutConsumer {
+      override fun append(out: TextOutput) {
+        out.space().append("extends ").append(generator.naming.requestClassName).append('<').append(returnType).append('>')
+      }
+    }
+
+    val memberBuilder = object : TextOutConsumer {
+      override fun append(out: TextOutput) {
+        out.append("@NotNull").newLine().append("@Override").newLine().append("public String getMethodName()").openBlock()
+        out.append("return \"")
+        if (!domain.domain().isEmpty()) {
+          out.append(domain.domain()).append('.')
+        }
+        out.append(command.name()).append("\";").closeBlock()
+      }
+    }
+    generateTopLevelOutputClass(generator.naming.params, command.name(), command.description(), baseTypeBuilder, memberBuilder, command.parameters())
+  }
+
+  fun generateCommandAdditionalParam(type: ProtocolMetaModel.StandaloneType) {
+    generateTopLevelOutputClass(generator.naming.additionalParam, type.id(), type.description(), null, null, type.properties())
+  }
+
+  private fun <P : ItemDescriptor.Named> generateTopLevelOutputClass(nameScheme: ClassNameScheme, baseName: String, description: String?, baseType: TextOutConsumer?, additionalMemberText: TextOutConsumer?, properties: List<P>?) {
+    val fileUpdater = generator.startJavaFile(nameScheme, domain, baseName)
+    if (nameScheme == generator.naming.params) {
+      fileUpdater.out.append("import org.jetbrains.annotations.NotNull;").newLine().newLine()
+    }
+    generateOutputClass(fileUpdater.out, nameScheme.getFullName(domain.domain(), baseName), description, baseType, additionalMemberText, properties)
+    fileUpdater.update()
+  }
+
+  private fun <P : ItemDescriptor.Named> generateOutputClass(out: TextOutput, classNamePath: NamePath, description: String?, baseType: TextOutConsumer?, additionalMemberText: TextOutConsumer?, properties: List<P>?) {
+    out.doc(description)
+    out.append("public final class ").append(classNamePath.lastComponent)
+    if (baseType == null) {
+      out.append(" extends ").append("org.jetbrains.jsonProtocol.OutMessage")
+    }
+    else {
+      baseType.append(out)
+    }
+
+    val classScope = OutputClassScope(this, classNamePath)
+    if (additionalMemberText != null) {
+      classScope.addMember(additionalMemberText)
+    }
+
+    out.openBlock()
+    classScope.generate<P>(out, properties)
+    classScope.writeAdditionalMembers(out)
+    out.closeBlock()
+  }
+
+  fun createStandaloneOutputTypeBinding(type: ProtocolMetaModel.StandaloneType, name: String): StandaloneTypeBinding {
+    return Generator.switchByType<StandaloneTypeBinding>(type, MyCreateStandaloneTypeBindingVisitorBase(this, type, name))
+  }
+
+  fun createStandaloneInputTypeBinding(type: ProtocolMetaModel.StandaloneType): StandaloneTypeBinding {
+    return Generator.switchByType<StandaloneTypeBinding>(type, object : CreateStandaloneTypeBindingVisitorBase(this, type) {
+      override fun visitObject(properties: List<ProtocolMetaModel.ObjectProperty>?): StandaloneTypeBinding {
+        return createStandaloneObjectInputTypeBinding(type, properties)
+      }
+
+      override fun visitEnum(enumConstants: List<String>): StandaloneTypeBinding {
+        return createStandaloneEnumInputTypeBinding(type, enumConstants, TypeData.Direction.INPUT)
+      }
+
+      override fun visitArray(items: ProtocolMetaModel.ArrayItemType): StandaloneTypeBinding {
+        val resolveAndGenerateScope = object : ResolveAndGenerateScope {
+          // This class is responsible for generating ad hoc type.
+          // If we ever are to do it, we should generate into string buffer and put strings
+          // inside TypeDef class.
+          override fun getDomainName(): String {
+            return domain.domain()
+          }
+
+          override fun getTypeDirection(): TypeData.Direction {
+            return TypeData.Direction.INPUT
+          }
+
+          override fun <T : ItemDescriptor> resolveType(typedObject: T): TypeDescriptor {
+            throw UnsupportedOperationException()
+          }
+
+          override fun generateNestedObject(description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?) = throw UnsupportedOperationException()
+        }
+        val itemBoxableType = generator.resolveType(items, resolveAndGenerateScope).type
+
+        val arrayType = ListType(itemBoxableType)
+        val target = object : StandaloneTypeBinding.Target {
+          override fun resolve(context: StandaloneTypeBinding.Target.ResolveContext): BoxableType {
+            return arrayType
+          }
+        }
+
+        return createTypedefTypeBinding(type, target, generator.naming.inputTypedef, TypeData.Direction.INPUT)
+      }
+    })
+  }
+
+  fun createStandaloneObjectInputTypeBinding(type: ProtocolMetaModel.StandaloneType, properties: List<ProtocolMetaModel.ObjectProperty>?): StandaloneTypeBinding {
+    val name = type.id()
+    val fullTypeName = generator.naming.inputValue.getFullName(domain.domain(), name)
+    generator.jsonProtocolParserClassNames.add(fullTypeName.getFullText())
+
+    return object : StandaloneTypeBinding {
+      override fun getJavaType(): BoxableType {
+        return StandaloneType(fullTypeName, "writeMessage")
+      }
+
+      throws(javaClass<IOException>())
+      override fun generate() {
+        val className = generator.naming.inputValue.getFullName(domain.domain(), name)
+        val fileUpdater = generator.startJavaFile(generator.naming.inputValue, domain, name)
+        val out = fileUpdater.out
+        if (type.description() != null) {
+          out.doc(type.description())
+        }
+
+        out.append("@org.jetbrains.jsonProtocol.JsonType").newLine()
+        out.append("public interface ").append(className.lastComponent).openBlock()
+        val classScope = InputClassScope(this@DomainGenerator, className)
+        if (properties != null) {
+          classScope.generateDeclarationBody(out, properties)
+        }
+        classScope.writeAdditionalMembers(out)
+        out.closeBlock()
+        fileUpdater.update()
+      }
+
+      override fun getDirection(): TypeData.Direction? {
+        return TypeData.Direction.INPUT
+      }
+    }
+  }
+
+  fun createStandaloneEnumInputTypeBinding(type: ProtocolMetaModel.StandaloneType, enumConstants: List<String>, direction: TypeData.Direction): StandaloneTypeBinding {
+    val name = type.id()
+    return object : StandaloneTypeBinding {
+      override fun getJavaType(): BoxableType {
+        return StandaloneType(generator.naming.inputEnum.getFullName(domain.domain(), name), "writeEnum")
+      }
+
+      throws(javaClass<IOException>())
+      override fun generate() {
+        val fileUpdater = generator.startJavaFile(generator.naming.inputEnum, domain, name)
+        fileUpdater.out.doc(type.description())
+        Enums.appendEnums(enumConstants, generator.naming.inputEnum.getShortName(name), true, fileUpdater.out)
+        fileUpdater.update()
+      }
+
+      override fun getDirection(): TypeData.Direction? {
+        return direction
+      }
+    }
+  }
+
+  /**
+   * Typedef is an empty class that just holds description and
+   * refers to an actual type (such as String).
+   */
+  fun createTypedefTypeBinding(type: ProtocolMetaModel.StandaloneType, target: StandaloneTypeBinding.Target, nameScheme: ClassNameScheme, direction: TypeData.Direction?): StandaloneTypeBinding {
+    val name = type.id()
+    val typedefJavaName = nameScheme.getFullName(domain.domain(), name)
+    val actualJavaType = target.resolve(object : StandaloneTypeBinding.Target.ResolveContext {
+      override fun generateNestedObject(shortName: String, description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?): BoxableType {
+        val classNamePath = NamePath(shortName, typedefJavaName)
+        if (direction == null) {
+          throw RuntimeException("Unsupported")
+        }
+
+        when (direction) {
+          TypeData.Direction.INPUT -> throw RuntimeException("TODO")
+          TypeData.Direction.OUTPUT -> {
+            val out = TextOutput(StringBuilder())
+            generateOutputClass(out, classNamePath, description, null, null, properties)
+          }
+          else -> throw RuntimeException()
+        }
+        return StandaloneType(NamePath(shortName, typedefJavaName), "writeMessage")
+      }
+    })
+
+    return object : StandaloneTypeBinding {
+      override fun getJavaType(): BoxableType {
+        return actualJavaType
+      }
+
+      override fun generate() {
+      }
+
+      override fun getDirection(): TypeData.Direction? {
+        return direction
+      }
+    }
+  }
+
+  throws(javaClass<IOException>())
+  private fun generateEvenData(event: ProtocolMetaModel.Event) {
+    val className = generator.naming.eventData.getShortName(event.name())
+    val fileUpdater = generator.startJavaFile(generator.naming.eventData, domain, event.name())
+    val domainName = domain.domain()
+    val fullName = generator.naming.eventData.getFullName(domainName, event.name()).getFullText()
+    generateJsonProtocolInterface(fileUpdater.out, className, event.description(), event.parameters(), object : TextOutConsumer {
+      override fun append(out: TextOutput) {
+        out.newLine().append("org.jetbrains.wip.protocol.WipEventType<").append(fullName).append("> TYPE").newLine()
+        out.append("\t= new org.jetbrains.wip.protocol.WipEventType<").append(fullName).append(">")
+        out.append("(\"").append(domainName).append('.').append(event.name()).append("\", ").append(fullName).append(".class)").openBlock()
+        run {
+          out.append("@Override").newLine().append("public ").append(fullName).append(" read(")
+          out.append(generator.naming.inputPackage).append('.').append(Generator.READER_INTERFACE_NAME + " protocolReader, ").append(JSON_READER_PARAMETER_DEF).append(")").openBlock()
+          out.append("return protocolReader.").append(generator.naming.eventData.getParseMethodName(domainName, event.name())).append("(reader);").closeBlock()
+        }
+        out.closeBlock()
+        out.semi()
+      }
+    })
+    fileUpdater.update()
+  }
+
+  private fun generateJsonProtocolInterface(out: TextOutput, className: String, description: String?, parameters: List<ProtocolMetaModel.Parameter>?, additionalMembersText: TextOutConsumer?) {
+    if (description != null) {
+      out.doc(description)
+    }
+    out.append("@org.jetbrains.jsonProtocol.JsonType").newLine().append("public interface ").append(className).openBlock()
+    val classScope = InputClassScope(this, NamePath(className, NamePath(ClassNameScheme.getPackageName(generator.naming.inputPackage, domain.domain()))))
+    if (additionalMembersText != null) {
+      classScope.addMember(additionalMembersText)
+    }
+    if (parameters != null) {
+      classScope.generateDeclarationBody(out, parameters)
+    }
+    classScope.writeAdditionalMembers(out)
+    out.closeBlock()
+  }
+
+  default object {
+
+    fun fixMethodName(name: String): String {
+      val i = name.indexOf("breakpoint")
+      return if (i > 0) name.substring(0, i) + 'B' + name.substring(i + 1) else name
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.java
deleted file mode 100644
index b6a79b6176c7..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import gnu.trove.THashSet;
-import gnu.trove.TObjectProcedure;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-
-/**
- * Records a list of files in the root directory and deletes files that were not re-generated.
- */
-class FileSet {
-  private final Path rootDir;
-  @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-  private final THashSet<Path> unusedFiles;
-
-  FileSet(Path rootDir) throws IOException {
-    this.rootDir = rootDir;
-    unusedFiles = new THashSet<Path>();
-    Files.walkFileTree(rootDir, new SimpleFileVisitor<Path>() {
-      @Override
-      public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-        return Files.isHidden(dir) ? FileVisitResult.SKIP_SUBTREE : FileVisitResult.CONTINUE;
-      }
-
-      @NotNull
-      @Override
-      public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
-        if (!Files.isHidden(path)) {
-          unusedFiles.add(path);
-        }
-        return FileVisitResult.CONTINUE;
-      }
-    });
-  }
-
-  FileUpdater createFileUpdater(String filePath) {
-    Path file = rootDir.resolve(filePath);
-    unusedFiles.remove(file);
-    return new FileUpdater(file);
-  }
-
-  void deleteOtherFiles() {
-    unusedFiles.forEach(new TObjectProcedure<Path>() {
-      @Override
-      public boolean execute(Path path) {
-        try {
-          if (Files.deleteIfExists(path)) {
-            Path parent = path.getParent();
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(parent)) {
-              if (!stream.iterator().hasNext()) {
-                Files.delete(parent);
-              }
-            }
-          }
-        }
-        catch (IOException e) {
-          throw new RuntimeException(e);
-        }
-        return true;
-      }
-    });
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.kt
new file mode 100644
index 000000000000..74eb02b23a41
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/FileSet.kt
@@ -0,0 +1,56 @@
+package org.jetbrains.protocolReader
+
+/**
+ * Records a list of files in the root directory and deletes files that were not re-generated.
+ */
+class FileSet [throws(javaClass<IOException>())]
+(private val rootDir: Path) {
+  SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
+  private val unusedFiles: THashSet<Path>
+
+  {
+    unusedFiles = THashSet<Path>()
+    Files.walkFileTree(rootDir, object : SimpleFileVisitor<Path>() {
+      throws(javaClass<IOException>())
+      override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult {
+        return if (Files.isHidden(dir)) FileVisitResult.SKIP_SUBTREE else FileVisitResult.CONTINUE
+      }
+
+      throws(javaClass<IOException>())
+      override fun visitFile(path: Path, attrs: BasicFileAttributes): FileVisitResult {
+        if (!Files.isHidden(path)) {
+          unusedFiles.add(path)
+        }
+        return FileVisitResult.CONTINUE
+      }
+    })
+  }
+
+  fun createFileUpdater(filePath: String): FileUpdater {
+    val file = rootDir.resolve(filePath)
+    unusedFiles.remove(file)
+    return FileUpdater(file)
+  }
+
+  fun deleteOtherFiles() {
+    unusedFiles.forEach(object : TObjectProcedure<Path> {
+      override fun execute(path: Path): Boolean {
+        try {
+          if (Files.deleteIfExists(path)) {
+            val parent = path.getParent()
+            Files.newDirectoryStream(parent).use { stream ->
+              if (!stream.iterator().hasNext()) {
+                Files.delete(parent)
+              }
+            }
+          }
+        }
+        catch (e: IOException) {
+          throw RuntimeException(e)
+        }
+
+        return true
+      }
+    })
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.java
deleted file mode 100644
index abd58b0a8c6e..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.java
+++ /dev/null
@@ -1,314 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-
-import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.util.*;
-
-import static org.jetbrains.jsonProtocol.ProtocolMetaModel.*;
-
-/**
- * Read metamodel and generates set of files with Java classes/interfaces for the protocol.
- */
-class Generator {
-  private static final String PARSER_INTERFACE_LIST_CLASS_NAME = "GeneratedReaderInterfaceList";
-  static final String READER_INTERFACE_NAME = "ProtocolResponseReader";
-
-  final List<String> jsonProtocolParserClassNames = new ArrayList<>();
-  final List<ParserRootInterfaceItem> parserRootInterfaceItems = new ArrayList<>();
-  final TypeMap typeMap = new TypeMap();
-
-  private final FileSet fileSet;
-  final Naming naming;
-
-  Generator(String outputDir, String rootPackage, String requestClassName) throws IOException {
-    fileSet = new FileSet(FileSystems.getDefault().getPath(outputDir));
-    naming = new Naming(rootPackage, requestClassName);
-  }
-
-  public static final class Naming {
-    public final ClassNameScheme params;
-    public final ClassNameScheme additionalParam;
-    public final ClassNameScheme outputTypedef;
-
-    public final ClassNameScheme.Input commandResult;
-    public final ClassNameScheme.Input eventData;
-    public final ClassNameScheme inputValue;
-    public final ClassNameScheme inputEnum;
-    public final ClassNameScheme inputTypedef;
-
-    public final ClassNameScheme commonTypedef;
-
-    public final String inputPackage;
-    public final String requestClassName;
-
-    private Naming(String rootPackage, String requestClassName) {
-      this.requestClassName = requestClassName;
-
-      params = new ClassNameScheme.Output("", rootPackage);
-      additionalParam = new ClassNameScheme.Output("", rootPackage);
-      outputTypedef = new ClassNameScheme.Output("Typedef", rootPackage);
-      commonTypedef = new ClassNameScheme.Common("Typedef", rootPackage);
-
-      inputPackage = rootPackage;
-      commandResult = new ClassNameScheme.Input("Result", inputPackage);
-      eventData = new ClassNameScheme.Input("EventData", inputPackage);
-      inputValue = new ClassNameScheme.Input("Value", inputPackage);
-      inputEnum = new ClassNameScheme.Input("", inputPackage);
-      inputTypedef = new ClassNameScheme.Input("Typedef", inputPackage);
-    }
-  }
-
-  private static boolean isDomainSkipped(Domain domain) {
-    if (domain.domain().equals("CSS") || domain.domain().equals("Inspector")) {
-      return false;
-    }
-
-    // todo DOMDebugger
-    return domain.hidden() ||
-           domain.domain().equals("DOMDebugger") ||
-           domain.domain().equals("Timeline") ||
-           domain.domain().equals("Input");
-  }
-
-  void go(Root metamodel) throws IOException {
-    initializeKnownTypes();
-
-    List<Domain> domainList = metamodel.domains();
-    Map<String, DomainGenerator> domainGeneratorMap = new HashMap<>();
-    for (Domain domain : domainList) {
-      if (isDomainSkipped(domain)) {
-        System.out.println("Domain skipped: " + domain.domain());
-        continue;
-      }
-      DomainGenerator domainGenerator = new DomainGenerator(this, domain);
-      domainGeneratorMap.put(domain.domain(), domainGenerator);
-      domainGenerator.registerTypes();
-    }
-
-    for (Domain domain : domainList) {
-      if (!isDomainSkipped(domain)) {
-        System.out.println("Domain generated: " + domain.domain());
-      }
-    }
-
-    typeMap.setDomainGeneratorMap(domainGeneratorMap);
-
-    for (DomainGenerator domainGenerator : domainGeneratorMap.values()) {
-      domainGenerator.generateCommandsAndEvents();
-    }
-
-    typeMap.generateRequestedTypes();
-    generateParserInterfaceList();
-    generateParserRoot(parserRootInterfaceItems);
-    fileSet.deleteOtherFiles();
-  }
-
-  TypeDescriptor resolveType(@NotNull final ItemDescriptor typedObject, @NotNull final ResolveAndGenerateScope scope) {
-    final boolean optional = typedObject instanceof ItemDescriptor.Named && ((ItemDescriptor.Named)typedObject).optional();
-    return switchByType(typedObject, new TypeVisitor<TypeDescriptor>() {
-      @Override
-      public TypeDescriptor visitRef(String refName) {
-        return new TypeDescriptor(resolveRefType(scope.getDomainName(), refName, scope.getTypeDirection()), optional);
-      }
-
-      @Override
-      public TypeDescriptor visitBoolean() {
-        return new TypeDescriptor(BoxableType.BOOLEAN, optional);
-      }
-
-      @Override
-      public TypeDescriptor visitEnum(List<String> enumConstants) {
-        assert scope instanceof MemberScope;
-        return new TypeDescriptor(((MemberScope)scope).generateEnum(typedObject.description(), enumConstants), optional);
-      }
-
-      @Override
-      public TypeDescriptor visitString() {
-        return new TypeDescriptor(BoxableType.STRING, optional);
-      }
-
-      @Override
-      public TypeDescriptor visitInteger() {
-        return new TypeDescriptor(BoxableType.INT, optional);
-      }
-
-      @Override
-      public TypeDescriptor visitNumber() {
-        return new TypeDescriptor(BoxableType.NUMBER, optional);
-      }
-
-      @Override
-      public TypeDescriptor visitMap() {
-        return new TypeDescriptor(BoxableType.MAP, optional);
-      }
-
-      @Override
-      public TypeDescriptor visitArray(ArrayItemType items) {
-        BoxableType type = scope.resolveType(items).getType();
-        return new TypeDescriptor(new ListType(type), optional, false, type == BoxableType.ANY_STRING);
-      }
-
-      @Override
-      public TypeDescriptor visitObject(List<ObjectProperty> properties) {
-        return new TypeDescriptor(scope.generateNestedObject(typedObject.description(), properties), optional);
-      }
-
-      @Override
-      public TypeDescriptor visitUnknown() {
-        return new TypeDescriptor(BoxableType.STRING, optional, false, true);
-      }
-    });
-  }
-
-  private void generateParserInterfaceList() throws IOException {
-    FileUpdater fileUpdater = startJavaFile(naming.inputPackage, PARSER_INTERFACE_LIST_CLASS_NAME + ".java");
-    // Write classes in stable order.
-    Collections.sort(jsonProtocolParserClassNames);
-
-    TextOutput out = fileUpdater.out;
-    out.append("public class ").append(PARSER_INTERFACE_LIST_CLASS_NAME).openBlock();
-    out.append("public static final Class<?>[] LIST =").openBlock();
-    for (String name : jsonProtocolParserClassNames) {
-      out.append(name).append(".class,").newLine();
-    }
-    out.closeBlock();
-    out.semi();
-    out.closeBlock();
-    fileUpdater.update();
-  }
-
-  private void generateParserRoot(List<ParserRootInterfaceItem> parserRootInterfaceItems) throws IOException {
-    FileUpdater fileUpdater = startJavaFile(naming.inputPackage, READER_INTERFACE_NAME + ".java");
-    // Write classes in stable order.
-    Collections.sort(parserRootInterfaceItems);
-
-    TextOutput out = fileUpdater.out;
-    out.append("public abstract class ").append(READER_INTERFACE_NAME).space().append("implements org.jetbrains.jsonProtocol.ResponseResultReader").openBlock();
-    for (ParserRootInterfaceItem item : parserRootInterfaceItems) {
-      item.writeCode(out);
-    }
-    out.newLine().newLine().append("@Override").newLine().append("public Object readResult(String methodName, org.jetbrains.io.JsonReaderEx reader)");
-    out.openBlock();
-
-    boolean isNotFirst = false;
-    for (ParserRootInterfaceItem item : parserRootInterfaceItems) {
-      if (isNotFirst) {
-        out.append("else ");
-      }
-      else {
-        isNotFirst = true;
-      }
-      out.append("if (methodName.equals(\"");
-      if (!item.domain.isEmpty()) {
-        out.append(item.domain).append('.');
-      }
-      out.append(item.name).append('"').append(")) return ");
-      item.appendReadMethodName(out);
-      out.append("(reader)").semi().newLine();
-    }
-    out.append("else return null").semi();
-    out.closeBlock();
-
-    out.closeBlock();
-    fileUpdater.update();
-  }
-
-  /**
-   * Resolve absolute (DOMAIN.TYPE) or relative (TYPE) type name
-   */
-  private BoxableType resolveRefType(String scopeDomainName, String refName,
-                                     TypeData.Direction direction) {
-    int pos = refName.indexOf('.');
-    String domainName;
-    String shortName;
-    if (pos == -1) {
-      domainName = scopeDomainName;
-      shortName = refName;
-    }
-    else {
-      domainName = refName.substring(0, pos);
-      shortName = refName.substring(pos + 1);
-    }
-    return typeMap.resolve(domainName, shortName, direction);
-  }
-
-  static String generateMethodNameSubstitute(@NotNull String originalName, @NotNull TextOutput out) {
-    if (!BAD_METHOD_NAMES.contains(originalName)) {
-      return originalName;
-    }
-    out.append("@org.jetbrains.jsonProtocol.JsonField(jsonLiteralName=\"").append(originalName).append("\")").newLine();
-    return "get" + Character.toUpperCase(originalName.charAt(0)) + originalName.substring(1);
-  }
-
-  static String capitalizeFirstChar(String s) {
-    if (!s.isEmpty() && Character.isLowerCase(s.charAt(0))) {
-      s = Character.toUpperCase(s.charAt(0)) + s.substring(1);
-    }
-    return s;
-  }
-
-  FileUpdater startJavaFile(@NotNull ClassNameScheme nameScheme, Domain domain, String baseName) throws IOException {
-    return startJavaFile(nameScheme.getPackageNameVirtual(domain.domain()), nameScheme.getShortName(baseName) + ".java");
-  }
-
-  public FileUpdater startJavaFile(@NotNull String packageName, @NotNull String filename) {
-    FileUpdater fileUpdater = fileSet.createFileUpdater(packageName.replace('.', '/') + '/' + filename);
-    fileUpdater.out.append("// Generated source").newLine().append("package ").append(packageName).semi().newLine().newLine();
-    return fileUpdater;
-  }
-
-  static <R> R switchByType(@NotNull ItemDescriptor typedObject, @NotNull TypeVisitor<R> visitor) {
-    String refName = typedObject instanceof ItemDescriptor.Referenceable ? ((ItemDescriptor.Referenceable)typedObject).ref() : null;
-    if (refName != null) {
-      return visitor.visitRef(refName);
-    }
-    String typeName = typedObject.type();
-    switch (typeName) {
-      case BOOLEAN_TYPE:
-        return visitor.visitBoolean();
-      case STRING_TYPE:
-        if (typedObject.getEnum() != null) {
-          return visitor.visitEnum(typedObject.getEnum());
-        }
-        return visitor.visitString();
-      case INTEGER_TYPE:
-      case "int":
-        return visitor.visitInteger();
-      case NUMBER_TYPE:
-        return visitor.visitNumber();
-      case ARRAY_TYPE:
-        return visitor.visitArray(typedObject.items());
-      case OBJECT_TYPE:
-        if (!(typedObject instanceof ItemDescriptor.Type)) {
-          return visitor.visitObject(null);
-        }
-
-        List<ObjectProperty> properties = ((ItemDescriptor.Type)typedObject).properties();
-        if (properties == null || properties.isEmpty()) {
-          return visitor.visitMap();
-        }
-        else {
-          return visitor.visitObject(properties);
-        }
-      case ANY_TYPE:
-        return visitor.visitUnknown();
-      case UNKNOWN_TYPE:
-        return visitor.visitUnknown();
-    }
-    throw new RuntimeException("Unrecognized type " + typeName);
-  }
-
-  private static void initializeKnownTypes() {
-    // Code example:
-    // typeMap.getTypeData("Page", "Cookie").getInput().setJavaTypeName("Object");
-  }
-
-  private static final Set<String> BAD_METHOD_NAMES = new HashSet<>(Collections.singletonList("this"));
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.kt
new file mode 100644
index 000000000000..bac057c6eb2f
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/Generator.kt
@@ -0,0 +1,288 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.jetbrains.protocolReader
+
+/**
+ * Read metamodel and generates set of files with Java classes/interfaces for the protocol.
+ */
+class Generator [throws(javaClass<IOException>())]
+(outputDir: String, rootPackage: String, requestClassName: String) {
+
+  val jsonProtocolParserClassNames = ArrayList<String>()
+  val parserRootInterfaceItems = ArrayList<ParserRootInterfaceItem>()
+  val typeMap = TypeMap()
+
+  private val fileSet: FileSet
+  val naming: Naming
+
+  init {
+    fileSet = FileSet(FileSystems.getDefault().getPath(outputDir))
+    naming = Naming(rootPackage, requestClassName)
+  }
+
+  public class Naming(public val inputPackage: String, public val requestClassName: String) {
+    public val params: ClassNameScheme
+    public val additionalParam: ClassNameScheme
+    public val outputTypedef: ClassNameScheme
+
+    public val commandResult: ClassNameScheme.Input
+    public val eventData: ClassNameScheme.Input
+    public val inputValue: ClassNameScheme
+    public val inputEnum: ClassNameScheme
+    public val inputTypedef: ClassNameScheme
+
+    public val commonTypedef: ClassNameScheme
+
+    init {
+      params = ClassNameScheme.Output("", inputPackage)
+      additionalParam = ClassNameScheme.Output("", inputPackage)
+      outputTypedef = ClassNameScheme.Output("Typedef", inputPackage)
+      commonTypedef = ClassNameScheme.Common("Typedef", inputPackage)
+      commandResult = ClassNameScheme.Input("Result", inputPackage)
+      eventData = ClassNameScheme.Input("EventData", inputPackage)
+      inputValue = ClassNameScheme.Input("Value", inputPackage)
+      inputEnum = ClassNameScheme.Input("", inputPackage)
+      inputTypedef = ClassNameScheme.Input("Typedef", inputPackage)
+    }
+  }
+
+  throws(javaClass<IOException>())
+  fun go(metamodel: Root) {
+    initializeKnownTypes()
+
+    val domainList = metamodel.domains()
+    val domainGeneratorMap = HashMap<String, DomainGenerator>()
+    for (domain in domainList) {
+      if (isDomainSkipped(domain)) {
+        System.out.println("Domain skipped: " + domain.domain())
+        continue
+      }
+      val domainGenerator = DomainGenerator(this, domain)
+      domainGeneratorMap.put(domain.domain(), domainGenerator)
+      domainGenerator.registerTypes()
+    }
+
+    for (domain in domainList) {
+      if (!isDomainSkipped(domain)) {
+        System.out.println("Domain generated: " + domain.domain())
+      }
+    }
+
+    typeMap.setDomainGeneratorMap(domainGeneratorMap)
+
+    for (domainGenerator in domainGeneratorMap.values()) {
+      domainGenerator.generateCommandsAndEvents()
+    }
+
+    typeMap.generateRequestedTypes()
+    generateParserInterfaceList()
+    generateParserRoot(parserRootInterfaceItems)
+    fileSet.deleteOtherFiles()
+  }
+
+  fun resolveType(typedObject: ItemDescriptor, scope: ResolveAndGenerateScope): TypeDescriptor {
+    val optional = typedObject is ItemDescriptor.Named && (typedObject : ItemDescriptor.Named).optional()
+    return switchByType(typedObject, object : TypeVisitor<TypeDescriptor> {
+      override fun visitRef(refName: String): TypeDescriptor {
+        return TypeDescriptor(resolveRefType(scope.getDomainName(), refName, scope.getTypeDirection()), optional)
+      }
+
+      override fun visitBoolean(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.BOOLEAN, optional)
+      }
+
+      override fun visitEnum(enumConstants: List<String>): TypeDescriptor {
+        assert(scope is MemberScope)
+        return TypeDescriptor((scope as MemberScope).generateEnum(typedObject.description(), enumConstants), optional)
+      }
+
+      override fun visitString(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.STRING, optional)
+      }
+
+      override fun visitInteger(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.INT, optional)
+      }
+
+      override fun visitNumber(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.NUMBER, optional)
+      }
+
+      override fun visitMap(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.MAP, optional)
+      }
+
+      override fun visitArray(items: ArrayItemType): TypeDescriptor {
+        val type = scope.resolveType<ArrayItemType>(items).type
+        return TypeDescriptor(ListType(type), optional, false, type == BoxableType.ANY_STRING)
+      }
+
+      override fun visitObject(properties: List<ObjectProperty>?): TypeDescriptor {
+        return TypeDescriptor(scope.generateNestedObject(typedObject.description(), properties!!), optional)
+      }
+
+      override fun visitUnknown(): TypeDescriptor {
+        return TypeDescriptor(BoxableType.STRING, optional, false, true)
+      }
+    })
+  }
+
+  throws(javaClass<IOException>())
+  private fun generateParserInterfaceList() {
+    val fileUpdater = startJavaFile(naming.inputPackage, PARSER_INTERFACE_LIST_CLASS_NAME + ".java")
+    // Write classes in stable order.
+    Collections.sort<String>(jsonProtocolParserClassNames)
+
+    val out = fileUpdater.out
+    out.append("public class ").append(PARSER_INTERFACE_LIST_CLASS_NAME).openBlock()
+    out.append("public static final Class<?>[] LIST =").openBlock()
+    for (name in jsonProtocolParserClassNames) {
+      out.append(name).append(".class,").newLine()
+    }
+    out.closeBlock()
+    out.semi()
+    out.closeBlock()
+    fileUpdater.update()
+  }
+
+  throws(javaClass<IOException>())
+  private fun generateParserRoot(parserRootInterfaceItems: List<ParserRootInterfaceItem>) {
+    val fileUpdater = startJavaFile(naming.inputPackage, READER_INTERFACE_NAME + ".java")
+    // Write classes in stable order.
+    Collections.sort<ParserRootInterfaceItem>(parserRootInterfaceItems)
+
+    val out = fileUpdater.out
+    out.append("public abstract class ").append(READER_INTERFACE_NAME).space().append("implements org.jetbrains.jsonProtocol.ResponseResultReader").openBlock()
+    for (item in parserRootInterfaceItems) {
+      item.writeCode(out)
+    }
+    out.newLine().newLine().append("@Override").newLine().append("public Object readResult(String methodName, org.jetbrains.io.JsonReaderEx reader)")
+    out.openBlock()
+
+    var isNotFirst = false
+    for (item in parserRootInterfaceItems) {
+      if (isNotFirst) {
+        out.append("else ")
+      }
+      else {
+        isNotFirst = true
+      }
+      out.append("if (methodName.equals(\"")
+      if (!item.domain.isEmpty()) {
+        out.append(item.domain).append('.')
+      }
+      out.append(item.name).append('"').append(")) return ")
+      item.appendReadMethodName(out)
+      out.append("(reader)").semi().newLine()
+    }
+    out.append("else return null").semi()
+    out.closeBlock()
+
+    out.closeBlock()
+    fileUpdater.update()
+  }
+
+  /**
+   * Resolve absolute (DOMAIN.TYPE) or relative (TYPE) type name
+   */
+  private fun resolveRefType(scopeDomainName: String, refName: String, direction: TypeData.Direction): BoxableType {
+    val pos = refName.indexOf('.')
+    val domainName: String
+    val shortName: String
+    if (pos == -1) {
+      domainName = scopeDomainName
+      shortName = refName
+    }
+    else {
+      domainName = refName.substring(0, pos)
+      shortName = refName.substring(pos + 1)
+    }
+    return typeMap.resolve(domainName, shortName, direction)!!
+  }
+
+  throws(javaClass<IOException>())
+  fun startJavaFile(nameScheme: ClassNameScheme, domain: Domain, baseName: String): FileUpdater {
+    return startJavaFile(nameScheme.getPackageNameVirtual(domain.domain()), nameScheme.getShortName(baseName) + ".java")
+  }
+
+  public fun startJavaFile(packageName: String, filename: String): FileUpdater {
+    val fileUpdater = fileSet.createFileUpdater(packageName.replace('.', '/') + '/' + filename)
+    fileUpdater.out.append("// Generated source").newLine().append("package ").append(packageName).semi().newLine().newLine()
+    return fileUpdater
+  }
+
+  default object {
+    private val PARSER_INTERFACE_LIST_CLASS_NAME = "GeneratedReaderInterfaceList"
+    val READER_INTERFACE_NAME = "ProtocolResponseReader"
+
+    private fun isDomainSkipped(domain: Domain): Boolean {
+      if (domain.domain() == "CSS" || domain.domain() == "Inspector") {
+        return false
+      }
+
+      // todo DOMDebugger
+      return domain.hidden() || domain.domain() == "DOMDebugger" || domain.domain() == "Timeline" || domain.domain() == "Input"
+    }
+
+    fun generateMethodNameSubstitute(originalName: String, out: TextOutput): String {
+      if (!BAD_METHOD_NAMES.contains(originalName)) {
+        return originalName
+      }
+      out.append("@org.jetbrains.jsonProtocol.JsonField(jsonLiteralName=\"").append(originalName).append("\")").newLine()
+      return "get" + Character.toUpperCase(originalName.charAt(0)) + originalName.substring(1)
+    }
+
+    fun capitalizeFirstChar(s: String): String {
+      if (!s.isEmpty() && Character.isLowerCase(s.charAt(0))) {
+        return Character.toUpperCase(s.charAt(0)) + s.substring(1)
+      }
+      return s
+    }
+
+    fun <R> switchByType(typedObject: ItemDescriptor, visitor: TypeVisitor<R>): R {
+      val refName = if (typedObject is ItemDescriptor.Referenceable) (typedObject : ItemDescriptor.Referenceable).ref() else null
+      if (refName != null) {
+        return visitor.visitRef(refName)
+      }
+      val typeName = typedObject.type()
+      when (typeName) {
+        ProtocolMetaModel.BOOLEAN_TYPE -> return visitor.visitBoolean()
+        ProtocolMetaModel.STRING_TYPE -> {
+          if (typedObject.getEnum() != null) {
+            return visitor.visitEnum(typedObject.getEnum()!!)
+          }
+          return visitor.visitString()
+        }
+        ProtocolMetaModel.INTEGER_TYPE, "int" -> return visitor.visitInteger()
+        ProtocolMetaModel.NUMBER_TYPE -> return visitor.visitNumber()
+        ProtocolMetaModel.ARRAY_TYPE -> return visitor.visitArray(typedObject.items())
+        ProtocolMetaModel.OBJECT_TYPE -> {
+          if (typedObject !is ItemDescriptor.Type) {
+            return visitor.visitObject(null)
+          }
+
+          val properties = (typedObject : ItemDescriptor.Type).properties()
+          if (properties == null || properties.isEmpty()) {
+            return visitor.visitMap()
+          }
+          else {
+            return visitor.visitObject(properties)
+          }
+          return visitor.visitUnknown()
+        }
+        ProtocolMetaModel.ANY_TYPE -> return visitor.visitUnknown()
+        ProtocolMetaModel.UNKNOWN_TYPE -> return visitor.visitUnknown()
+      }
+      throw RuntimeException("Unrecognized type " + typeName)
+    }
+
+    private fun initializeKnownTypes() {
+      // Code example:
+      // typeMap.getTypeData("Page", "Cookie").getInput().setJavaTypeName("Object");
+    }
+
+    private val BAD_METHOD_NAMES = HashSet(listOf("this"))
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.java
deleted file mode 100644
index 99c95d8f5ae3..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jsonProtocol.ItemDescriptor.Named;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel.ObjectProperty;
-
-import java.util.List;
-
-class InputClassScope extends ClassScope {
-  InputClassScope(DomainGenerator generator, NamePath namePath) {
-    super(generator, namePath);
-  }
-
-  void generateDeclarationBody(@NotNull TextOutput out, @NotNull List<? extends Named> list) {
-    for (int i = 0, n = list.size(); i < n; i++) {
-      Named named = list.get(i);
-      if (named.description() != null) {
-        out.doc(named.description());
-      }
-
-      String name = getName(named);
-      String declarationName = Generator.generateMethodNameSubstitute(name, out);
-      TypeDescriptor typeDescriptor = new InputMemberScope(name).resolveType(named);
-      typeDescriptor.writeAnnotations(out);
-      out.append(typeDescriptor.getType().getShortText(getClassContextNamespace())).space().append(declarationName).append("();");
-      if (i != (n - 1)) {
-        out.newLine().newLine();
-      }
-    }
-  }
-
-  @Override
-  protected TypeData.Direction getTypeDirection() {
-    return TypeData.Direction.INPUT;
-  }
-
-  class InputMemberScope extends MemberScope {
-    InputMemberScope(String memberName) {
-      super(InputClassScope.this, memberName);
-    }
-
-    @Override
-    public BoxableType generateEnum(final String description, final List<String> enumConstants) {
-      final String enumName = Generator.capitalizeFirstChar(getMemberName());
-      addMember(new TextOutConsumer() {
-        @Override
-        public void append(TextOutput out) {
-          out.newLine().doc(description);
-          Enums.appendEnums(enumConstants, enumName, true, out);
-        }
-      });
-      return new StandaloneType(new NamePath(enumName, getClassContextNamespace()), "writeEnum");
-    }
-
-    @Override
-    public BoxableType generateNestedObject(final String description, final List<ObjectProperty> propertyList) {
-      final String objectName = Generator.capitalizeFirstChar(getMemberName());
-      addMember(new TextOutConsumer() {
-        @Override
-        public void append(TextOutput out) {
-          out.newLine().doc(description);
-          if (propertyList == null) {
-            out.append("@org.jetbrains.jsonProtocol.JsonType(allowsOtherProperties=true)").newLine();
-            out.append("public interface ").append(objectName).append(" extends org.jetbrains.jsonProtocol.JsonObjectBased").openBlock();
-          }
-          else {
-            out.append("@org.jetbrains.jsonProtocol.JsonType").newLine();
-            out.append("public interface ").append(objectName).openBlock();
-            for (ObjectProperty property : propertyList) {
-              out.doc(property.description());
-
-              String methodName = Generator.generateMethodNameSubstitute(getName(property), out);
-              MemberScope memberScope = new InputMemberScope(getName(property));
-              TypeDescriptor propertyTypeData = memberScope.resolveType(property);
-              propertyTypeData.writeAnnotations(out);
-
-              out.append(propertyTypeData.getType().getShortText(getClassContextNamespace()) + ' ' + methodName + "();").newLine();
-            }
-          }
-          out.closeBlock();
-        }
-      });
-      return new StandaloneType(new NamePath(objectName, getClassContextNamespace()), "writeMessage");
-    }
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.kt
new file mode 100644
index 000000000000..bbbce17f5b1a
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/InputClassScope.kt
@@ -0,0 +1,73 @@
+package org.jetbrains.protocolReader
+
+class InputClassScope(generator: DomainGenerator, namePath: NamePath) : ClassScope(generator, namePath) {
+
+  fun generateDeclarationBody(out: TextOutput, list: List<Named>) {
+    run {
+      var i = 0
+      val n = list.size()
+      while (i < n) {
+        val named = list.get(i)
+        if (named.description() != null) {
+          out.doc(named.description())
+        }
+
+        val name = ClassScope.getName(named)
+        val declarationName = Generator.generateMethodNameSubstitute(name, out)
+        val typeDescriptor = InputMemberScope(name).resolveType<Named>(named)
+        typeDescriptor.writeAnnotations(out)
+        out.append(typeDescriptor.type.getShortText(classContextNamespace)).space().append(declarationName).append("();")
+        if (i != (n - 1)) {
+          out.newLine().newLine()
+        }
+        i++
+      }
+    }
+  }
+
+  override fun getTypeDirection(): TypeData.Direction {
+    return TypeData.Direction.INPUT
+  }
+
+  inner class InputMemberScope(memberName: String) : MemberScope(this@InputClassScope, memberName) {
+    override fun generateEnum(description: String?, enumConstants: List<String>): BoxableType {
+      val enumName = Generator.capitalizeFirstChar(memberName)
+      addMember(object : TextOutConsumer {
+        override fun append(out: TextOutput) {
+          out.newLine().doc(description)
+          Enums.appendEnums(enumConstants, enumName, true, out)
+        }
+      })
+      return StandaloneType(NamePath(enumName, classContextNamespace), "writeEnum")
+    }
+
+    override fun generateNestedObject(description: String?, properties: List<ObjectProperty>?): BoxableType {
+      val objectName = Generator.capitalizeFirstChar(memberName)
+      addMember(object : TextOutConsumer {
+        override fun append(out: TextOutput) {
+          out.newLine().doc(description)
+          if (properties == null) {
+            out.append("@org.jetbrains.jsonProtocol.JsonType(allowsOtherProperties=true)").newLine()
+            out.append("public interface ").append(objectName).append(" extends org.jetbrains.jsonProtocol.JsonObjectBased").openBlock()
+          }
+          else {
+            out.append("@org.jetbrains.jsonProtocol.JsonType").newLine()
+            out.append("public interface ").append(objectName).openBlock()
+            for (property in properties) {
+              out.doc(property.description())
+
+              val methodName = Generator.generateMethodNameSubstitute(ClassScope.getName(property), out)
+              val memberScope = InputMemberScope(ClassScope.getName(property))
+              val propertyTypeData = memberScope.resolveType<ObjectProperty>(property)
+              propertyTypeData.writeAnnotations(out)
+
+              out.append(propertyTypeData.type.getShortText(classContextNamespace) + ' ' + methodName + "();").newLine()
+            }
+          }
+          out.closeBlock()
+        }
+      })
+      return StandaloneType(NamePath(objectName, classContextNamespace), "writeMessage")
+    }
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.java
deleted file mode 100644
index f41769ad77c5..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-
-class ListType extends BoxableType {
-  private final BoxableType itemType;
-
-  public ListType(@NotNull BoxableType itemType) {
-    this.itemType = itemType;
-  }
-
-  @Override
-  String getWriteMethodName() {
-    if (itemType == STRING) {
-      return "writeStringList";
-    }
-    else if (itemType == LONG) {
-      return "writeLongArray";
-    }
-    else if (itemType == INT) {
-      return "writeIntArray";
-    }
-    else if (itemType == NUMBER) {
-      return "writeDoubleArray";
-    }
-    return "writeList";
-  }
-
-  @Override
-  String getFullText() {
-    if (itemType == LONG || itemType == INT || itemType == NUMBER) {
-      return itemType.getFullText() + "[]";
-    }
-    return "java.util.List<" + itemType.getFullText() + '>';
-  }
-
-  @Override
-  String getShortText(NamePath contextNamespace) {
-    if (itemType == LONG || itemType == INT || itemType == NUMBER) {
-      return itemType.getFullText() + "[]";
-    }
-    return "java.util.List<" + itemType.getShortText(contextNamespace) + '>';
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.kt
new file mode 100644
index 000000000000..737fc1d8feeb
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ListType.kt
@@ -0,0 +1,34 @@
+package org.jetbrains.protocolReader
+
+open class ListType(private val itemType: BoxableType) : BoxableType() {
+
+  override fun getWriteMethodName(): String {
+    if (itemType == BoxableType.STRING) {
+      return "writeStringList"
+    }
+    else if (itemType == BoxableType.LONG) {
+      return "writeLongArray"
+    }
+    else if (itemType == BoxableType.INT) {
+      return "writeIntArray"
+    }
+    else if (itemType == BoxableType.NUMBER) {
+      return "writeDoubleArray"
+    }
+    return "writeList"
+  }
+
+  override fun getFullText(): String {
+    if (itemType == BoxableType.LONG || itemType == BoxableType.INT || itemType == BoxableType.NUMBER) {
+      return "${itemType.getFullText()}[]"
+    }
+    return "java.util.List<" + itemType.getFullText() + '>'
+  }
+
+  override fun getShortText(contextNamespace: NamePath): String {
+    if (itemType == BoxableType.LONG || itemType == BoxableType.INT || itemType == BoxableType.NUMBER) {
+      return "${itemType.getFullText()}[]"
+    }
+    return "java.util.List<" + itemType.getShortText(contextNamespace) + '>'
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.java
deleted file mode 100644
index 78a83a9127ca..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.util.List;
-
-/**
- * Member scope is used to generate additional types that are used only from method.
- * These types will be named after this method.
- */
-abstract class MemberScope implements ResolveAndGenerateScope {
-  private final String memberName;
-  private final ClassScope classScope;
-
-  MemberScope(ClassScope classScope, String memberName) {
-    this.classScope = classScope;
-    this.memberName = memberName;
-  }
-
-  @Override
-  public <T extends ItemDescriptor> TypeDescriptor resolveType(T typedObject) {
-    return classScope.generator.generator.resolveType(typedObject, this);
-  }
-
-  protected String getMemberName() {
-    return memberName;
-  }
-
-  public abstract BoxableType generateEnum(String description, List<String> enumConstants);
-  public abstract BoxableType generateNestedObject(String description, List<ProtocolMetaModel.ObjectProperty> propertyList);
-
-  @Override
-  public String getDomainName() {
-    return classScope.generator.domain.domain();
-  }
-
-  @Override
-  public TypeData.Direction getTypeDirection() {
-    return classScope.getTypeDirection();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.kt
new file mode 100644
index 000000000000..65442ed6c94e
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MemberScope.kt
@@ -0,0 +1,17 @@
+package org.jetbrains.protocolReader
+
+/**
+ * Member scope is used to generate additional types that are used only from method.
+ * These types will be named after this method.
+ */
+abstract class MemberScope(private val classScope: ClassScope, protected val memberName: String) : ResolveAndGenerateScope {
+  override fun <T : ItemDescriptor> resolveType(typedObject: T): TypeDescriptor {
+    return classScope.generator.generator.resolveType(typedObject, this)
+  }
+
+  public abstract fun generateEnum(description: String?, enumConstants: List<String>): BoxableType
+
+  override fun getDomainName() = classScope.generator.domain.domain()
+
+  override fun getTypeDirection() = classScope.getTypeDirection()
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.java
deleted file mode 100644
index 180a8fc28adb..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.io.IOException;
-import java.util.List;
-
-class MyCreateStandaloneTypeBindingVisitorBase extends CreateStandaloneTypeBindingVisitorBase {
-  private final String name;
-  private final DomainGenerator generator;
-
-  public MyCreateStandaloneTypeBindingVisitorBase(DomainGenerator generator, ProtocolMetaModel.StandaloneType type, String name) {
-    super(generator, type);
-    this.generator = generator;
-    this.name = name;
-  }
-
-  @Override
-  public StandaloneTypeBinding visitObject(List<ProtocolMetaModel.ObjectProperty> properties) {
-    return new StandaloneTypeBinding() {
-      @Override
-      public BoxableType getJavaType() {
-        return new StandaloneType(generator.generator.naming.additionalParam.getFullName(generator.domain.domain(), name), "writeMessage");
-      }
-
-      @Override
-      public void generate() throws IOException {
-        generator.generateCommandAdditionalParam(getType());
-      }
-
-      @Override
-      public TypeData.Direction getDirection() {
-        return TypeData.Direction.OUTPUT;
-      }
-    };
-  }
-
-  @Override
-  public StandaloneTypeBinding visitEnum(List<String> enumConstants) {
-    throw new RuntimeException();
-  }
-
-  @Override
-  public StandaloneTypeBinding visitArray(final ProtocolMetaModel.ArrayItemType items) {
-    return generator.createTypedefTypeBinding(getType(), new StandaloneTypeBinding.Target() {
-      @Override
-      public BoxableType resolve(final ResolveContext context) {
-        return new ListType(generator.generator.resolveType(items, new ResolveAndGenerateScope() {
-          // This class is responsible for generating ad hoc type.
-          // If we ever are to do it, we should generate into string buffer and put strings inside TypeDef class
-          @Override
-          public String getDomainName() {
-            return generator.domain.domain();
-          }
-
-          @Override
-          public TypeData.Direction getTypeDirection() {
-            return TypeData.Direction.OUTPUT;
-          }
-
-          @Override
-          public <T extends ItemDescriptor> TypeDescriptor resolveType(T typedObject) {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public BoxableType generateNestedObject(String description, List<ProtocolMetaModel.ObjectProperty> properties) {
-            return context.generateNestedObject("Item", description, properties);
-          }
-        }).getType());
-      }
-    }, generator.generator.naming.outputTypedef, TypeData.Direction.OUTPUT);
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.kt
new file mode 100644
index 000000000000..560c41279bc4
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/MyCreateStandaloneTypeBindingVisitorBase.kt
@@ -0,0 +1,44 @@
+package org.jetbrains.protocolReader
+
+class MyCreateStandaloneTypeBindingVisitorBase(private val generator: DomainGenerator, type: ProtocolMetaModel.StandaloneType, private val name: String) : CreateStandaloneTypeBindingVisitorBase(generator, type) {
+
+  override fun visitObject(properties: List<ProtocolMetaModel.ObjectProperty>?): StandaloneTypeBinding {
+    return object : StandaloneTypeBinding {
+      override fun getJavaType(): BoxableType {
+        return StandaloneType(generator.generator.naming.additionalParam.getFullName(generator.domain.domain(), name), "writeMessage")
+      }
+
+      override fun generate() {
+        generator.generateCommandAdditionalParam(type)
+      }
+
+      override fun getDirection(): TypeData.Direction? {
+        return TypeData.Direction.OUTPUT
+      }
+    }
+  }
+
+  override fun visitEnum(enumConstants: List<String>): StandaloneTypeBinding {
+    throw RuntimeException()
+  }
+
+  override fun visitArray(items: ProtocolMetaModel.ArrayItemType): StandaloneTypeBinding {
+    return generator.createTypedefTypeBinding(type, object : StandaloneTypeBinding.Target {
+      override fun resolve(context: StandaloneTypeBinding.Target.ResolveContext): BoxableType {
+        return ListType(generator.generator.resolveType(items, object : ResolveAndGenerateScope {
+          // This class is responsible for generating ad hoc type.
+          // If we ever are to do it, we should generate into string buffer and put strings inside TypeDef class
+          override fun getDomainName() = generator.domain.domain()
+
+          override fun getTypeDirection() = TypeData.Direction.OUTPUT
+
+          override fun <T : ItemDescriptor> resolveType(typedObject: T) = throw UnsupportedOperationException()
+
+          override fun generateNestedObject(description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?): BoxableType {
+            return context.generateNestedObject("Item", description, properties)
+          }
+        }).type)
+      }
+    }, generator.generator.naming.outputTypedef, TypeData.Direction.OUTPUT)
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.java
deleted file mode 100644
index b516d7734e02..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.jetbrains.protocolReader;
-
-class NamePath {
-  private final String lastComponent;
-  private final NamePath parent;
-
-  NamePath(String component) {
-    this(component, null);
-  }
-
-  NamePath(String component, NamePath parent) {
-    lastComponent = component;
-    this.parent = parent;
-  }
-
-  NamePath getParent() {
-    return parent;
-  }
-
-  String getLastComponent() {
-    return lastComponent;
-  }
-
-  int getLength() {
-    int res = 1;
-    for (NamePath current = this; current != null; current = current.getParent()) {
-      res++;
-    }
-    return res;
-  }
-
-  String getFullText() {
-    StringBuilder result = new StringBuilder();
-    fillFullPath(result);
-    return result.toString();
-  }
-
-  private void fillFullPath(StringBuilder result) {
-    if (parent != null) {
-      parent.fillFullPath(result);
-      result.append('.');
-    }
-    result.append(lastComponent);
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.kt
new file mode 100644
index 000000000000..2f1ded3bd443
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/NamePath.kt
@@ -0,0 +1,30 @@
+package org.jetbrains.protocolReader
+
+class NamePath(val lastComponent: String, val parent: NamePath? = null) {
+
+  fun getLength(): Int {
+    var res = 1
+    run {
+      var current: NamePath? = this
+      while (current != null) {
+        res++
+        current = current!!.parent
+      }
+    }
+    return res
+  }
+
+  fun getFullText(): String {
+    val result = StringBuilder()
+    fillFullPath(result)
+    return result.toString()
+  }
+
+  private fun fillFullPath(result: StringBuilder) {
+    if (parent != null) {
+      parent.fillFullPath(result)
+      result.append('.')
+    }
+    result.append(lastComponent)
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.java
deleted file mode 100644
index 76a309368f32..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.io.JsonReaderEx;
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class OutputClassScope extends ClassScope {
-  OutputClassScope(@NotNull DomainGenerator generator, @NotNull NamePath classNamePath) {
-    super(generator, classNamePath);
-  }
-
-  <P extends ItemDescriptor.Named> void generate(@NotNull TextOutput out, @Nullable List<P> parameters) {
-    if (parameters == null) {
-      return;
-    }
-
-    List<P> mandatoryParameters = new ArrayList<>();
-    List<P> optionalParameters = new ArrayList<>();
-    for (P parameter : parameters) {
-      if (parameter.optional()) {
-        optionalParameters.add(parameter);
-      }
-      else {
-        mandatoryParameters.add(parameter);
-      }
-    }
-
-    if (!mandatoryParameters.isEmpty()) {
-      generateConstructor(out, mandatoryParameters, null);
-      if (mandatoryParameters.size() == 1) {
-        P parameter = mandatoryParameters.get(0);
-        TypeDescriptor typeData = new OutputMemberScope(getName(parameter)).resolveType(parameter);
-        if (typeData.getType().getFullText().equals("int[]")) {
-          BoxableType[] types = new BoxableType[mandatoryParameters.size()];
-          types[0] = new ListType(BoxableType.INT) {
-            @Override
-            String getShortText(NamePath contextNamespace) {
-              return getFullText();
-            }
-
-            @Override
-            String getFullText() {
-              return "gnu.trove.TIntArrayList";
-            }
-
-            @Override
-            String getWriteMethodName() {
-              return "writeIntList";
-            }
-          };
-
-          out.newLine().newLine();
-          generateConstructor(out, mandatoryParameters, types);
-
-          types[0] = new ListType(BoxableType.INT) {
-            @Override
-            String getShortText(NamePath contextNamespace) {
-              return getFullText();
-            }
-
-            @Override
-            String getFullText() {
-              return "int";
-            }
-
-            @Override
-            String getWriteMethodName() {
-              return "writeSingletonIntArray";
-            }
-          };
-
-          out.newLine().newLine();
-          generateConstructor(out, mandatoryParameters, types);
-        }
-      }
-    }
-
-    // generate enum classes after constructor
-    for (P parameter : parameters) {
-      if (parameter.getEnum() != null) {
-        out.newLine().newLine();
-        appendEnumClass(out, parameter.description(), parameter.getEnum(), Generator.capitalizeFirstChar((parameter.name())));
-      }
-    }
-
-    for (P parameter : optionalParameters) {
-      out.newLine().newLine();
-      if (parameter.description() != null) {
-        out.append("/**").newLine().append(" * @param v ").append(parameter.description()).newLine().append(" */").newLine();
-      }
-
-      CharSequence type = new OutputMemberScope(parameter.name()).resolveType(parameter).getType().getShortText(getClassContextNamespace());
-      if (type.equals(JsonReaderEx.class.getCanonicalName())) {
-        type = "String";
-      }
-
-      out.append("public ").append(getShortClassName());
-      out.space().append(parameter.name()).append("(").append(type);
-      out.space().append("v").append(")").openBlock();
-      appendWriteValueInvocation(out, parameter, "v", null);
-      out.newLine().append("return this;");
-      out.closeBlock();
-    }
-  }
-
-  private <P extends ItemDescriptor.Named> void generateConstructor(@NotNull TextOutput out, @NotNull List<P> parameters, @Nullable BoxableType[] parameterTypes) {
-    boolean hasDoc = false;
-    for (P parameter : parameters) {
-      if (parameter.description() != null) {
-        hasDoc = true;
-        break;
-      }
-    }
-    if (hasDoc) {
-      out.append("/**").newLine();
-      for (P parameter : parameters) {
-        if (parameter.description() != null) {
-          out.append(" * @param " + parameter.name() + ' ' + parameter.description()).newLine();
-        }
-      }
-      out.append(" */").newLine();
-    }
-    out.append("public " + getShortClassName() + '(');
-
-    if (parameterTypes == null) {
-      parameterTypes = new BoxableType[parameters.size()];
-    }
-    writeMethodParameters(out, parameters, parameterTypes);
-    out.append(')');
-
-    out.openBlock(false);
-    writeWriteCalls(out, parameters, parameterTypes, null);
-    out.closeBlock();
-  }
-
-  <P extends ItemDescriptor.Named> void writeWriteCalls(@NotNull TextOutput out, @NotNull List<P> parameters, @NotNull BoxableType[] parameterTypes, @Nullable String qualifier) {
-    for (int i = 0, size = parameters.size(); i < size; i++) {
-      out.newLine();
-
-      if (qualifier != null) {
-        out.append(qualifier).append('.');
-      }
-
-      P parameter = parameters.get(i);
-      appendWriteValueInvocation(out, parameter, parameter.name(), parameterTypes[i]);
-    }
-  }
-
-  <P extends ItemDescriptor.Named> void writeMethodParameters(@NotNull TextOutput out, @NotNull List<P> parameters, @NotNull BoxableType[] parameterTypes) {
-    for (int i = 0, length = parameterTypes.length; i < length; i++) {
-      if (parameterTypes[i] == null) {
-        P parameter = parameters.get(i);
-        parameterTypes[i] = new OutputMemberScope(parameter.name()).resolveType(parameter).getType();
-      }
-    }
-
-    boolean needComa = false;
-    for (int i = 0, size = parameters.size(); i < size; i++) {
-      if (needComa) {
-        out.comma();
-      }
-      else {
-        needComa = true;
-      }
-
-      out.append(parameterTypes[i].getShortText(getClassContextNamespace()));
-      out.space().append(parameters.get(i).name());
-    }
-  }
-
-  private void appendWriteValueInvocation(TextOutput out, ItemDescriptor.Named parameter, String valueRefName, @Nullable BoxableType type) {
-    if (type == null) {
-      type = new OutputMemberScope(parameter.name()).resolveType(parameter).getType();
-    }
-
-    boolean blockOpened = false;
-    if (parameter.optional()) {
-      String nullValue;
-      if (parameter.name().equals("columnNumber") || parameter.name().equals("column")) {
-        // todo generic solution
-        nullValue = "-1";
-      }
-      else {
-        nullValue = null;
-      }
-
-      if (nullValue != null) {
-        blockOpened = true;
-        out.append("if (v != ").append(nullValue).append(")").openBlock();
-      }
-      else if (parameter.name().equals("enabled")) {
-        blockOpened = true;
-        out.append("if (!v)").openBlock();
-      }
-      else if (parameter.name().equals("ignoreCount")) {
-        blockOpened = true;
-        out.append("if (v > 0)").openBlock();
-      }
-    }
-    // todo CallArgument (we should allow write null as value)
-    out.append(parameter.name().equals("value") && type.getWriteMethodName().equals("writeString") ? "writeNullableString" : type.getWriteMethodName()).append("(");
-    out.quote(parameter.name()).comma().append(valueRefName).append(");");
-    if (blockOpened) {
-      out.closeBlock();
-    }
-  }
-
-  @Override
-  protected TypeData.Direction getTypeDirection() {
-    return TypeData.Direction.OUTPUT;
-  }
-
-  class OutputMemberScope extends MemberScope {
-    protected OutputMemberScope(String memberName) {
-      super(OutputClassScope.this, memberName);
-    }
-
-    @Override
-    public BoxableType generateEnum(final String description, final List<String> enumConstants) {
-      return new StandaloneType(new NamePath(Generator.capitalizeFirstChar(getMemberName()), getClassContextNamespace()), "writeEnum");
-    }
-
-    @Override
-    public BoxableType generateNestedObject(String description, List<ProtocolMetaModel.ObjectProperty> propertyList) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  private static void appendEnumClass(TextOutput out, String description, List<String> enumConstants, String enumName) {
-    out.doc(description);
-    Enums.appendEnums(enumConstants, enumName, false, out);
-    out.newLine().append("private final String protocolValue;").newLine();
-    out.newLine().append(enumName).append("(String protocolValue)").openBlock();
-    out.append("this.protocolValue = protocolValue;").closeBlock();
-
-    out.newLine().newLine().append("public String toString()").openBlock();
-    out.append("return protocolValue;").closeBlock();
-    out.closeBlock();
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.kt
new file mode 100644
index 000000000000..b0e93d5963b1
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/OutputClassScope.kt
@@ -0,0 +1,225 @@
+package org.jetbrains.protocolReader
+
+class OutputClassScope(generator: DomainGenerator, classNamePath: NamePath) : ClassScope(generator, classNamePath) {
+  fun <P : ItemDescriptor.Named> generate(out: TextOutput, parameters: List<P>?) {
+    if (parameters == null) {
+      return
+    }
+
+    val mandatoryParameters = ArrayList<P>()
+    val optionalParameters = ArrayList<P>()
+    for (parameter in parameters) {
+      if (parameter.optional()) {
+        optionalParameters.add(parameter)
+      }
+      else {
+        mandatoryParameters.add(parameter)
+      }
+    }
+
+    if (!mandatoryParameters.isEmpty()) {
+      generateConstructor(out, mandatoryParameters)
+      if (mandatoryParameters.size() == 1) {
+        val parameter = mandatoryParameters.get(0)
+        val typeData = OutputMemberScope(ClassScope.getName(parameter)).resolveType<P>(parameter)
+        if (typeData.type.getFullText() == "int[]") {
+          val types = arrayOfNulls<BoxableType>(mandatoryParameters.size())
+          types[0] = object : ListType(BoxableType.INT) {
+            override fun getShortText(contextNamespace: NamePath): String {
+              return getFullText()
+            }
+
+            override fun getFullText(): String {
+              return "gnu.trove.TIntArrayList"
+            }
+
+            override fun getWriteMethodName(): String {
+              return "writeIntList"
+            }
+          }
+
+          out.newLine().newLine()
+          generateConstructor(out, mandatoryParameters, types)
+
+          types[0] = object : ListType(BoxableType.INT) {
+            override fun getShortText(contextNamespace: NamePath): String {
+              return getFullText()
+            }
+
+            override fun getFullText(): String {
+              return "int"
+            }
+
+            override fun getWriteMethodName(): String {
+              return "writeSingletonIntArray"
+            }
+          }
+
+          out.newLine().newLine()
+          generateConstructor(out, mandatoryParameters, types)
+        }
+      }
+    }
+
+    // generate enum classes after constructor
+    for (parameter in parameters) {
+      if (parameter.getEnum() != null) {
+        out.newLine().newLine()
+        appendEnumClass(out, parameter.description(), parameter.getEnum()!!, Generator.capitalizeFirstChar((parameter.name())))
+      }
+    }
+
+    for (parameter in optionalParameters) {
+      out.newLine().newLine()
+      if (parameter.description() != null) {
+        out.append("/**").newLine().append(" * @param v ").append(parameter.description()!!).newLine().append(" */").newLine()
+      }
+
+      var type: CharSequence = OutputMemberScope(parameter.name()).resolveType<P>(parameter).type.getShortText(classContextNamespace)
+      if (type == javaClass<JsonReaderEx>().getCanonicalName()) {
+        type = "String"
+      }
+
+      out.append("public ").append(getShortClassName())
+      out.space().append(parameter.name()).append("(").append(type)
+      out.space().append("v").append(")").openBlock()
+      appendWriteValueInvocation(out, parameter, "v")
+      out.newLine().append("return this;")
+      out.closeBlock()
+    }
+  }
+
+  private fun <P : ItemDescriptor.Named> generateConstructor(out: TextOutput, parameters: List<P>, parameterTypes: Array<BoxableType?> = arrayOfNulls<BoxableType>(parameters.size())) {
+    var hasDoc = false
+    for (parameter in parameters) {
+      if (parameter.description() != null) {
+        hasDoc = true
+        break
+      }
+    }
+    if (hasDoc) {
+      out.append("/**").newLine()
+      for (parameter in parameters) {
+        if (parameter.description() != null) {
+          out.append(" * @param " + parameter.name() + ' ' + parameter.description()).newLine()
+        }
+      }
+      out.append(" */").newLine()
+    }
+    out.append("public " + getShortClassName() + '(')
+
+    writeMethodParameters(out, parameters, parameterTypes)
+    out.append(')')
+
+    out.openBlock(false)
+    writeWriteCalls(out, parameters, parameterTypes, null)
+    out.closeBlock()
+  }
+
+  fun <P : ItemDescriptor.Named> writeWriteCalls(out: TextOutput, parameters: List<P>, parameterTypes: Array<BoxableType?>, qualifier: String?) {
+    run {
+      var i = 0
+      val size = parameters.size()
+      while (i < size) {
+        out.newLine()
+
+        if (qualifier != null) {
+          out.append(qualifier).append('.')
+        }
+
+        val parameter = parameters.get(i)
+        appendWriteValueInvocation(out, parameter, parameter.name(), parameterTypes[i]!!)
+        i++
+      }
+    }
+  }
+
+  fun <P : ItemDescriptor.Named> writeMethodParameters(out: TextOutput, parameters: List<P>, parameterTypes: Array<BoxableType?>) {
+    run {
+      var i = 0
+      val length = parameterTypes.size()
+      while (i < length) {
+        if (parameterTypes[i] == null) {
+          val parameter = parameters.get(i)
+          parameterTypes[i] = OutputMemberScope(parameter.name()).resolveType<P>(parameter).type
+        }
+        i++
+      }
+    }
+
+    var needComa = false
+    run {
+      var i = 0
+      val size = parameters.size()
+      while (i < size) {
+        if (needComa) {
+          out.comma()
+        }
+        else {
+          needComa = true
+        }
+
+        out.append(parameterTypes[i]!!.getShortText(classContextNamespace))
+        out.space().append(parameters.get(i).name())
+        i++
+      }
+    }
+  }
+
+  private fun appendWriteValueInvocation(out: TextOutput, parameter: ItemDescriptor.Named, valueRefName: String, type: BoxableType = OutputMemberScope(parameter.name()).resolveType<ItemDescriptor.Named>(parameter).type) {
+    var blockOpened = false
+    if (parameter.optional()) {
+      val nullValue: String?
+      if (parameter.name() == "columnNumber" || parameter.name() == "column") {
+        // todo generic solution
+        nullValue = "-1"
+      }
+      else {
+        nullValue = null
+      }
+
+      if (nullValue != null) {
+        blockOpened = true
+        out.append("if (v != ").append(nullValue).append(")").openBlock()
+      }
+      else if (parameter.name() == "enabled") {
+        blockOpened = true
+        out.append("if (!v)").openBlock()
+      }
+      else if (parameter.name() == "ignoreCount") {
+        blockOpened = true
+        out.append("if (v > 0)").openBlock()
+      }
+    }
+    // todo CallArgument (we should allow write null as value)
+    out.append(if (parameter.name() == "value" && type.getWriteMethodName() == "writeString") "writeNullableString" else type.getWriteMethodName()).append("(")
+    out.quote(parameter.name()).comma().append(valueRefName).append(");")
+    if (blockOpened) {
+      out.closeBlock()
+    }
+  }
+
+  override fun getTypeDirection(): TypeData.Direction {
+    return TypeData.Direction.OUTPUT
+  }
+
+  inner class OutputMemberScope(memberName: String) : MemberScope(this@OutputClassScope, memberName) {
+    override fun generateEnum(description: String?, enumConstants: List<String>): BoxableType {
+      return StandaloneType(NamePath(Generator.capitalizeFirstChar(memberName), classContextNamespace), "writeEnum")
+    }
+
+    override fun generateNestedObject(description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?) = throw UnsupportedOperationException()
+  }
+
+  private fun appendEnumClass(out: TextOutput, description: String?, enumConstants: List<String>, enumName: String) {
+    out.doc(description)
+    Enums.appendEnums(enumConstants, enumName, false, out)
+    out.newLine().append("private final String protocolValue;").newLine()
+    out.newLine().append(enumName).append("(String protocolValue)").openBlock()
+    out.append("this.protocolValue = protocolValue;").closeBlock()
+
+    out.newLine().newLine().append("public String toString()").openBlock()
+    out.append("return protocolValue;").closeBlock()
+    out.closeBlock()
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.java
deleted file mode 100644
index e84c641ff9c3..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-
-class ParserRootInterfaceItem implements Comparable<ParserRootInterfaceItem> {
-  final String domain;
-  final String name;
-  private final ClassNameScheme.Input nameScheme;
-  final String fullName;
-
-  public ParserRootInterfaceItem(String domain, String name, ClassNameScheme.Input nameScheme) {
-    this.domain = domain;
-    this.name = name;
-    this.nameScheme = nameScheme;
-    fullName = nameScheme.getFullName(domain, name).getFullText();
-  }
-
-  void writeCode(TextOutput out) throws IOException {
-    out.append("@org.jetbrains.jsonProtocol.JsonParseMethod").newLine();
-    out.append("public abstract ").append(fullName).space();
-    appendReadMethodName(out);
-    out.append("(").append(Util.JSON_READER_PARAMETER_DEF).append(")").semi().newLine();
-  }
-
-  void appendReadMethodName(TextOutput out) {
-    out.append(nameScheme.getParseMethodName(domain, name));
-  }
-
-  @Override
-  public int compareTo(@NotNull ParserRootInterfaceItem o) {
-    return fullName.compareTo(o.fullName);
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.kt
new file mode 100644
index 000000000000..eb0cc1ee1b4e
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ParserRootInterfaceItem.kt
@@ -0,0 +1,26 @@
+package org.jetbrains.protocolReader
+
+import org.jetbrains.protocolReader.ParserRootInterfaceItem
+
+class ParserRootInterfaceItem(val domain: String, val name: String, private val nameScheme: ClassNameScheme.Input) : Comparable<ParserRootInterfaceItem> {
+  val fullName: String
+
+  init {
+    fullName = nameScheme.getFullName(domain, name).getFullText()
+  }
+
+  fun writeCode(out: TextOutput) {
+    out.append("@org.jetbrains.jsonProtocol.JsonParseMethod").newLine()
+    out.append("public abstract ").append(fullName).space()
+    appendReadMethodName(out)
+    out.append("(").append(JSON_READER_PARAMETER_DEF).append(")").semi().newLine()
+  }
+
+  fun appendReadMethodName(out: TextOutput) {
+    out.append(nameScheme.getParseMethodName(domain, name))
+  }
+
+  override fun compareTo(other: ParserRootInterfaceItem): Int {
+    return fullName.compareTo(other.fullName)
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.java
deleted file mode 100644
index 7866e74a7f48..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.io.JsonReaderEx;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jsonProtocol.ProtocolSchemaReaderImpl;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-
-public class ProtocolModelGenerator {
-  public static void main(String[] args) throws IOException {
-    String outputDir = args[0];
-    String schemaUrl = args[1];
-    byte[] bytes;
-    if (schemaUrl.startsWith("http")) {
-      bytes = loadBytes(new URL(schemaUrl).openStream());
-    }
-    else {
-      bytes = Files.readAllBytes(FileSystems.getDefault().getPath(schemaUrl));
-    }
-    JsonReaderEx reader = new JsonReaderEx(new String(bytes, StandardCharsets.UTF_8));
-    reader.setLenient(true);
-    new Generator(outputDir, args[2], args[3]).go(new ProtocolSchemaReaderImpl().parseRoot(reader));
-  }
-
-  @NotNull
-  public static byte[] loadBytes(@NotNull InputStream stream) throws IOException {
-    ByteArrayOutputStream buffer = new ByteArrayOutputStream(Math.max(stream.available(), 16 * 1024));
-    byte[] bytes = new byte[1024 * 20];
-    while (true) {
-      int n = stream.read(bytes, 0, bytes.length);
-      if (n <= 0) {
-        break;
-      }
-      buffer.write(bytes, 0, n);
-    }
-    buffer.close();
-    return buffer.toByteArray();
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.kt
new file mode 100644
index 000000000000..9ebbe79afa25
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ProtocolModelGenerator.kt
@@ -0,0 +1,40 @@
+package org.jetbrains.protocolReader
+
+import org.jetbrains.protocolReader.ProtocolModelGenerator
+
+public class ProtocolModelGenerator {
+  default object {
+    throws(javaClass<IOException>())
+    public fun main(args: Array<String>) {
+      val outputDir = args[0]
+      val schemaUrl = args[1]
+      val bytes: ByteArray
+      if (schemaUrl.startsWith("http")) {
+        bytes = loadBytes(URL(schemaUrl).openStream())
+      }
+      else {
+        bytes = Files.readAllBytes(FileSystems.getDefault().getPath(schemaUrl))
+      }
+      val reader = JsonReaderEx(String(bytes, StandardCharsets.UTF_8))
+      reader.setLenient(true)
+      Generator(outputDir, args[2], args[3]).go(ProtocolSchemaReaderImpl().parseRoot(reader))
+    }
+
+    throws(javaClass<IOException>())
+    public fun loadBytes(stream: InputStream): ByteArray {
+      val buffer = ByteArrayOutputStream(Math.max(stream.available(), 16 * 1024))
+      val bytes = ByteArray(1024 * 20)
+      while (true) {
+        val n = stream.read(bytes, 0, bytes.size())
+        if (n <= 0) {
+          break
+        }
+        buffer.write(bytes, 0, n)
+      }
+      buffer.close()
+      return buffer.toByteArray()
+    }
+  }
+}
+
+fun main(args: Array<String>) = ProtocolModelGenerator.main(args)
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.java
deleted file mode 100644
index c43c9ff7deff..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.jsonProtocol.ItemDescriptor;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.util.List;
-
-interface ResolveAndGenerateScope {
-  String getDomainName();
-  TypeData.Direction getTypeDirection();
-
-  <T extends ItemDescriptor> TypeDescriptor resolveType(T typedObject);
-
-  BoxableType generateNestedObject(String description,
-                                   List<ProtocolMetaModel.ObjectProperty> properties);
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.kt
new file mode 100644
index 000000000000..28dea57a46d6
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/ResolveAndGenerateScope.kt
@@ -0,0 +1,10 @@
+package org.jetbrains.protocolReader
+
+trait ResolveAndGenerateScope {
+  public fun getDomainName(): String
+  public fun getTypeDirection(): TypeData.Direction
+
+  public fun <T : ItemDescriptor> resolveType(typedObject: T): TypeDescriptor
+
+  public fun generateNestedObject(description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?): BoxableType
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.java
deleted file mode 100644
index 540b2052c408..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.jetbrains.protocolReader;
-
-class StandaloneType extends BoxableType {
-  private final NamePath namePath;
-  private final String writeMethodName;
-
-  StandaloneType(NamePath namePath, String writeMethodName) {
-    this.namePath = namePath;
-    this.writeMethodName = writeMethodName;
-  }
-
-  @Override
-  String getWriteMethodName() {
-    return writeMethodName;
-  }
-
-  @Override
-  CharSequence getFullText() {
-    return namePath.getFullText();
-  }
-
-  @Override
-  String getShortText(NamePath contextNamespace) {
-    int nameLength = namePath.getLength();
-    int contextLength = contextNamespace.getLength();
-    if (nameLength > contextLength) {
-      StringBuilder builder = subtractContextRecursively(namePath, nameLength - contextLength, contextNamespace);
-      if (builder != null) {
-        return builder.toString();
-      }
-    }
-    return namePath.getFullText();
-  }
-
-  private static StringBuilder subtractContextRecursively(NamePath namePos, int count, NamePath prefix) {
-    if (count > 1) {
-      StringBuilder result = subtractContextRecursively(namePos.getParent(), count - 1, prefix);
-      if (result == null) {
-        return null;
-      }
-      result.append('.');
-      result.append(namePos.getLastComponent());
-      return result;
-    }
-    else {
-      String nameComponent = namePos.getLastComponent();
-      namePos = namePos.getParent();
-      do {
-        if (!namePos.getLastComponent().equals(prefix.getLastComponent())) {
-          return null;
-        }
-        namePos = namePos.getParent();
-        prefix = prefix.getParent();
-      }
-      while (namePos != null);
-
-      StringBuilder result = new StringBuilder();
-      result.append(nameComponent);
-      return result;
-    }
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.kt
new file mode 100644
index 000000000000..e93b18b5005b
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneType.kt
@@ -0,0 +1,53 @@
+package org.jetbrains.protocolReader
+
+class StandaloneType(private val namePath: NamePath, private val writeMethodName: String) : BoxableType() {
+  override fun getWriteMethodName(): String {
+    return writeMethodName
+  }
+
+  override fun getFullText(): CharSequence {
+    return namePath.getFullText()
+  }
+
+  override fun getShortText(contextNamespace: NamePath): String {
+    val nameLength = namePath.getLength()
+    val contextLength = contextNamespace.getLength()
+    if (nameLength > contextLength) {
+      val builder = subtractContextRecursively(namePath, nameLength - contextLength, contextNamespace)
+      if (builder != null) {
+        return builder.toString()
+      }
+    }
+    return namePath.getFullText()
+  }
+
+  private fun subtractContextRecursively(namePos: NamePath?, count: Int, prefix: NamePath): StringBuilder? {
+    var namePos = namePos
+    var prefix = prefix
+    if (count > 1) {
+      val result = subtractContextRecursively(namePos!!.parent, count - 1, prefix)
+      if (result == null) {
+        return null
+      }
+      result.append('.')
+      result.append(namePos!!.lastComponent)
+      return result
+    }
+    else {
+      val nameComponent = namePos!!.lastComponent
+      namePos = namePos!!.parent
+      do {
+        if (namePos!!.lastComponent != prefix.lastComponent) {
+          return null
+        }
+        namePos = namePos!!.parent
+        prefix = prefix.parent!!
+      }
+      while (namePos != null)
+
+      val result = StringBuilder()
+      result.append(nameComponent)
+      return result
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.java
deleted file mode 100644
index 40fd24f40def..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.io.IOException;
-import java.util.List;
-
-interface StandaloneTypeBinding {
-  BoxableType getJavaType();
-
-  void generate() throws IOException;
-
-  /**
-   * @return null if not direction-specific
-   */
-  @Nullable
-  TypeData.Direction getDirection();
-
-  interface Target {
-    BoxableType resolve(ResolveContext context);
-
-    interface ResolveContext {
-      BoxableType generateNestedObject(String shortName, String description, List<ProtocolMetaModel.ObjectProperty> properties);
-    }
-  }
-
-  class PredefinedTarget implements Target {
-    private final BoxableType resolvedType;
-
-    PredefinedTarget(BoxableType resolvedType) {
-      this.resolvedType = resolvedType;
-    }
-
-    @Override
-    public BoxableType resolve(ResolveContext context) {
-      return resolvedType;
-    }
-
-    public static final PredefinedTarget STRING = new PredefinedTarget(BoxableType.STRING);
-    public static final PredefinedTarget INT = new PredefinedTarget(BoxableType.INT);
-    public static final PredefinedTarget NUMBER = new PredefinedTarget(BoxableType.NUMBER);
-    public static final PredefinedTarget MAP = new PredefinedTarget(BoxableType.MAP);
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.kt
new file mode 100644
index 000000000000..ba0273aade32
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/StandaloneTypeBinding.kt
@@ -0,0 +1,35 @@
+package org.jetbrains.protocolReader
+
+trait StandaloneTypeBinding {
+  public fun getJavaType(): BoxableType
+
+  public fun generate()
+
+  /**
+   * @return null if not direction-specific
+   */
+  public fun getDirection(): TypeData.Direction?
+
+  public trait Target {
+    public fun resolve(context: ResolveContext): BoxableType
+
+    public trait ResolveContext {
+      public fun generateNestedObject(shortName: String, description: String?, properties: List<ProtocolMetaModel.ObjectProperty>?): BoxableType
+    }
+  }
+
+  public class PredefinedTarget(private val resolvedType: BoxableType) : Target {
+
+    override fun resolve(context: Target.ResolveContext): BoxableType {
+      return resolvedType
+    }
+
+    default object {
+
+      public val STRING: PredefinedTarget = PredefinedTarget(BoxableType.STRING)
+      public val INT: PredefinedTarget = PredefinedTarget(BoxableType.INT)
+      public val NUMBER: PredefinedTarget = PredefinedTarget(BoxableType.NUMBER)
+      public val MAP: PredefinedTarget = PredefinedTarget(BoxableType.MAP)
+    }
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.java
deleted file mode 100644
index 44404ad895e1..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.jetbrains.protocolReader;
-
-public interface TextOutConsumer {
-  void append(TextOutput out);
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.kt
new file mode 100644
index 000000000000..2ef0ecc6461d
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TextOutConsumer.kt
@@ -0,0 +1,5 @@
+package org.jetbrains.protocolReader
+
+public trait TextOutConsumer {
+  public fun append(out: TextOutput)
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.java
deleted file mode 100644
index 7fbc5f6c2cad..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-class TypeData {
-  public static final StandaloneTypeBinding ANY = new StandaloneTypeBinding() {
-    @Override
-    public BoxableType getJavaType() {
-      return BoxableType.ANY_STRING;
-    }
-
-    @Override
-    public void generate() {
-    }
-
-    @Override
-    public Direction getDirection() {
-      return null;
-    }
-  };
-  private final String name;
-
-  private Input input;
-  private Output output;
-
-  private ProtocolMetaModel.StandaloneType type;
-  private StandaloneTypeBinding commonBinding;
-
-  TypeData(String name) {
-    this.name = name;
-  }
-
-  void setType(@NotNull ProtocolMetaModel.StandaloneType type) {
-    this.type = type;
-  }
-
-  Input getInput() {
-    if (input == null) {
-      input = new Input();
-    }
-    return input;
-  }
-
-  Output getOutput() {
-    if (output == null) {
-      output = new Output();
-    }
-    return output;
-  }
-
-  TypeRef get(Direction direction) {
-    return direction.get(this);
-  }
-
-  void checkComplete() {
-    if (input != null) {
-      input.checkResolved();
-    }
-    if (output != null) {
-      output.checkResolved();
-    }
-  }
-
-  enum Direction {
-    INPUT() {
-      @Override
-      TypeRef get(TypeData typeData) {
-        return typeData.getInput();
-      }
-    },
-    OUTPUT() {
-      @Override
-      TypeRef get(TypeData typeData) {
-        return typeData.getOutput();
-      }
-    };
-    abstract TypeRef get(TypeData typeData);
-  }
-
-  abstract class TypeRef {
-    private StandaloneTypeBinding oneDirectionBinding;
-
-    BoxableType resolve(@NotNull TypeMap typeMap, @NotNull DomainGenerator domainGenerator) {
-      if (commonBinding != null) {
-        return commonBinding.getJavaType();
-      }
-      if (oneDirectionBinding != null) {
-        return oneDirectionBinding.getJavaType();
-      }
-      StandaloneTypeBinding binding = resolveImpl(domainGenerator);
-      if (binding == null) {
-        return null;
-      }
-
-      if (binding.getDirection() == null) {
-        commonBinding = binding;
-      }
-      else {
-        oneDirectionBinding = binding;
-      }
-      typeMap.addTypeToGenerate(binding);
-      return binding.getJavaType();
-    }
-
-    abstract StandaloneTypeBinding resolveImpl(DomainGenerator domainGenerator);
-
-    void checkResolved() {
-      if (type == null && !(name.equals("int") || name.equals("any"))) {
-        throw new RuntimeException();
-      }
-    }
-  }
-
-  class Output extends TypeRef {
-    @Override
-    StandaloneTypeBinding resolveImpl(@NotNull DomainGenerator domainGenerator) {
-      if (type == null) {
-        if (name.equals("int")) {
-          return new StandaloneTypeBinding() {
-            @Override
-            public BoxableType getJavaType() {
-              return BoxableType.INT;
-            }
-
-            @Override
-            public void generate() {
-            }
-
-            @Override
-            public Direction getDirection() {
-              return null;
-            }
-          };
-        }
-        else if (name.equals("any")) {
-          return ANY;
-        }
-
-        throw new RuntimeException();
-      }
-      return domainGenerator.createStandaloneOutputTypeBinding(type, name);
-    }
-  }
-
-  class Input extends TypeRef {
-    @Override
-    StandaloneTypeBinding resolveImpl(@NotNull DomainGenerator domainGenerator) {
-      if (type == null) {
-        if (name.equals("int")) {
-          return new StandaloneTypeBinding() {
-            @Override
-            public BoxableType getJavaType() {
-              return BoxableType.INT;
-            }
-
-            @Override
-            public void generate() {
-            }
-
-            @Override
-            public Direction getDirection() {
-              return null;
-            }
-          };
-        }
-        else if (name.equals("any")) {
-          return ANY;
-        }
-
-        throw new RuntimeException();
-      }
-      return domainGenerator.createStandaloneInputTypeBinding(type);
-    }
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.kt
new file mode 100644
index 000000000000..e971e9123f18
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeData.kt
@@ -0,0 +1,159 @@
+package org.jetbrains.protocolReader
+
+import org.jetbrains.protocolReader.TypeData
+
+class TypeData(private val name: String) {
+  private var input: Input? = null
+  private var output: Output? = null
+
+  private var type: ProtocolMetaModel.StandaloneType? = null
+  private var commonBinding: StandaloneTypeBinding? = null
+
+  fun setType(type: ProtocolMetaModel.StandaloneType) {
+    this.type = type
+  }
+
+  fun getInput(): Input {
+    if (input == null) {
+      input = Input()
+    }
+    return input!!
+  }
+
+  fun getOutput(): Output {
+    if (output == null) {
+      output = Output()
+    }
+    return output!!
+  }
+
+  fun get(direction: Direction): TypeRef {
+    return direction.get(this)
+  }
+
+  fun checkComplete() {
+    if (input != null) {
+      input!!.checkResolved()
+    }
+    if (output != null) {
+      output!!.checkResolved()
+    }
+  }
+
+  abstract  class Direction {
+    default object {
+      val INPUT = object : Direction() {
+        override fun get(typeData: TypeData)  = typeData.getInput()
+      }
+
+      val OUTPUT = object : Direction() {
+        override fun get(typeData: TypeData) = typeData.getOutput()
+      }
+    }
+
+    abstract fun get(typeData: TypeData): TypeRef
+  }
+
+  abstract inner class TypeRef {
+    private var oneDirectionBinding: StandaloneTypeBinding? = null
+
+    fun resolve(typeMap: TypeMap, domainGenerator: DomainGenerator): BoxableType? {
+      if (commonBinding != null) {
+        return commonBinding!!.getJavaType()
+      }
+      if (oneDirectionBinding != null) {
+        return oneDirectionBinding!!.getJavaType()
+      }
+      val binding = resolveImpl(domainGenerator)
+      if (binding == null) {
+        return null
+      }
+
+      if (binding.getDirection() == null) {
+        commonBinding = binding
+      }
+      else {
+        oneDirectionBinding = binding
+      }
+      typeMap.addTypeToGenerate(binding)
+      return binding.getJavaType()
+    }
+
+    abstract fun resolveImpl(domainGenerator: DomainGenerator): StandaloneTypeBinding?
+
+    fun checkResolved() {
+      if (type == null && !(name == "int" || name == "any")) {
+        throw RuntimeException()
+      }
+    }
+  }
+
+  inner class Output : TypeRef() {
+    override fun resolveImpl(domainGenerator: DomainGenerator): StandaloneTypeBinding? {
+      if (type == null) {
+        if (name == "int") {
+          return object : StandaloneTypeBinding {
+            override fun getJavaType(): BoxableType {
+              return BoxableType.INT
+            }
+
+            override fun generate() {
+            }
+
+            override fun getDirection(): Direction? {
+              return null
+            }
+          }
+        }
+        else if (name == "any") {
+          return ANY
+        }
+
+        throw RuntimeException()
+      }
+      return domainGenerator.createStandaloneOutputTypeBinding(type!!, name)
+    }
+  }
+
+  inner class Input : TypeRef() {
+    override fun resolveImpl(domainGenerator: DomainGenerator): StandaloneTypeBinding? {
+      if (type == null) {
+        if (name == "int") {
+          return object : StandaloneTypeBinding {
+            override fun getJavaType(): BoxableType {
+              return BoxableType.INT
+            }
+
+            override fun generate() {
+            }
+
+            override fun getDirection(): Direction? {
+              return null
+            }
+          }
+        }
+        else if (name == "any") {
+          return ANY
+        }
+
+        throw RuntimeException()
+      }
+      return domainGenerator.createStandaloneInputTypeBinding(type!!)
+    }
+  }
+
+  default object {
+    public val ANY: StandaloneTypeBinding = object : StandaloneTypeBinding {
+      override fun getJavaType(): BoxableType {
+        return BoxableType.ANY_STRING
+      }
+
+      override fun generate() {
+      }
+
+      override fun getDirection(): Direction? {
+        return null
+      }
+    }
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.java
deleted file mode 100644
index d142e8bdf6d5..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.annotations.NotNull;
-
-class TypeDescriptor {
-  private final BoxableType type;
-  private final boolean optional;
-  private final boolean nullable;
-  private final boolean asRawString;
-
-  TypeDescriptor(@NotNull BoxableType type, boolean optional) {
-    this(type, optional, false, false);
-  }
-
-  TypeDescriptor(@NotNull BoxableType type, boolean optional, boolean nullable, boolean asRawString) {
-    this.type = type;
-    this.optional = optional;
-    this.nullable = nullable;
-    this.asRawString = asRawString;
-  }
-
-  boolean isNullable() {
-    return nullable;
-  }
-
-  @NotNull
-  BoxableType getType() {
-    return type;
-  }
-
-  void writeAnnotations(@NotNull TextOutput out) {
-    if (optional || asRawString) {
-      out.append("@org.jetbrains.jsonProtocol.JsonField(");
-      if (optional) {
-        out.append("optional=true");
-      }
-      if (asRawString) {
-        if (optional) {
-          out.append(", ");
-        }
-        out.append("allowAnyPrimitiveValue=true");
-      }
-      out.append(")").newLine();
-    }
-
-    if (isNullable()) {
-      out.append("@org.jetbrains.jsonProtocol.JsonNullable").newLine();
-    }
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.kt
new file mode 100644
index 000000000000..7c64e34bf792
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeDescriptor.kt
@@ -0,0 +1,28 @@
+package org.jetbrains.protocolReader
+
+class TypeDescriptor(val type: BoxableType, private val optional: Boolean, private val nullable: Boolean = false, private val asRawString: Boolean = false) {
+
+  fun isNullable(): Boolean {
+    return nullable
+  }
+
+  fun writeAnnotations(out: TextOutput) {
+    if (optional || asRawString) {
+      out.append("@org.jetbrains.jsonProtocol.JsonField(")
+      if (optional) {
+        out.append("optional=true")
+      }
+      if (asRawString) {
+        if (optional) {
+          out.append(", ")
+        }
+        out.append("allowAnyPrimitiveValue=true")
+      }
+      out.append(")").newLine()
+    }
+
+    if (isNullable()) {
+      out.append("@org.jetbrains.jsonProtocol.JsonNullable").newLine()
+    }
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.java
deleted file mode 100644
index a1d35b54cc0e..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import com.intellij.openapi.util.Pair;
-import gnu.trove.THashMap;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Keeps track of all referenced types.
- * A type may be used and resolved (generated or hard-coded).
- */
-class TypeMap {
-  private final Map<Pair<String, String>, TypeData> map = new THashMap<>();
-  private Map<String, DomainGenerator> domainGeneratorMap;
-  private final List<StandaloneTypeBinding> typesToGenerate = new ArrayList<>();
-
-  void setDomainGeneratorMap(Map<String, DomainGenerator> domainGeneratorMap) {
-    this.domainGeneratorMap = domainGeneratorMap;
-  }
-
-  @Nullable
-  BoxableType resolve(String domainName, String typeName, TypeData.Direction direction) {
-    DomainGenerator domainGenerator = domainGeneratorMap.get(domainName);
-    if (domainGenerator == null) {
-      throw new RuntimeException("Failed to find domain generator: " + domainName);
-    }
-    return getTypeData(domainName, typeName).get(direction).resolve(this, domainGenerator);
-  }
-
-  void addTypeToGenerate(@NotNull StandaloneTypeBinding binding) {
-    typesToGenerate.add(binding);
-  }
-
-  public void generateRequestedTypes() throws IOException {
-    // Size may grow during iteration.
-    //noinspection ForLoopReplaceableByForEach
-    for (int i = 0; i < typesToGenerate.size(); i++) {
-      typesToGenerate.get(i).generate();
-    }
-
-    for (TypeData typeData : map.values()) {
-      typeData.checkComplete();
-    }
-  }
-
-  @NotNull
-  TypeData getTypeData(@NotNull String domainName, @NotNull String typeName) {
-    Pair<String, String> key = Pair.create(domainName, typeName);
-    TypeData result = map.get(key);
-    if (result == null) {
-      result = new TypeData(typeName);
-      map.put(key, result);
-    }
-    return result;
-  }
-}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.kt
new file mode 100644
index 000000000000..2c311746b66e
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeMap.kt
@@ -0,0 +1,50 @@
+package org.jetbrains.protocolReader
+
+/**
+ * Keeps track of all referenced types.
+ * A type may be used and resolved (generated or hard-coded).
+ */
+class TypeMap {
+  private val map = THashMap<Pair<String, String>, TypeData>()
+  private var domainGeneratorMap: Map<String, DomainGenerator>? = null
+  private val typesToGenerate = ArrayList<StandaloneTypeBinding>()
+
+  fun setDomainGeneratorMap(domainGeneratorMap: Map<String, DomainGenerator>) {
+    this.domainGeneratorMap = domainGeneratorMap
+  }
+
+  fun resolve(domainName: String, typeName: String, direction: TypeData.Direction): BoxableType? {
+    val domainGenerator = domainGeneratorMap!!.get(domainName)
+    if (domainGenerator == null) {
+      throw RuntimeException("Failed to find domain generator: " + domainName)
+    }
+    return getTypeData(domainName, typeName).get(direction).resolve(this, domainGenerator)
+  }
+
+  fun addTypeToGenerate(binding: StandaloneTypeBinding) {
+    typesToGenerate.add(binding)
+  }
+
+  throws(javaClass<IOException>())
+  public fun generateRequestedTypes() {
+    // Size may grow during iteration.
+    //noinspection ForLoopReplaceableByForEach
+    for (i in typesToGenerate.indices) {
+      typesToGenerate.get(i).generate()
+    }
+
+    for (typeData in map.values()) {
+      typeData.checkComplete()
+    }
+  }
+
+  fun getTypeData(domainName: String, typeName: String): TypeData {
+    val key = Pair.create<String, String>(domainName, typeName)
+    var result: TypeData? = map.get(key)
+    if (result == null) {
+      result = TypeData(typeName)
+      map.put(key, result)
+    }
+    return result!!
+  }
+}
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.java b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.java
deleted file mode 100644
index 0aae6cc8179a..000000000000
--- a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.jetbrains.protocolReader;
-
-import org.jetbrains.jsonProtocol.ProtocolMetaModel;
-
-import java.util.List;
-
-interface TypeVisitor<R> {
-  R visitRef(String refName);
-
-  R visitBoolean();
-
-  R visitEnum(List<String> enumConstants);
-
-  R visitString();
-
-  R visitInteger();
-
-  R visitNumber();
-
-  R visitArray(ProtocolMetaModel.ArrayItemType items);
-
-  R visitObject(List<ProtocolMetaModel.ObjectProperty> properties);
-
-  R visitMap();
-
-  R visitUnknown();
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.kt b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.kt
new file mode 100644
index 000000000000..ca53230e8d18
--- /dev/null
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/org/jetbrains/protocolReader/TypeVisitor.kt
@@ -0,0 +1,23 @@
+package org.jetbrains.protocolReader
+
+trait TypeVisitor<R> {
+  public fun visitRef(refName: String): R
+
+  public fun visitBoolean(): R
+
+  public fun visitEnum(enumConstants: List<String>): R
+
+  public fun visitString(): R
+
+  public fun visitInteger(): R
+
+  public fun visitNumber(): R
+
+  public fun visitArray(items: ProtocolMetaModel.ArrayItemType): R
+
+  public fun visitObject(properties: List<ProtocolMetaModel.ObjectProperty>?): R
+
+  public fun visitMap(): R
+
+  public fun visitUnknown(): R
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonOptionalField.java b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonOptionalField.java
index 92c9cd978700..545037e01315 100644
--- a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonOptionalField.java
+++ b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonOptionalField.java
@@ -1,7 +1,6 @@
 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
 package org.jetbrains.jsonProtocol;
 
 import java.lang.annotation.ElementType;
diff --git a/platform/script-debugger/protocol/protocol-reader/protocol-reader.iml b/platform/script-debugger/protocol/protocol-reader/protocol-reader.iml
index 1eded93d37e9..7c6275fd1a04 100644
--- a/platform/script-debugger/protocol/protocol-reader/protocol-reader.iml
+++ b/platform/script-debugger/protocol/protocol-reader/protocol-reader.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/platform/script-debugger/protocol/protocol-reader/src/FieldProcessor.kt b/platform/script-debugger/protocol/protocol-reader/src/FieldProcessor.kt
index 2b813edcabdf..1df6c60dcf3e 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/FieldProcessor.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/FieldProcessor.kt
@@ -4,10 +4,11 @@ import gnu.trove.THashSet
 import org.jetbrains.jsonProtocol.JsonField
 import org.jetbrains.jsonProtocol.JsonOptionalField
 import org.jetbrains.jsonProtocol.JsonSubtypeCasting
-
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
-import java.util.*
+import java.util.ArrayList
+import java.util.Arrays
+import java.util.LinkedHashMap
 
 class FieldProcessor(private val reader: InterfaceReader, typeClass: Class<*>) {
   val fieldLoaders = ArrayList<FieldLoader>()
@@ -15,10 +16,10 @@ class FieldProcessor(private val reader: InterfaceReader, typeClass: Class<*>) {
   val volatileFields = ArrayList<VolatileFieldBinding>()
   var lazyRead: Boolean = false
 
-  {
+  init {
     val methods = typeClass.getMethods()
     // todo sort by source location
-    Arrays.sort(methods, {(o1, o2) -> o1.getName().compareTo(o2.getName())})
+    Arrays.sort(methods, {(o1, o2) -> o1.getName().compareTo(o2.getName()) })
 
     val skippedNames = THashSet<String>()
     for (method in methods) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/GlobalScope.kt b/platform/script-debugger/protocol/protocol-reader/src/GlobalScope.kt
index 733e5ecdb03d..ddb05e0ff13c 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/GlobalScope.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/GlobalScope.kt
@@ -40,7 +40,7 @@ private class State(typeWriters: Collection<TypeWriter<*>>, private val basePack
   private val typesWithFactories = THashSet<TypeWriter<*>>()
   val typesWithFactoriesList = ArrayList<TypeWriter<*>>();
 
-  {
+  init {
     var uniqueCode = 0
     val result = THashMap<TypeWriter<*>, String>(typeWriters.size())
     for (handler in typeWriters) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
index 053c68b2ba05..50fef016331b 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/InterfaceReader.kt
@@ -1,16 +1,17 @@
 package org.jetbrains.protocolReader
 
+import gnu.trove.THashSet
 import org.jetbrains.io.JsonReaderEx
 import org.jetbrains.jsonProtocol.JsonField
+import org.jetbrains.jsonProtocol.JsonOptionalField
 import org.jetbrains.jsonProtocol.JsonSubtype
 import org.jetbrains.jsonProtocol.StringIntPair
-
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import java.lang.reflect.WildcardType
-import java.util.*
-import gnu.trove.*
+import java.util.ArrayList
+import java.util.LinkedHashMap
 
 fun InterfaceReader(protocolInterfaces: Array<Class<*>>): InterfaceReader {
   val __ = InterfaceReader(LinkedHashMap<Class<*>, TypeWriter<*>>(protocolInterfaces.size()))
@@ -130,6 +131,9 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
           if (jsonField != null && jsonField.allowAnyPrimitiveValue()) {
             return RAW_STRING_PARSER
           }
+          else if ((jsonField != null && jsonField.optional()) || method.getAnnotation<JsonOptionalField>(javaClass<JsonOptionalField>()) != null) {
+            return NULLABLE_STRING_PARSER
+          }
         }
         return STRING_PARSER
       }
@@ -220,6 +224,7 @@ class InterfaceReader(val typeToTypeHandler: LinkedHashMap<Class<*>, TypeWriter<
     private val NUMBER_PARSER = PrimitiveValueReader("double")
 
     private val STRING_PARSER = PrimitiveValueReader("String")
+    private val NULLABLE_STRING_PARSER = PrimitiveValueReader(className = "String", nullable = true)
 
     private val RAW_STRING_PARSER = PrimitiveValueReader("String", null, true)
     private val RAW_STRING_OR_MAP_PARSER = object : PrimitiveValueReader("Object", null, true) {
diff --git a/platform/script-debugger/protocol/protocol-reader/src/PrimitiveValueReader.kt b/platform/script-debugger/protocol/protocol-reader/src/PrimitiveValueReader.kt
index f091e1c2880d..7f36b0f6a37d 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/PrimitiveValueReader.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/PrimitiveValueReader.kt
@@ -1,18 +1,9 @@
 package org.jetbrains.protocolReader
 
-
-fun PrimitiveValueReader(name: String): PrimitiveValueReader {
-  return PrimitiveValueReader(name, null, false)
-}
-
-fun PrimitiveValueReader(name: String, defaultValue: String): PrimitiveValueReader {
-  return PrimitiveValueReader(name, defaultValue, false)
-}
-
-open class PrimitiveValueReader(private val className: String, val defaultValue: String?, private val asRawString: Boolean) : ValueReader() {
+open class PrimitiveValueReader(private val className: String, val defaultValue: String? = null, private val asRawString: Boolean = false, private val nullable: Boolean = false) : ValueReader() {
   private val readPostfix: String
 
-  {
+  init {
     if (Character.isLowerCase(className.charAt(0))) {
       readPostfix = Character.toUpperCase(className.charAt(0)) + className.substring(1)
     }
@@ -29,7 +20,11 @@ open class PrimitiveValueReader(private val className: String, val defaultValue:
     }
     else {
       addReaderParameter(subtyping, out)
-      out.append(".next").append(readPostfix).append("()")
+      out.append(".next");
+      if (nullable) {
+        out.append("Nullable");
+      }
+      out.append(readPostfix).append("()")
       //beginReadCall(readPostfix, subtyping, out, name);
     }
   }
diff --git a/platform/script-debugger/protocol/protocol-reader/src/ReaderGenerator.kt b/platform/script-debugger/protocol/protocol-reader/src/ReaderGenerator.kt
index ca030a5270e1..83fffd1b5112 100644
--- a/platform/script-debugger/protocol/protocol-reader/src/ReaderGenerator.kt
+++ b/platform/script-debugger/protocol/protocol-reader/src/ReaderGenerator.kt
@@ -1,13 +1,12 @@
 package org.jetbrains.protocolReader
 
 import gnu.trove.THashMap
-
 import java.io.File
 import java.nio.file.FileSystems
-import java.util.*
+import java.util.HashMap
+import java.util.LinkedHashMap
 
 public class ReaderGenerator {
-
   public class GenerateConfiguration<ROOT>(val packageName: String, val className: String, readerRootClass: Class<ROOT>, protocolInterfaces: Array<Class<*>>, basePackagesMap: Map<Class<*>, String>? = null) {
     val basePackagesMap: Collection<Map<Class<*>, String>>
 
diff --git a/platform/script-debugger/protocol/schema-reader-generator/schema-reader-generator.iml b/platform/script-debugger/protocol/schema-reader-generator/schema-reader-generator.iml
index 7c859fb93668..a2a9f7558e93 100644
--- a/platform/script-debugger/protocol/schema-reader-generator/schema-reader-generator.iml
+++ b/platform/script-debugger/protocol/schema-reader-generator/schema-reader-generator.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -9,6 +9,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="protocol-reader" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="module" module-name="platform-impl" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.java b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.java
deleted file mode 100644
index d6f5afcfbe27..000000000000
--- a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.jetbrains.jsonProtocol;
-
-import java.util.List;
-
-public interface ItemDescriptor {
-  String description();
-
-  String type();
-
-  List<String> getEnum();
-
-  ProtocolMetaModel.ArrayItemType items();
-
-  interface Named extends Referenceable {
-    String name();
-
-    @JsonOptionalField
-    String shortName();
-
-    boolean optional();
-  }
-
-  interface Referenceable extends ItemDescriptor {
-    String ref();
-  }
-
-  interface Type extends ItemDescriptor {
-    List<ProtocolMetaModel.ObjectProperty> properties();
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.kt b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.kt
new file mode 100644
index 000000000000..c32c392a0b77
--- /dev/null
+++ b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ItemDescriptor.kt
@@ -0,0 +1,28 @@
+package org.jetbrains.jsonProtocol
+
+public trait ItemDescriptor {
+  public fun description(): String?
+
+  public fun type(): String
+
+  public fun getEnum(): List<String>?
+
+  public fun items(): ProtocolMetaModel.ArrayItemType
+
+  public trait Named : Referenceable {
+    public fun name(): String
+
+    JsonOptionalField
+    public fun shortName(): String?
+
+    public fun optional(): Boolean
+  }
+
+  public trait Referenceable : ItemDescriptor {
+    public fun ref(): String
+  }
+
+  public trait Type : ItemDescriptor {
+    public fun properties(): List<ProtocolMetaModel.ObjectProperty>?
+  }
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.java b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.java
deleted file mode 100644
index a4aeeec15d37..000000000000
--- a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.jetbrains.jsonProtocol;
-
-import java.util.List;
-
-/**
- * Defines schema of WIP metamodel defined in http://svn.webkit.org/repository/webkit/trunk/Source/WebCore/inspector/Inspector.json
- */
-public interface ProtocolMetaModel {
-  @JsonType
-  interface Root {
-    @JsonOptionalField
-    Version version();
-
-    List<Domain> domains();
-  }
-
-  @JsonType
-  interface Version {
-    String major();
-    String minor();
-  }
-
-  @JsonType
-  interface Domain {
-    String domain();
-
-    @JsonOptionalField
-    List<StandaloneType> types();
-
-    List<Command> commands();
-
-    @JsonOptionalField
-    List<Event> events();
-
-    @JsonOptionalField
-    String description();
-
-    @JsonOptionalField
-    boolean hidden();
-  }
-
-  @JsonType
-  interface Command {
-    String name();
-
-    @JsonOptionalField
-    List<Parameter> parameters();
-
-    @JsonOptionalField
-    List<Parameter> returns();
-
-    @JsonOptionalField
-    String description();
-
-    @JsonOptionalField
-    boolean hidden();
-
-    @JsonOptionalField
-    boolean async();
-  }
-
-  @JsonType
-  interface Parameter extends ItemDescriptor.Named {
-    @Override
-    String name();
-
-    @Override
-    @JsonOptionalField
-    String shortName();
-
-    @Override
-    @JsonOptionalField
-    String type();
-
-    @Override
-    @JsonOptionalField
-    ArrayItemType items();
-
-    @Override
-    @JsonField(jsonLiteralName = "enum")
-    @JsonOptionalField
-    List<String> getEnum();
-
-    @Override
-    @JsonOptionalField
-    @JsonField(jsonLiteralName = "$ref")
-    String ref();
-
-    @Override
-    @JsonOptionalField
-    boolean optional();
-
-    @Override
-    @JsonOptionalField
-    String description();
-
-    @JsonOptionalField
-    boolean hidden();
-  }
-
-  @JsonType
-  interface Event {
-    String name();
-
-    @JsonOptionalField
-    List<Parameter> parameters();
-
-    @JsonOptionalField
-    String description();
-
-    @JsonOptionalField
-    boolean hidden();
-  }
-
-  @JsonType
-  interface StandaloneType extends ItemDescriptor.Type {
-    String id();
-
-    @Override
-    @JsonOptionalField
-    String description();
-
-    @Override
-    String type();
-
-    @JsonOptionalField
-    boolean hidden();
-
-    @Override
-    @JsonOptionalField
-    List<ObjectProperty> properties();
-
-    @Override
-    @JsonField(jsonLiteralName = "enum")
-    @JsonOptionalField
-    List<String> getEnum();
-
-    @Override
-    @JsonOptionalField
-    ArrayItemType items();
-  }
-
-
-  @JsonType
-  interface ArrayItemType extends ItemDescriptor.Type, ItemDescriptor.Referenceable {
-    @Override
-    @JsonOptionalField
-    String description();
-
-    @JsonOptionalField
-    boolean optional();
-
-    @Override
-    @JsonOptionalField
-    String type();
-
-    @Override
-    @JsonOptionalField
-    ArrayItemType items();
-
-    @Override
-    @JsonField(jsonLiteralName = "$ref")
-    @JsonOptionalField
-    String ref();
-
-    @Override
-    @JsonField(jsonLiteralName = "enum")
-    @JsonOptionalField
-    List<String> getEnum();
-
-    @Override
-    @JsonOptionalField
-    List<ObjectProperty> properties();
-  }
-
-  @JsonType
-  interface ObjectProperty extends ItemDescriptor.Named {
-    @Override
-    String name();
-
-    @Override
-    @JsonOptionalField
-    String shortName();
-
-    @Override
-    @JsonOptionalField
-    String description();
-
-    @Override
-    @JsonOptionalField
-    boolean optional();
-
-    @Override
-    @JsonOptionalField
-    String type();
-
-    @Override
-    @JsonOptionalField
-    ArrayItemType items();
-
-    @Override
-    @JsonField(jsonLiteralName = "$ref")
-    @JsonOptionalField
-    String ref();
-
-    @Override
-    @JsonField(jsonLiteralName = "enum")
-    @JsonOptionalField
-    List<String> getEnum();
-
-    @JsonOptionalField
-    boolean hidden();
-  }
-
-  String STRING_TYPE = "string";
-  String INTEGER_TYPE = "integer";
-  String NUMBER_TYPE = "number";
-  String BOOLEAN_TYPE = "boolean";
-  String OBJECT_TYPE = "object";
-  String ARRAY_TYPE = "array";
-  String UNKNOWN_TYPE = "unknown";
-  String ANY_TYPE = "any";
-}
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.kt b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.kt
new file mode 100644
index 000000000000..6377affbf41c
--- /dev/null
+++ b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolMetaModel.kt
@@ -0,0 +1,196 @@
+package org.jetbrains.jsonProtocol
+
+/**
+ * Defines schema of WIP metamodel defined in http://svn.webkit.org/repository/webkit/trunk/Source/WebCore/inspector/Inspector.json
+ */
+public trait ProtocolMetaModel {
+  JsonType
+  public trait Root {
+    JsonOptionalField
+    public fun version(): Version
+
+    public fun domains(): List<Domain>
+  }
+
+  JsonType
+  public trait Version {
+    public fun major(): String
+    public fun minor(): String
+  }
+
+  JsonType
+  public trait Domain {
+    public fun domain(): String
+
+    JsonOptionalField
+    public fun types(): List<StandaloneType>?
+
+    public fun commands(): List<Command>
+
+    JsonOptionalField
+    public fun events(): List<Event>?
+
+    JsonOptionalField
+    public fun description(): String
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+  }
+
+  JsonType
+  public trait Command {
+    public fun name(): String
+
+    JsonOptionalField
+    public fun parameters(): List<Parameter>?
+
+    JsonOptionalField
+    public fun returns(): List<Parameter>?
+
+    JsonOptionalField
+    public fun description(): String
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+
+    JsonOptionalField
+    public fun async(): Boolean
+  }
+
+  JsonType
+  public trait Parameter : ItemDescriptor.Named {
+    override fun name(): String
+
+    JsonOptionalField
+    override fun shortName(): String
+
+    JsonOptionalField
+    override fun type(): String
+
+    JsonOptionalField
+    override fun items(): ArrayItemType
+
+    JsonField(name = "enum")
+    JsonOptionalField
+    override fun getEnum(): List<String>
+
+    JsonOptionalField
+    JsonField(name = "\$ref")
+    override fun ref(): String
+
+    JsonOptionalField
+    override fun optional(): Boolean
+
+    JsonOptionalField
+    override fun description(): String
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+  }
+
+  JsonType
+  public trait Event {
+    public fun name(): String
+
+    JsonOptionalField
+    public fun parameters(): List<Parameter>
+
+    JsonOptionalField
+    public fun description(): String
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+  }
+
+  JsonType
+  public trait StandaloneType : ItemDescriptor.Type {
+    public fun id(): String
+
+    JsonOptionalField
+    override fun description(): String?
+
+    override fun type(): String
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+
+    JsonOptionalField
+    override fun properties(): List<ObjectProperty>
+
+    JsonField(name = "enum")
+    JsonOptionalField
+    override fun getEnum(): List<String>
+
+    JsonOptionalField
+    override fun items(): ArrayItemType
+  }
+
+
+  JsonType
+  public trait ArrayItemType : ItemDescriptor.Type, ItemDescriptor.Referenceable {
+    JsonOptionalField
+    override fun description(): String
+
+    JsonOptionalField
+    public fun optional(): Boolean
+
+    JsonOptionalField
+    override fun type(): String
+
+    JsonOptionalField
+    override fun items(): ArrayItemType
+
+    JsonField(name = "\$ref")
+    JsonOptionalField
+    override fun ref(): String
+
+    JsonField(name = "enum")
+    JsonOptionalField
+    override fun getEnum(): List<String>
+
+    JsonOptionalField
+    override fun properties(): List<ObjectProperty>
+  }
+
+  JsonType
+  public trait ObjectProperty : ItemDescriptor.Named {
+    override fun name(): String
+
+    JsonOptionalField
+    override fun shortName(): String
+
+    JsonOptionalField
+    override fun description(): String
+
+    JsonOptionalField
+    override fun optional(): Boolean
+
+    JsonOptionalField
+    override fun type(): String
+
+    JsonOptionalField
+    override fun items(): ArrayItemType
+
+    JsonField(name = "\$ref")
+    JsonOptionalField
+    override fun ref(): String
+
+    JsonField(name = "enum")
+    JsonOptionalField
+    override fun getEnum(): List<String>
+
+    JsonOptionalField
+    public fun hidden(): Boolean
+  }
+
+  default object {
+    public val STRING_TYPE: String = "string"
+    public val INTEGER_TYPE: String = "integer"
+    public val NUMBER_TYPE: String = "number"
+    public val BOOLEAN_TYPE: String = "boolean"
+    public val OBJECT_TYPE: String = "object"
+    public val ARRAY_TYPE: String = "array"
+    public val UNKNOWN_TYPE: String = "unknown"
+    public val ANY_TYPE: String = "any"
+  }
+}
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.java b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.java
deleted file mode 100644
index aafe735409fd..000000000000
--- a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.jetbrains.jsonProtocol;
-
-import org.jetbrains.io.JsonReaderEx;
-import org.jetbrains.jsonProtocol.ProtocolMetaModel.Root;
-
-import java.io.IOException;
-
-public interface ProtocolSchemaReader {
-  @JsonParseMethod
-  Root parseRoot(JsonReaderEx reader) throws IOException;
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.kt b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.kt
new file mode 100644
index 000000000000..53c6685e1890
--- /dev/null
+++ b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/ProtocolSchemaReader.kt
@@ -0,0 +1,12 @@
+package org.jetbrains.jsonProtocol
+
+import org.jetbrains.io.JsonReaderEx
+import org.jetbrains.jsonProtocol.ProtocolMetaModel.Root
+
+import java.io.IOException
+
+public trait ProtocolSchemaReader {
+  JsonParseMethod
+  throws(javaClass<IOException>())
+  public fun parseRoot(reader: JsonReaderEx): Root
+}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.java b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.java
deleted file mode 100644
index 1220ffa0cd91..000000000000
--- a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.jetbrains.jsonProtocol;
-
-import org.jetbrains.protocolReader.ReaderGenerator;
-
-import java.io.IOException;
-
-public class SchemaReaderGenerator {
-  public static void main(String[] args) throws IOException {
-    ReaderGenerator.generate(args, new ReaderGenerator.GenerateConfiguration<>("org.jetbrains.jsonProtocol", "ProtocolSchemaReaderImpl", ProtocolSchemaReader.class, ProtocolMetaModel.class.getDeclaredClasses()));
-  }
-}
\ No newline at end of file
diff --git a/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.kt b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.kt
new file mode 100644
index 000000000000..89d1db391f97
--- /dev/null
+++ b/platform/script-debugger/protocol/schema-reader-generator/src/org/jetbrains/jsonProtocol/SchemaReaderGenerator.kt
@@ -0,0 +1,5 @@
+package org.jetbrains.jsonProtocol
+
+import org.jetbrains.protocolReader.ReaderGenerator
+
+fun main(args: Array<String>) = ReaderGenerator.generate(args, ReaderGenerator.GenerateConfiguration("org.jetbrains.jsonProtocol", "ProtocolSchemaReaderImpl", javaClass<ProtocolSchemaReader>(), javaClass<ProtocolMetaModel>().getDeclaredClasses()))
\ No newline at end of file

From edce92ca9084d980a978c54de50088a23dc96c79 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Fri, 13 Mar 2015 15:42:48 +0300
Subject: [PATCH 09/27] maven: comment added for default target level applying

---
 .../maven/importing/configurers/MavenCompilerConfigurer.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
index 28658f06f5b1..e65e6f01d985 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenCompilerConfigurer.java
@@ -36,6 +36,7 @@ public class MavenCompilerConfigurer extends MavenModuleConfigurer {
     if (module == null) return;
 
     String targetLevel = mavenProject.getTargetLevel();
+    // default source and target settings of maven-compiler-plugin is 1.5, see details at http://maven.apache.org/plugins/maven-compiler-plugin
     if (targetLevel == null) {
       targetLevel = "1.5";
     }

From c4c3f9f8a3993c591090a75b434bf5847041b241 Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Fri, 13 Mar 2015 16:02:32 +0300
Subject: [PATCH 10/27] Fix exception breakpoints in Python3 broken by ignore
 libraries parameter (PY-6396)

---
 python/helpers/pydev/pydevd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py
index c5e513d768c3..1a11d70f5968 100644
--- a/python/helpers/pydev/pydevd.py
+++ b/python/helpers/pydev/pydevd.py
@@ -1132,7 +1132,7 @@ class PyDB:
                     else:
                         exception, notify_always, notify_on_terminate, ignore_libraries = text, 0, 0, 0
 
-                    if ignore_libraries > 0 and self.project_roots is None:
+                    if int(ignore_libraries) > 0 and self.project_roots is None:
                         self.project_roots = os.getenv('PYCHARM_PROJECT_ROOTS', '').split(os.pathsep)
 
                     if exception.find('-') != -1:

From 3b43e3b51e76e5c0afb88ea81340c00c2a9c8c17 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 13 Mar 2015 16:05:31 +0300
Subject: [PATCH 11/27] reuse code to remove duplication

---
 .../options/newEditor/SettingsTreeView.java   | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java
index c55b3591a5fe..e52de9913aa7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.options.ex.SortedConfigurableGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.*;
 import com.intellij.ui.components.GradientViewport;
 import com.intellij.ui.treeStructure.CachingSimpleNode;
@@ -34,8 +33,6 @@ import com.intellij.ui.treeStructure.SimpleTreeStructure;
 import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder;
 import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.NullableFunction;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ButtonlessScrollBarUI;
 import com.intellij.util.ui.GraphicsUtil;
 import com.intellij.util.ui.TextTransferable;
@@ -115,24 +112,13 @@ final class SettingsTreeView extends JComponent implements Disposable, OptionsEd
       @Nullable
       @Override
       protected Transferable createTransferable(JComponent c) {
-        final TreePath path = myTree.getPathForRow(myTree.getLeadSelectionRow());
-        if (path != null) {
-          final String pathInTheTree = StringUtil.join(ContainerUtil.mapNotNull(path.getPath(), new NullableFunction<Object, String>() {
-            @Nullable
-            @Override
-            public String fun(Object o) {
-              if (o == path.getPath()[0]) {
-                return null;
-              }
-              else {
-                final MyNode node = extractNode(o);
-                return node != null ? node.myDisplayName : null;
-              }
-            }
-          }), " | ");
-          if (!StringUtil.isEmpty(pathInTheTree)) {
-            return new TextTransferable("File | Settings | " + pathInTheTree);
+        MyNode node = extractNode(myTree.getPathForRow(myTree.getLeadSelectionRow()));
+        if (node != null) {
+          StringBuilder sb = new StringBuilder("File | Settings");
+          for (String name : getPathNames(node)) {
+            sb.append(" | ").append(name);
           }
+          return new TextTransferable(sb.toString());
         }
         return null;
       }
@@ -206,8 +192,11 @@ final class SettingsTreeView extends JComponent implements Disposable, OptionsEd
 
   @NotNull
   String[] getPathNames(Configurable configurable) {
+    return getPathNames(findNode(configurable));
+  }
+
+  private static String[] getPathNames(MyNode node) {
     ArrayDeque<String> path = new ArrayDeque<String>();
-    MyNode node = findNode(configurable);
     while (node != null) {
       path.push(node.myDisplayName);
       SimpleNode parent = node.getParent();

From 18340ee503c8140212466b762c24462dccfae978 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 12 Mar 2015 19:35:32 +0100
Subject: [PATCH 12/27] junit: do not initialize new runner if it's simple
 Parameterized (IDEA-137563)

---
 .../junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
index 1bab2d69e1c5..ebf147ef64dc 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
@@ -333,7 +333,7 @@ public class JUnit4TestRunnerUtil {
       super(clazz);
       myName = name;
       myMethodName = methodName;
-      myRunnerClass = (Parameterized)runnerClass.getConstructor(new Class[] {Class.class}).newInstance(new Object[]{clazz});
+      myRunnerClass = runnerClass.equals(Parameterized.class) ? this : (Parameterized)runnerClass.getConstructor(new Class[] {Class.class}).newInstance(new Object[]{clazz});
     }
 
     protected List getChildren() {

From 3ae288688d31ba0b762efd809a7cff7e80d6d7bc Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 12 Mar 2015 19:58:19 +0100
Subject: [PATCH 13/27] junit: do not initialize new runner twice (IDEA-137563)

---
 .../src/com/intellij/junit4/JUnit4TestRunnerUtil.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
index ebf147ef64dc..37f13312fc6c 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
@@ -28,6 +28,7 @@ import org.junit.runner.manipulation.Filter;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.Parameterized;
+import org.junit.runners.Suite;
 import org.junit.runners.model.FrameworkMethod;
 
 import java.io.BufferedReader;
@@ -324,16 +325,17 @@ public class JUnit4TestRunnerUtil {
     }
   }
 
-  private static class SelectedParameterizedRunner extends Parameterized {
+  private static class SelectedParameterizedRunner extends Suite {
+    public static final List NO_RUNNERS = new ArrayList();
     private final String myName;
     private final String myMethodName;
     private Parameterized myRunnerClass;
 
     public SelectedParameterizedRunner(Class clazz, String name, String methodName, Class runnerClass) throws Throwable {
-      super(clazz);
+      super(clazz, NO_RUNNERS);
       myName = name;
       myMethodName = methodName;
-      myRunnerClass = runnerClass.equals(Parameterized.class) ? this : (Parameterized)runnerClass.getConstructor(new Class[] {Class.class}).newInstance(new Object[]{clazz});
+      myRunnerClass = (Parameterized)runnerClass.getConstructor(new Class[] {Class.class}).newInstance(new Object[]{clazz});
     }
 
     protected List getChildren() {

From 1bf1a2cc1364f107312033673f11cca63fb5240b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 13 Mar 2015 13:32:13 +0100
Subject: [PATCH 14/27] do not report weaker access assignability higher in the
 hierarchy (IDEA-137533)

---
 .../daemon/impl/analysis/HighlightMethodUtil.java |  1 +
 ...eportWeakerVisibilityProblemUpInHierarchy.java | 15 +++++++++++++++
 .../daemon/GenericsHighlightingTest.java          |  4 ++++
 3 files changed, 20 insertions(+)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/DontReportWeakerVisibilityProblemUpInHierarchy.java

diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
index deacd9209c0f..f3f35619dffa 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
@@ -88,6 +88,7 @@ public class HighlightMethodUtil {
       PsiMethod superMethod = superMethodSignature.getMethod();
       if (method.hasModifierProperty(PsiModifier.ABSTRACT) && !MethodSignatureUtil.isSuperMethod(superMethod, method)) continue;
       if (!PsiUtil.isAccessible(containingFile.getProject(), superMethod, method, null)) continue;
+      if (!includeRealPositionInfo && MethodSignatureUtil.isSuperMethod(superMethod, method)) continue;
       HighlightInfo info = isWeaker(method, modifierList, accessModifier, accessLevel, superMethod, includeRealPositionInfo);
       if (info != null) return info;
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/DontReportWeakerVisibilityProblemUpInHierarchy.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/DontReportWeakerVisibilityProblemUpInHierarchy.java
new file mode 100644
index 000000000000..2f17edfb3e93
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/DontReportWeakerVisibilityProblemUpInHierarchy.java
@@ -0,0 +1,15 @@
+
+class F {
+  public void f() {}
+}
+
+class E extends F {
+  @Override
+  <error descr="'f()' in 'E' clashes with 'f()' in 'F'; attempting to assign weaker access privileges ('protected'); was 'public'">protected</error> void f() {
+    super.f();
+  }
+}
+
+class EE extends E {
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
index b1dff9c63cbb..718518b93ec4 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
@@ -467,6 +467,10 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
   }
 
+  public void testDontReportWeakerVisibilityProblemUpInHierarchy() throws Exception {
+    doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
+  }
+
   public void testJavaUtilCollections_NoVerify() throws Exception {
     PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));
     assertNotNull(collectionsClass);

From 97ddcc16e855a6919e04f38a8683ba97e16fec65 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 13 Mar 2015 13:44:34 +0100
Subject: [PATCH 15/27] do not reuse outdated information inside cache
 recalculation (IDEA-137565)

---
 .../jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index 3bfc162ac74d..4a68f0933293 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -527,15 +527,15 @@ public class JavaFxPsiUtil {
     return false;
   }
 
-  public static PsiType getWrappedPropertyType(PsiField field, final Project project, final Map<String, PsiType> typeMap) {
-    final PsiType fieldType = field.getType();
-    final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(fieldType);
-    final PsiClass fieldClass = resolveResult.getElement();
-    if (fieldClass == null) return fieldType;
-    return CachedValuesManager.getManager(project).getCachedValue(field, new CachedValueProvider<PsiType>() {
+  public static PsiType getWrappedPropertyType(final PsiField field, final Project project, final Map<String, PsiType> typeMap) {
+    return CachedValuesManager.getCachedValue(field, new CachedValueProvider<PsiType>() {
       @Nullable
       @Override
       public Result<PsiType> compute() {
+        final PsiType fieldType = field.getType();
+        final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(fieldType);
+        final PsiClass fieldClass = resolveResult.getElement();
+        if (fieldClass == null) return Result.create(fieldType, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
         PsiType substitute = null;
         for (String typeName : typeMap.keySet()) {
           if (InheritanceUtil.isInheritor(fieldType, typeName)) {

From f00b9e6c090fdef4c5cf6d16545685095e09af30 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 13 Mar 2015 16:35:40 +0300
Subject: [PATCH 16/27] runProcessWithProgressSynchronouslyInReadAction

---
 .../com/intellij/mock/MockApplicationEx.java  | 12 ++-
 .../openapi/application/ex/ApplicationEx.java | 19 ++++-
 .../application/impl/ApplicationImpl.java     | 74 ++++++++++++++++++-
 .../openapi/progress/util/ProgressWindow.java |  7 +-
 .../application/ApplicationImplTest.java      | 39 ++++++++++
 5 files changed, 143 insertions(+), 8 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/mock/MockApplicationEx.java b/platform/core-impl/src/com/intellij/mock/MockApplicationEx.java
index 651ac40ddf22..1e7345d2826b 100644
--- a/platform/core-impl/src/com/intellij/mock/MockApplicationEx.java
+++ b/platform/core-impl/src/com/intellij/mock/MockApplicationEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -96,6 +96,16 @@ public class MockApplicationEx extends MockApplication implements ApplicationEx
     return false;
   }
 
+  @Override
+  public boolean runProcessWithProgressSynchronouslyInReadAction(@Nullable Project project,
+                                                                 @NotNull String progressTitle,
+                                                                 boolean canBeCanceled,
+                                                                 String cancelText,
+                                                                 JComponent parentComponent,
+                                                                 @NotNull Runnable process) {
+    return false;
+  }
+
   @NotNull
   @Override
   public <T> T[] getExtensions(@NotNull final ExtensionPointName<T> extensionPointName) {
diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
index 8598b505de52..5442049d0862 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -65,6 +65,21 @@ public interface ApplicationEx extends Application {
   void doNotSave(boolean value);
   boolean isDoNotSave();
 
+  /**
+   * Executes {@code process} in a separate thread in the application thread pool (see {@link #executeOnPooledThread(Runnable)}).
+   * The process is run inside read action (see {@link #runReadAction(Runnable)})
+   * It is guaranteed that no other read or write action is run before the process start running.
+   * If the process is running for too long, a progress window shown with {@code progressTitle} and a button with {@code cancelText}.
+   * This method can be called from the EDT only.
+   * @return true if process run successfully and was not canceled.
+   */
+  boolean runProcessWithProgressSynchronouslyInReadAction(@Nullable Project project,
+                                                          @NotNull String progressTitle,
+                                                          boolean canBeCanceled,
+                                                          String cancelText,
+                                                          JComponent parentComponent,
+                                                          @NotNull Runnable process);
+
   /**
    * @param force if true, no additional confirmations will be shown. The application is guaranteed to exit
    * @param exitConfirmed if true, suppresses any shutdown confirmation. However, if there are any background processes or tasks running,
@@ -112,7 +127,7 @@ public interface ApplicationEx extends Application {
   void runEdtSafeAction(@NotNull Runnable runnable);
 
   /**
-   * Grab the lock and run the action, in a non-blocking fashion
+   * Tries to acquire the read lock and run the {@code action}
    *
    * @return true if action was run while holding the lock, false if was unable to get the lock and action was not run
    */
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
index b8f1e2c0b5f3..fbc4a01ebef2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
@@ -77,10 +77,7 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -644,6 +641,75 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
     return !progress.isCanceled();
   }
 
+
+  @Override
+  public boolean runProcessWithProgressSynchronouslyInReadAction(@Nullable final Project project, @NotNull final String progressTitle,
+                                                                 final boolean canBeCanceled,
+                                                                 final String cancelText, final JComponent parentComponent,
+                                                                 @NotNull final Runnable process) {
+    assertIsDispatchThread();
+    boolean writeAccessAllowed = isInsideWriteActionEDTOnly();
+    if (writeAccessAllowed // Disallow running process in separate thread from under write action.
+                           // The thread will deadlock trying to get read action otherwise.
+      ) {
+      throw new IncorrectOperationException("Starting process with progress from within write action makes no sense");
+    }
+
+    final ProgressWindow progress = new ProgressWindow(canBeCanceled, false, project, parentComponent, cancelText);
+    // in case of abrupt application exit when 'ProgressManager.getInstance().runProcess(process, progress)' below
+    // does not have a chance to run, and as a result the progress won't be disposed
+    Disposer.register(this, progress);
+
+    progress.setTitle(progressTitle);
+
+    final CountDownLatch readActionAcquired = new CountDownLatch(1);
+    final CountDownLatch modalityEntered = new CountDownLatch(1);
+    executeOnPooledThread(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          ApplicationManager.getApplication().runReadAction(new Runnable() {
+            @Override
+            public void run() {
+              readActionAcquired.countDown();
+              waitFor(modalityEntered);
+              ProgressManager.getInstance().runProcess(process, progress);
+            }
+          });
+        }
+        catch (ProcessCanceledException e) {
+          progress.cancel();
+          // ok to ignore.
+        }
+        catch (RuntimeException e) {
+          progress.cancel();
+          throw e;
+        }
+      }
+    });
+
+    waitFor(readActionAcquired);
+    progress.startBlocking(new Runnable() {
+      @Override
+      public void run() {
+        modalityEntered.countDown();
+      }
+    });
+
+    LOG.assertTrue(!progress.isRunning());
+
+    return !progress.isCanceled();
+  }
+
+  private static void waitFor(@NotNull CountDownLatch modalityEntered) {
+    try {
+      modalityEntered.await();
+    }
+    catch (InterruptedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   @Override
   public void invokeAndWait(@NotNull Runnable runnable, @NotNull ModalityState modalityState) {
     Status status = getStatus();
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index 510c05d06963..4cdbb8b60242 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -103,7 +103,7 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
     Disposer.register(this, myDialog);
 
     myFocusTrackback.registerFocusComponent(myDialog.getPanel());
-    addStateDelegate(new AbstractProgressIndicatorExBase(){
+    addStateDelegate(new AbstractProgressIndicatorExBase() {
       @Override
       public void cancel() {
         super.cancel();
@@ -186,6 +186,10 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
 
   @Override
   public void startBlocking() {
+    startBlocking(EmptyRunnable.getInstance());
+  }
+
+  public void startBlocking(@NotNull Runnable init) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     synchronized (this) {
       LOG.assertTrue(!isRunning());
@@ -193,6 +197,7 @@ public class ProgressWindow extends ProgressIndicatorBase implements BlockingPro
     }
 
     enterModality();
+    init.run();
 
     IdeEventQueue.getInstance().pumpEventsForHierarchy(myDialog.myPanel, new Condition<AWTEvent>() {
       @Override
diff --git a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
index 64d7f489a98f..67d0199b1f11 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
@@ -18,6 +18,7 @@ package com.intellij.application;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ex.ApplicationEx;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -29,6 +30,7 @@ import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.testFramework.Timings;
 import com.intellij.util.ThrowableRunnable;
 import com.intellij.util.TimeoutUtil;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -320,4 +322,41 @@ public class ApplicationImplTest extends PlatformTestCase {
     thread.join();
     assertNotNull(exception);
   }
+
+  public void testRunProcessWithProgressSynchronouslyInReadAction() throws Throwable {
+    boolean result = ((ApplicationEx)ApplicationManager.getApplication())
+      .runProcessWithProgressSynchronouslyInReadAction(getProject(), "title", true, "cancel", null, new Runnable() {
+        @Override
+        public void run() {
+          try {
+            assertFalse(SwingUtilities.isEventDispatchThread());
+            assertTrue(ApplicationManager.getApplication().isReadAccessAllowed());
+          }
+          catch (Throwable e) {
+            exception = e;
+          }
+        }
+      });
+    assertTrue(result);
+    if (exception != null) throw exception;
+  }
+
+  public void testRunProcessWithProgressSynchronouslyInReadActionWithPendingWriteAction() throws Throwable {
+    SwingUtilities.invokeLater(new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(EmptyRunnable.getInstance());
+      }
+    });
+    boolean result = ((ApplicationEx)ApplicationManager.getApplication())
+      .runProcessWithProgressSynchronouslyInReadAction(getProject(), "title", true, "cancel", null, new Runnable() {
+        @Override
+        public void run() {
+          TimeoutUtil.sleep(10000);
+        }
+      });
+    assertTrue(result);
+    UIUtil.dispatchAllInvocationEvents();
+    if (exception != null) throw exception;
+  }
 }

From 66b84557422f0451ac455b3397846c33ebea8ec7 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Fri, 13 Mar 2015 16:42:06 +0300
Subject: [PATCH 17/27] refactoring win installation: relocated association and
 feedback page information from build scripts into strings.nsi.

---
 build/conf/nsis/idea.nsi      | 2 +-
 build/conf/nsis/strings.nsi   | 2 ++
 build/conf/nsis/stringsCE.nsi | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index c2a38147e157..1a6be5c9c658 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -975,7 +975,7 @@ Function un.ConfirmDeleteSettings
   !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 5" "Text" "$(confirm_delete_settings)"
   StrCmp "${UNINSTALL_WEB_PAGE}" "feedback_web_page" hide_feedback_checkbox done
 hide_feedback_checkbox:
-    ; show feedback web page checkbox through uninstall of products which is need.
+    ; do not show feedback web page checkbox through products uninstall.
     push $R1
     !insertmacro INSTALLOPTIONS_READ $R1 "DeleteSettings.ini" "Settings" "NumFields"
     IntOp $R1 $R1 - 1
diff --git a/build/conf/nsis/strings.nsi b/build/conf/nsis/strings.nsi
index 9672e05753bf..76db8dd9bf31 100644
--- a/build/conf/nsis/strings.nsi
+++ b/build/conf/nsis/strings.nsi
@@ -6,6 +6,8 @@
 !define PRODUCT_UNINST_ICON_FILE "idea_uninst.ico"
 !define PRODUCT_LOGO_FILE "logo.bmp"
 !define PRODUCT_HEADER_FILE "headerlogo.bmp"
+!define ASSOCIATION ".java"
+!define UNINSTALL_WEB_PAGE "https://www.jetbrains.com/idea/uninstall/?edition=IU-__VERSION_MAJOR__.__VERSION_MINOR__"
 
 ; if SHOULD_SET_DEFAULT_INSTDIR != 0 then default installation directory will be directory where highest-numbered IDEA build has been installed
 ; set to 1 for release build
diff --git a/build/conf/nsis/stringsCE.nsi b/build/conf/nsis/stringsCE.nsi
index 3053ade3094e..3c9247bc1160 100644
--- a/build/conf/nsis/stringsCE.nsi
+++ b/build/conf/nsis/stringsCE.nsi
@@ -6,6 +6,8 @@
 !define PRODUCT_UNINST_ICON_FILE "idea_CEuninst.ico"
 !define PRODUCT_LOGO_FILE "logoCE.bmp"
 !define PRODUCT_HEADER_FILE "headerlogoCE.bmp"
+!define ASSOCIATION ".java"
+!define UNINSTALL_WEB_PAGE "https://www.jetbrains.com/idea/uninstall/?edition=IC-__VERSION_MAJOR__.__VERSION_MINOR__"
 
 ; if SHOULD_SET_DEFAULT_INSTDIR != 0 then default installation directory will be directory where highest-numbered IDEA build has been installed
 ; set to 1 for release build

From 74ce5cb522da0adf2233c3dbb3ccd69f73edd33c Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 12 Mar 2015 19:11:55 +0300
Subject: [PATCH 18/27] github: fix message dialog title capitalisation

---
 .../github/GithubCreatePullRequestWorker.java        | 10 ++++++----
 .../jetbrains/plugins/github/GithubShareAction.java  | 12 ++++++------
 .../plugins/github/tasks/GithubRepositoryEditor.java |  2 +-
 .../plugins/github/ui/GithubSettingsPanel.java       |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestWorker.java b/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestWorker.java
index 8a818cac09b7..b65e7f204ef1 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestWorker.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestWorker.java
@@ -503,13 +503,15 @@ public class GithubCreatePullRequestWorker {
     String targetBranchName = "'" + fork.getRemoteName() + "/" + branch.getRemoteName() + "'";
     if (info.getInfo().getBranchToHeadCommits(myGitRepository).isEmpty()) {
       return GithubNotifications
-        .showYesNoDialog(myProject, "Do you want to proceed anyway?",
-                         "Empty pull request: the branch " + localBranchName + " is fully merged to the branch " + targetBranchName);
+        .showYesNoDialog(myProject, "Empty Pull Request",
+                         "The branch " + localBranchName + " is fully merged to the branch " + targetBranchName + '\n' +
+                         "Do you want to proceed anyway?");
     }
     if (!info.getInfo().getHeadToBranchCommits(myGitRepository).isEmpty()) {
       return GithubNotifications
-        .showYesNoDialog(myProject, "Do you want to proceed anyway?",
-                         "The branch " + targetBranchName + " is not fully merged to the branch " + localBranchName);
+        .showYesNoDialog(myProject, "Target Branch Is Not Fully Merged",
+                         "The branch " + targetBranchName + " is not fully merged to the branch " + localBranchName + '\n' +
+                         "Do you want to proceed anyway?");
     }
 
     return true;
diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index 537a580775c8..5a369c01ca41 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -210,7 +210,7 @@ public class GithubShareAction extends DumbAwareAction {
     final GithubFullPath path = GithubUrlUtil.getUserAndRepositoryFromRemoteUrl(remote);
     if (path == null) {
       return GithubNotifications.showYesNoDialog(project,
-                                                 "Project is already on GitHub",
+                                                 "Project Is Already on GitHub",
                                                  "Can't connect to repository from configured remote. You could want to check .git config.\n" +
                                                  "Do you want to proceed anyway?");
     }
@@ -231,22 +231,22 @@ public class GithubShareAction extends DumbAwareAction {
               });
           }
         });
-      GithubNotifications.showInfoURL(project, "Project is already on GitHub", "GitHub", repo.getHtmlUrl());
+      GithubNotifications.showInfoURL(project, "Project Is Already on GitHub", "GitHub", repo.getHtmlUrl());
       return false;
     }
     catch (GithubStatusCodeException e) {
       if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
         return GithubNotifications.showYesNoDialog(project,
-                                                   "Project is already on GitHub",
+                                                   "Project Is Already on GitHub",
                                                    "Can't connect to repository from configured remote. You could want to check .git config.\n" +
                                                    "Do you want to proceed anyway?");
       }
 
-      GithubNotifications.showErrorDialog(project, "Failed to connect to GitHub", e);
+      GithubNotifications.showErrorDialog(project, "Failed to Connect to GitHub", e);
       return false;
     }
     catch (IOException e) {
-      GithubNotifications.showErrorDialog(project, "Failed to connect to GitHub", e);
+      GithubNotifications.showErrorDialog(project, "Failed to Connect to GitHub", e);
       return false;
     }
   }
@@ -278,7 +278,7 @@ public class GithubShareAction extends DumbAwareAction {
         });
     }
     catch (IOException e) {
-      GithubNotifications.showErrorDialog(project, "Failed to connect to GitHub", e);
+      GithubNotifications.showErrorDialog(project, "Failed to Connect to GitHub", e);
       return null;
     }
   }
diff --git a/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java
index e3e8daabb56a..d826763e1667 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java
@@ -139,7 +139,7 @@ public class GithubRepositoryEditor extends BaseRepositoryEditor<GithubRepositor
       );
     }
     catch (IOException e) {
-      GithubNotifications.showErrorDialog(myProject, "Can't get access token", e);
+      GithubNotifications.showErrorDialog(myProject, "Can't Get Access Token", e);
     }
   }
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
index f9d32e171af4..66cd69ef615f 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
@@ -145,7 +145,7 @@ public class GithubSettingsPanel {
           );
         }
         catch (IOException ex) {
-          GithubNotifications.showErrorDialog(myPane, "Can't create API token", ex);
+          GithubNotifications.showErrorDialog(myPane, "Can't Create API Token", ex);
         }
       }
     });

From 1697c9ab10f3623e73d5b75e22fe37d2d67fdd4b Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 12 Mar 2015 19:08:04 +0300
Subject: [PATCH 19/27] IDEA-124356 github: allow to share project even with
 valid configured remote

---
 .../jetbrains/plugins/github/GithubShareAction.java  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index 5a369c01ca41..e3d077d94416 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.plugins.github;
 
+import com.intellij.ide.BrowserUtil;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
@@ -23,6 +24,7 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Ref;
@@ -231,7 +233,15 @@ public class GithubShareAction extends DumbAwareAction {
               });
           }
         });
-      GithubNotifications.showInfoURL(project, "Project Is Already on GitHub", "GitHub", repo.getHtmlUrl());
+      int result = Messages.showDialog(project,
+                                       "Successfully connected to " + repo.getHtmlUrl() + ".\n" +
+                                       "Do you want to proceed anyway?",
+                                       "Project Is Already on GitHub",
+                                       new String[]{"Continue", "Open in Browser", Messages.CANCEL_BUTTON}, 2, Messages.getQuestionIcon());
+      if (result == 0) return true;
+      if (result == 1) {
+        BrowserUtil.browse(repo.getHtmlUrl());
+      }
       return false;
     }
     catch (GithubStatusCodeException e) {

From 167e9a4d2b0b47c67e405f072a520d0f0486307c Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 12 Mar 2015 20:14:37 +0300
Subject: [PATCH 20/27] IDEA-84865 github: allow to clone/share repos using ssh
 remote

---
 .../extensions/GithubCheckoutProvider.java       |  3 ++-
 .../plugins/github/ui/GithubSettingsPanel.form   | 16 ++++++++++++----
 .../plugins/github/ui/GithubSettingsPanel.java   | 11 ++++++++---
 .../plugins/github/util/GithubSettings.java      |  9 +++++++++
 .../plugins/github/util/GithubUrlUtil.java       |  7 ++++++-
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/extensions/GithubCheckoutProvider.java b/plugins/github/src/org/jetbrains/plugins/github/extensions/GithubCheckoutProvider.java
index 1364e4ad7c66..260a7b36e88b 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/extensions/GithubCheckoutProvider.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/extensions/GithubCheckoutProvider.java
@@ -33,6 +33,7 @@ import org.jetbrains.plugins.github.api.GithubConnection;
 import org.jetbrains.plugins.github.api.GithubRepo;
 import org.jetbrains.plugins.github.util.GithubAuthDataHolder;
 import org.jetbrains.plugins.github.util.GithubNotifications;
+import org.jetbrains.plugins.github.util.GithubUrlUtil;
 import org.jetbrains.plugins.github.util.GithubUtil;
 
 import java.io.File;
@@ -88,7 +89,7 @@ public class GithubCheckoutProvider implements CheckoutProvider {
     // Add predefined repositories to history
     dialog.prependToHistory("-----------------------------------------------");
     for (int i = availableRepos.size() - 1; i >= 0; i--) {
-      dialog.prependToHistory(availableRepos.get(i).getCloneUrl());
+      dialog.prependToHistory(GithubUrlUtil.getCloneUrl(availableRepos.get(i).getFullPath()));
     }
     if (!dialog.showAndGet()) {
       return;
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
index a31ae1af9432..bbb624cbf825 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.plugins.github.ui.GithubSettingsPanel">
-  <grid id="27dc6" binding="myPane" layout-manager="GridLayoutManager" row-count="6" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myPane" layout-manager="GridLayoutManager" row-count="7" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="646" height="400"/>
@@ -28,7 +28,7 @@
       </component>
       <vspacer id="6ace">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="45bab" class="com.intellij.ui.components.JBLabel">
@@ -167,7 +167,7 @@
       <grid id="d384a" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <clientProperties>
@@ -204,7 +204,15 @@
           </component>
         </children>
       </grid>
-      <vspacer id="2a9d8">
+      <component id="e2613" class="com.intellij.ui.components.JBCheckBox" binding="myCloneUsingSshCheckBox" default-binding="true">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="5" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Clone git repositories using ssh"/>
+        </properties>
+      </component>
+      <vspacer id="5f470">
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="5" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
             <minimum-size width="-1" height="15"/>
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
index 66cd69ef615f..7b9d1368c487 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.java
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.HyperlinkAdapter;
+import com.intellij.ui.components.JBCheckBox;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ThrowableConvertor;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +34,6 @@ import org.jetbrains.plugins.github.api.GithubApiUtil;
 import org.jetbrains.plugins.github.api.GithubConnection;
 import org.jetbrains.plugins.github.api.GithubUser;
 import org.jetbrains.plugins.github.exceptions.GithubAuthenticationException;
-import org.jetbrains.plugins.github.exceptions.GithubOperationCanceledException;
 import org.jetbrains.plugins.github.util.*;
 
 import javax.swing.*;
@@ -71,6 +71,7 @@ public class GithubSettingsPanel {
   private JBLabel myAuthTypeLabel;
   private JSpinner myTimeoutSpinner;
   private JButton myCreateTokenButton;
+  private JBCheckBox myCloneUsingSshCheckBox;
 
   private boolean myCredentialsModified;
 
@@ -286,6 +287,7 @@ public class GithubSettingsPanel {
     setPassword(mySettings.isAuthConfigured() ? DEFAULT_PASSWORD_TEXT : "");
     setAuthType(mySettings.getAuthType());
     setConnectionTimeout(mySettings.getConnectionTimeout());
+    myCloneUsingSshCheckBox.setSelected(mySettings.isCloneGitUsingSsh());
     resetCredentialsModification();
   }
 
@@ -294,12 +296,15 @@ public class GithubSettingsPanel {
       mySettings.setAuthData(getAuthData(), true);
     }
     mySettings.setConnectionTimeout(getConnectionTimeout());
+    mySettings.setCloneGitUsingSsh(myCloneUsingSshCheckBox.isSelected());
     resetCredentialsModification();
   }
 
   public boolean isModified() {
-    return myCredentialsModified || !Comparing.equal(mySettings.getHost(), getHost()) ||
-           !Comparing.equal(mySettings.getConnectionTimeout(), getConnectionTimeout());
+    return myCredentialsModified ||
+           !Comparing.equal(mySettings.getHost(), getHost()) ||
+           !Comparing.equal(mySettings.getConnectionTimeout(), getConnectionTimeout()) ||
+           !Comparing.equal(mySettings.isCloneGitUsingSsh(), myCloneUsingSshCheckBox.isSelected());
   }
 
   public void resetCredentialsModification() {
diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
index 7e98d47d8220..e86ffab49e4d 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubSettings.java
@@ -62,6 +62,7 @@ public class GithubSettings implements PersistentStateComponent<GithubSettings.S
     public int CONNECTION_TIMEOUT = 5000;
     public boolean VALID_GIT_AUTH = true;
     public ThreeState CREATE_PULL_REQUEST_CREATE_REMOTE = ThreeState.UNSURE;
+    public boolean CLONE_GIT_USING_SSH = false;
   }
 
   public static GithubSettings getInstance() {
@@ -132,6 +133,10 @@ public class GithubSettings implements PersistentStateComponent<GithubSettings.S
     return passwordSafe.getSettings().getProviderType() == PasswordSafeSettings.ProviderType.MASTER_PASSWORD;
   }
 
+  public boolean isCloneGitUsingSsh() {
+    return myState.CLONE_GIT_USING_SSH;
+  }
+
   @NotNull
   public ThreeState getCreatePullRequestCreateRemote() {
     return myState.CREATE_PULL_REQUEST_CREATE_REMOTE;
@@ -161,6 +166,10 @@ public class GithubSettings implements PersistentStateComponent<GithubSettings.S
     myState.OPEN_IN_BROWSER_GIST = openInBrowserGist;
   }
 
+  public void setCloneGitUsingSsh(boolean value) {
+    myState.CLONE_GIT_USING_SSH = value;
+  }
+
   @NotNull
   private String getPassword() {
     String password;
diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubUrlUtil.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubUrlUtil.java
index 32bd5346e880..1b1bc2e00fc0 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubUrlUtil.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubUrlUtil.java
@@ -209,6 +209,11 @@ public class GithubUrlUtil {
 
   @NotNull
   public static String getCloneUrl(@NotNull String user, @NotNull String repo) {
-    return getGithubHost() + "/" + user + "/" + repo + ".git";
+    if (GithubSettings.getInstance().isCloneGitUsingSsh()) {
+      return "git@" + getGitHostWithoutProtocol() + ":" + user + "/" + repo + ".git";
+    }
+    else {
+      return "https://" + getGitHostWithoutProtocol() + "/" + user + "/" + repo + ".git";
+    }
   }
 }

From 6cab685a5becd7e0b468fb61b6e421dcf507c493 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 12 Mar 2015 20:38:13 +0300
Subject: [PATCH 21/27] github: allow to specify remote while sharing project
 on github

---
 .../plugins/github/GithubShareAction.java     | 22 +++++++++-------
 .../plugins/github/ui/GithubShareDialog.java  | 17 ++++++++++--
 .../plugins/github/ui/GithubSharePanel.form   | 26 +++++++++++++++----
 .../plugins/github/ui/GithubSharePanel.java   | 18 ++++++++++---
 4 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index e3d077d94416..dd19041da102 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -35,6 +35,7 @@ import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ui.SelectFilesDialog;
 import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Function;
 import com.intellij.util.ThrowableConvertor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
@@ -46,6 +47,7 @@ import git4idea.actions.BasicAction;
 import git4idea.actions.GitInit;
 import git4idea.commands.*;
 import git4idea.i18n.GitBundle;
+import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
 import git4idea.util.GitFileUtils;
@@ -64,9 +66,7 @@ import org.jetbrains.plugins.github.util.GithubUtil;
 
 import javax.swing.*;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 import static org.jetbrains.plugins.github.util.GithubUtil.setVisibleEnabled;
 
@@ -121,13 +121,19 @@ public class GithubShareAction extends DumbAwareAction {
     final GithubAuthDataHolder authHolder = GithubAuthDataHolder.createFromSettings();
 
     // check for existing git repo
-    boolean externalRemoteDetected = false;
+    Set<String> existingRemotes = Collections.emptySet();
     if (gitDetected) {
       final String githubRemote = GithubUtil.findGithubRemoteUrl(gitRepository);
       if (githubRemote != null) {
         if (!checkExistingRemote(project, authHolder, githubRemote)) return;
       }
-      externalRemoteDetected = !gitRepository.getRemotes().isEmpty();
+
+      existingRemotes = ContainerUtil.map2Set(gitRepository.getRemotes(), new Function<GitRemote, String>() {
+        @Override
+        public String fun(GitRemote remote) {
+          return remote.getName();
+        }
+      });
     }
 
     // get available GitHub repos with modal progress
@@ -138,7 +144,7 @@ public class GithubShareAction extends DumbAwareAction {
 
     // Show dialog (window)
     final GithubShareDialog shareDialog =
-      new GithubShareDialog(project, githubInfo.getRepositoryNames(), githubInfo.getUser().canCreatePrivateRepo());
+      new GithubShareDialog(project, githubInfo.getRepositoryNames(), existingRemotes, githubInfo.getUser().canCreatePrivateRepo());
     DialogManager.show(shareDialog);
     if (!shareDialog.isOK()) {
       return;
@@ -146,9 +152,8 @@ public class GithubShareAction extends DumbAwareAction {
     final boolean isPrivate = shareDialog.isPrivate();
     final String name = shareDialog.getRepositoryName();
     final String description = shareDialog.getDescription();
+    final String remoteName = shareDialog.getRemoteName();
 
-    // finish the job in background
-    final boolean finalExternalRemoteDetected = externalRemoteDetected;
     new Task.Backgroundable(project, "Sharing project on GitHub...") {
       @Override
       public void run(@NotNull ProgressIndicator indicator) {
@@ -180,7 +185,6 @@ public class GithubShareAction extends DumbAwareAction {
         }
 
         final String remoteUrl = GithubUrlUtil.getCloneUrl(githubInfo.getUser().getLogin(), name);
-        final String remoteName = finalExternalRemoteDetected ? "github" : "origin";
 
         //git remote add origin git@github.com:login/name.git
         LOG.info("Adding GitHub as a remote host");
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java
index 3b464b2828ac..a6a537faf74f 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java
@@ -18,15 +18,18 @@ public class GithubShareDialog extends DialogWrapper {
   private static final Pattern GITHUB_REPO_PATTERN = Pattern.compile("[a-zA-Z0-9_.-]+");
   private final GithubSharePanel myGithubSharePanel;
   private final Set<String> myAvailableNames;
+  private final Set<String> myAvailableRemotes;
 
-  public GithubShareDialog(final Project project, final Set<String> availableNames, final boolean privateRepoAllowed) {
+  public GithubShareDialog(Project project, Set<String> availableNames, Set<String> availableRemotes, boolean privateRepoAllowed) {
     super(project);
     myAvailableNames = availableNames;
+    myAvailableRemotes = availableRemotes;
     myGithubSharePanel = new GithubSharePanel(this);
     init();
     setTitle("Share Project On GitHub");
     setOKButtonText("Share");
     myGithubSharePanel.setRepositoryName(project.getName());
+    myGithubSharePanel.setRemoteName(availableRemotes.isEmpty() ? "origin" : "github");
     myGithubSharePanel.setPrivateRepoAvailable(privateRepoAllowed);
     init();
     updateOkButton();
@@ -53,7 +56,8 @@ public class GithubShareDialog extends DialogWrapper {
   }
 
   public void updateOkButton() {
-    final String repositoryName = getRepositoryName();
+    String repositoryName = getRepositoryName();
+    String remoteName = getRemoteName();
     if (StringUtil.isEmpty(repositoryName)){
       setErrorText("No repository name selected");
       setOKActionEnabled(false);
@@ -64,6 +68,11 @@ public class GithubShareDialog extends DialogWrapper {
       setOKActionEnabled(false);
       return;
     }
+    if (myAvailableRemotes.contains(remoteName)) {
+      setErrorText("Remote with selected name already exists");
+      setOKActionEnabled(false);
+      return;
+    }
     if (!GITHUB_REPO_PATTERN.matcher(repositoryName).matches()){
       setErrorText("Invalid repository name. Name should consist of letters, numbers, dashes, dots and underscores");
       setOKActionEnabled(false);
@@ -85,6 +94,10 @@ public class GithubShareDialog extends DialogWrapper {
     return myGithubSharePanel.getDescription();
   }
 
+  public String getRemoteName() {
+    return myGithubSharePanel.getRemoteName();
+  }
+
   @TestOnly
   public void testSetRepositoryName(@NotNull String name) {
     myGithubSharePanel.setRepositoryName(name);
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.form
index 31fa28e4c1c9..f8493892389d 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.form
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.plugins.github.ui.GithubSharePanel">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="376" height="98"/>
+      <xy x="20" y="20" width="383" height="98"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -26,7 +26,7 @@
       </component>
       <scrollpane id="83208" class="com.intellij.ui.components.JBScrollPane">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="2" column="1" row-span="1" col-span="2" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="250" height="100"/>
           </grid>
         </constraints>
@@ -41,7 +41,7 @@
       </scrollpane>
       <component id="d1ca7" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Description"/>
@@ -57,9 +57,25 @@
       </component>
       <vspacer id="18a1f">
         <constraints>
-          <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
+      <component id="539e4" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Remote name:"/>
+        </properties>
+      </component>
+      <component id="7cb3e" class="javax.swing.JTextField" binding="myRemoteTextField">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.java
index 647a811320b8..18eb66b1292a 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSharePanel.java
@@ -14,17 +14,21 @@ public class GithubSharePanel {
   private JTextField myRepositoryTextField;
   private JCheckBox myPrivateCheckBox;
   private JTextArea myDescriptionTextArea;
+  private JTextField myRemoteTextField;
   private final GithubShareDialog myGithubShareDialog;
 
   public GithubSharePanel(final GithubShareDialog githubShareDialog) {
     myGithubShareDialog = githubShareDialog;
-    myRepositoryTextField.getDocument().addDocumentListener(new DocumentAdapter() {
+    myPrivateCheckBox.setSelected(false);
+
+    DocumentAdapter changeListener = new DocumentAdapter() {
       @Override
       protected void textChanged(DocumentEvent e) {
         myGithubShareDialog.updateOkButton();
       }
-    });
-    myPrivateCheckBox.setSelected(false);
+    };
+    myRepositoryTextField.getDocument().addDocumentListener(changeListener);
+    myRemoteTextField.getDocument().addDocumentListener(changeListener);
   }
 
   public JPanel getPanel() {
@@ -43,6 +47,14 @@ public class GithubSharePanel {
     myRepositoryTextField.setText(name);
   }
 
+  public String getRemoteName() {
+    return myRemoteTextField.getText().trim();
+  }
+
+  public void setRemoteName(final String name) {
+    myRemoteTextField.setText(name);
+  }
+
   public boolean isPrivate() {
     return myPrivateCheckBox.isSelected();
   }

From 52e8a43dc0e023e7be1b5d652aecdc65ae127da9 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Fri, 13 Mar 2015 17:14:55 +0300
Subject: [PATCH 22/27] IDEA-137526 Remote debugging not working - fixed no
 notification in some cases

---
 .../debugger/engine/DebugProcessImpl.java     | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 20f0cb122cad..24224f93c530 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -26,10 +26,7 @@ import com.intellij.debugger.engine.events.SuspendContextCommandImpl;
 import com.intellij.debugger.engine.jdi.ThreadReferenceProxy;
 import com.intellij.debugger.engine.requests.MethodReturnValueWatcher;
 import com.intellij.debugger.engine.requests.RequestManagerImpl;
-import com.intellij.debugger.impl.DebuggerContextImpl;
-import com.intellij.debugger.impl.DebuggerSession;
-import com.intellij.debugger.impl.DebuggerUtilsEx;
-import com.intellij.debugger.impl.PrioritizedTask;
+import com.intellij.debugger.impl.*;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
 import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
 import com.intellij.debugger.jdi.VirtualMachineProxyImpl;
@@ -89,6 +86,7 @@ import javax.swing.*;
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public abstract class DebugProcessImpl extends UserDataHolderBase implements DebugProcess {
@@ -1852,7 +1850,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
     final Semaphore semaphore = new Semaphore();
     semaphore.down();
 
-    final Ref<Boolean> connectorIsReady = Ref.create(false);
+    final AtomicBoolean connectorIsReady = new AtomicBoolean(false);
     myDebugProcessDispatcher.addListener(new DebugProcessAdapter() {
       @Override
       public void connectorIsReady() {
@@ -1890,17 +1888,17 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
               }
               else {
                 fail();
-                if (myExecutionResult != null || !connectorIsReady.get()) {
-                  // propagate exception only in case we succeeded to obtain execution result,
-                  // otherwise if the error is induced by the fact that there is nothing to debug, and there is no need to show
-                  // this problem to the user
-                  SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
+                DebuggerInvocationUtil.swingInvokeLater(myProject, new Runnable() {
+                  @Override
+                  public void run() {
+                    // propagate exception only in case we succeeded to obtain execution result,
+                    // otherwise if the error is induced by the fact that there is nothing to debug, and there is no need to show
+                    // this problem to the user
+                    if (myExecutionResult != null || !connectorIsReady.get()) {
                       ExecutionUtil.handleExecutionError(myProject, ToolWindowId.DEBUG, sessionName, e);
                     }
-                  });
-                }
+                  }
+                });
                 break;
               }
             }

From 532563d434532c6dc7bb97c3b4dae1616b8e8c10 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 13 Mar 2015 17:35:24 +0300
Subject: [PATCH 23/27] EA-66219 - NA: MasterPasswordDialog.askPassword

---
 .../src/git4idea/commands/GitHttpGuiAuthenticator.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
index c5931f98df10..cf6b81c36cd6 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
@@ -15,6 +15,7 @@
  */
 package git4idea.commands;
 
+import com.intellij.ide.passwordSafe.MasterPasswordUnavailableException;
 import com.intellij.ide.passwordSafe.PasswordSafe;
 import com.intellij.ide.passwordSafe.PasswordSafeException;
 import com.intellij.ide.passwordSafe.impl.PasswordSafeImpl;
@@ -169,6 +170,8 @@ class GitHttpGuiAuthenticator implements GitHttpAuthenticator {
           passwordSafe.getMasterKeyProvider().storePassword(myProject, PASS_REQUESTER, myPasswordKey, myPassword);
         }
       }
+      catch (MasterPasswordUnavailableException ignored) {
+      }
       catch (PasswordSafeException e) {
         LOG.error("Couldn't remember password for " + myPasswordKey, e);
       }

From d03fa10c14a7aa4d51447ae031f6ac367ae87029 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 13 Mar 2015 17:35:47 +0300
Subject: [PATCH 24/27] cleanup

---
 .../masterKey/EnterPasswordComponent.java     |  3 +-
 .../providers/masterKey/MasterKeyUtils.java   | 57 -------------------
 .../masterKey/MasterPasswordDialog.java       |  2 +-
 .../masterKey/PasswordComponentBase.java      |  6 ++
 4 files changed, 8 insertions(+), 60 deletions(-)
 delete mode 100644 platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyUtils.java

diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java
index 304b31e3bee1..d5f164c5108a 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/EnterPasswordComponent.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.ide.passwordSafe.impl.providers.masterKey;
 
-import com.intellij.ide.TypePresentationService;
 import com.intellij.ide.passwordSafe.HelpID;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.util.ui.UIUtil;
@@ -28,7 +27,7 @@ public class EnterPasswordComponent extends PasswordComponentBase {
 
   public EnterPasswordComponent(@NotNull MasterKeyPasswordSafe safe, @NotNull Class<?> requestor) {
     super(safe, "Enter");
-    String requestorName = TypePresentationService.getDefaultTypeName(requestor); // requestor.getSimpleName();
+    String requestorName = getRequestorTitle(requestor);
     myPromptLabel.setText("<html><br>Master password is required to unlock the password database.<br>" +
                           "The password database will be unlocked during this session<br>" +
                           "for all subsystems.<br>" +
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyUtils.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyUtils.java
deleted file mode 100644
index bd3203a4bc8f..000000000000
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterKeyUtils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2000-2010 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.ide.passwordSafe.impl.providers.masterKey;
-
-import com.intellij.ui.DocumentAdapter;
-import com.intellij.util.Processor;
-
-import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import java.util.Arrays;
-
-/**
- * Utilities for master key provider
- */
-class MasterKeyUtils {
-  /**
-   * The private constructor for utility class
-   */
-  private MasterKeyUtils() {
-  }
-
-  /**
-   * Match passwords
-   *
-   * @param passwordField1 the first password field
-   * @param passwordField2 the second password field
-   * @param setError       the callback used to set or to clear an error
-   */
-  static void matchPasswords(final JPasswordField passwordField1, final JPasswordField passwordField2, final Processor<String> setError) {
-    DocumentAdapter l = new DocumentAdapter() {
-      @Override
-      protected void textChanged(DocumentEvent e) {
-        if (Arrays.equals(passwordField1.getPassword(), passwordField2.getPassword())) {
-          setError.process(null);
-        }
-        else {
-          setError.process("The new password and confirm passwords do not match.");
-        }
-      }
-    };
-    passwordField1.getDocument().addDocumentListener(l);
-    passwordField2.getDocument().addDocumentListener(l);
-  }
-}
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
index f81d328c7049..f9d16b0bc63c 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java
@@ -63,7 +63,7 @@ public class MasterPasswordDialog extends DialogWrapper {
     }
 
     if (!enterMasterPasswordDialog(project, safe, requestor).showAndGet()) {
-      throw new MasterPasswordUnavailableException("Cancelled by user");
+      throw new MasterPasswordUnavailableException(PasswordComponentBase.getRequestorTitle(requestor) + ": Cancelled by user");
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordComponentBase.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordComponentBase.java
index 2307fa9464f1..453fd0f133ac 100644
--- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordComponentBase.java
+++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/PasswordComponentBase.java
@@ -16,6 +16,7 @@
 package com.intellij.ide.passwordSafe.impl.providers.masterKey;
 
 import com.intellij.icons.AllIcons;
+import com.intellij.ide.TypePresentationService;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
@@ -100,4 +101,9 @@ public abstract class PasswordComponentBase {
     }
     return null;
   }
+
+  @NotNull
+  public static String getRequestorTitle(@NotNull Class<?> requestor) {
+    return TypePresentationService.getDefaultTypeName(requestor);
+  }
 }

From 732a7f6c631964142bcfb98ca04e9841d1891223 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 13 Mar 2015 15:19:28 +0100
Subject: [PATCH 25/27] CreatePropertyFromUsageFix live template: store type
 pointers (EA-66318 - PIEAE: PsiUtilCore.ensureValid)

---
 .../quickfix/CreatePropertyFromUsageFix.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java
index ac2e35b9b776..72b608bfce94 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java
@@ -37,7 +37,9 @@ import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -120,12 +122,17 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement
     private final String myDefaultFieldName;
     private final PsiField myField;
     private final PsiClass myClass;
-    private final PsiType[] myExpectedTypes;
+    private final List<SmartTypePointer> myExpectedTypes;
 
-    public FieldExpression(PsiField field, PsiClass aClass, PsiType[] expectedTypes) {
+    public FieldExpression(final PsiField field, PsiClass aClass, PsiType[] expectedTypes) {
       myField = field;
       myClass = aClass;
-      myExpectedTypes = expectedTypes;
+      myExpectedTypes = ContainerUtil.map(expectedTypes, new Function<PsiType, SmartTypePointer>() {
+        @Override
+        public SmartTypePointer fun(PsiType type) {
+          return SmartTypePointerManager.getInstance(field.getProject()).createSmartTypePointer(type);
+        }
+      });
       myDefaultFieldName = field.getName();
     }
 
@@ -143,12 +150,11 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement
     public LookupElement[] calculateLookupItems(ExpressionContext context) {
       Set<LookupElement> set = new LinkedHashSet<LookupElement>();
       set.add(JavaLookupElementBuilder.forField(myField).withTypeText(myField.getType().getPresentableText()));
-      PsiField[] fields = myClass.getFields();
-      for (PsiField otherField : fields) {
+      for (PsiField otherField : myClass.getFields()) {
         if (!myDefaultFieldName.equals(otherField.getName())) {
           PsiType otherType = otherField.getType();
-          for (PsiType type : myExpectedTypes) {
-            if (type.equals(otherType)) {
+          for (SmartTypePointer pointer : myExpectedTypes) {
+            if (otherType.equals(pointer.getType())) {
               set.add(JavaLookupElementBuilder.forField(otherField).withTypeText(otherType.getPresentableText()));
             }
           }

From 3d365633e67bfdfae46b669a9ed1d267da8a6c18 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 13 Mar 2015 15:23:23 +0100
Subject: [PATCH 26/27] start testng tests in smart mode (EA-66189 - INRE)

---
 .../testng/configuration/SearchingForTestsTask.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
index 3e532757c54a..538a4bb005b6 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java
@@ -123,10 +123,15 @@ public class SearchingForTestsTask extends Task.Backgroundable {
 
   @Override
   public void onSuccess() {
-    writeTempFile();
-    finish();
+    DumbService.getInstance(myProject).runWhenSmart(new Runnable() {
+      @Override
+      public void run() {
+        writeTempFile();
+        finish();
 
-    if (!Registry.is("testng_sm_runner")) myClient.startListening(myConfig);
+        if (!Registry.is("testng_sm_runner")) myClient.startListening(myConfig);
+      }
+    });
   }
 
   @Override

From c8bc2faaba1b907d999403952d11d6a7ce611728 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 13 Mar 2015 15:37:17 +0100
Subject: [PATCH 27/27] no GradleUrlProvider class search in dumb mode
 (EA-66160 - INRE)

---
 .../gradle/execution/test/runner/GradleUrlProvider.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleUrlProvider.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleUrlProvider.java
index 1d073f9ab6df..3bf502b08c6e 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleUrlProvider.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/test/runner/GradleUrlProvider.java
@@ -17,13 +17,13 @@ package org.jetbrains.plugins.gradle.execution.test.runner;
 
 import com.intellij.execution.Location;
 import com.intellij.execution.PsiLocation;
+import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.testIntegration.TestLocationProvider;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,6 +43,7 @@ public class GradleUrlProvider implements TestLocationProvider {
   @NotNull
   public List<Location> getLocation(@NotNull String protocolId, @NotNull String locationData, Project project) {
     if (!PROTOCOL_ID.equals(protocolId)) return Collections.emptyList();
+    if (DumbService.isDumb(project)) return Collections.emptyList();
 
     final String className = extractFullClassName(locationData);
     if (className == null) return Collections.emptyList();