"gnu" prefix removed from CommandLine classes according to https://upsource.labs.intellij.net/idea-community/review/IDEA-COMMUNITY-CR-1732

2026-09-27 10:03:11 +07:00 · 2015-03-23 19:28:54 +03:00
parent 6e25e11ab3
commit 80d3f386d1
48 changed files with 121 additions and 127 deletions
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.PsiElement;
 import com.intellij.lang.ASTNode;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.impl.*;
+import com.jetbrains.commandInterface.commandLine.psi.impl.*;

 public interface CommandLineElementTypes {

@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 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 static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
+import static com.jetbrains.commandInterface.commandLine.CommandLineParserUtil.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.TokenSet;
@@ -1,7 +1,7 @@
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
-import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;

 %%

@@ -1,16 +1,16 @@
-/* The following code was generated by JFlex 1.4.3 on 12.03.15 21:27 */
+/* The following code was generated by JFlex 1.4.3 on 23.03.15 20:24 */

-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
-import static com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes.*;
+import static com.jetbrains.commandInterface.commandLine.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>
+ * on 23.03.15 20:24 from the specification file
+ * <tt>C:/Users/ilya.kazakevich/work/ultimate/community/python/gen/com/jetbrains/commandInterface/commandLine/_CommandLineLexer.flex</tt>
 */
 public class _CommandLineLexer implements FlexLexer {
  /** initial size of the lookahead buffer */
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.psi;

 import java.util.List;
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Option;

@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.psi;

 import java.util.List;
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;

 public interface CommandLineCommand extends CommandLinePart {

@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.psi;

 import java.util.List;
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;
 import com.jetbrains.commandInterface.command.Option;

 public interface CommandLineOption extends CommandLinePart {
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.psi;

 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;

 public class CommandLineVisitor extends PsiElementVisitor {

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+package com.jetbrains.commandInterface.commandLine.psi.impl;

 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ 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.*;
+import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.commandLine.CommandLineElement;
+import com.jetbrains.commandInterface.commandLine.psi.*;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Option;

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+package com.jetbrains.commandInterface.commandLine.psi.impl;

 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ 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.*;
+import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.commandLine.CommandLineElement;
+import com.jetbrains.commandInterface.commandLine.psi.*;

 public class CommandLineCommandImpl extends CommandLineElement implements CommandLineCommand {

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+package com.jetbrains.commandInterface.commandLine.psi.impl;

 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,9 +7,9 @@ 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.*;
+import static com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.*;
+import com.jetbrains.commandInterface.commandLine.CommandLineElement;
+import com.jetbrains.commandInterface.commandLine.psi.*;
 import com.jetbrains.commandInterface.command.Option;

 public class CommandLineOptionImpl extends CommandLineElement implements CommandLineOption {
@@ -2,25 +2,25 @@

  <!--
   Extension points to support gnu command line language.
-   See {@link com.jetbrains.commandInterface.gnuCommandLine} package
+   See {@link com.jetbrains.commandInterface.commandLineackage
  -->
  <extensions defaultExtensionNs="com.intellij">


-    <fileTypeFactory implementation="com.jetbrains.commandInterface.gnuCommandLine.CommandLineFileTypeFactory"/>
+    <fileTypeFactory implementation="com.jetbrains.commandInterface.commandLine.CommandLineFileTypeFactory"/>
    <lang.parserDefinition language="CommandLine"
-                           implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineParserDefinition"/>
+                           implementationClass="com.jetbrains.commandInterface.commandLine.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"/>
+                                   implementationClass="com.jetbrains.commandInterface.commandLine.CommandLineSyntaxHighlighterFactory"/>
+    <psi.referenceContributor implementation="com.jetbrains.commandInterface.commandLine.CommandLineReferenceContributor"/>
+    <lang.elementManipulator forClass="com.jetbrains.commandInterface.commandLine.CommandLineElement"
+                             implementationClass="com.jetbrains.commandInterface.commandLine.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"/>
+                     implementationClass="com.jetbrains.commandInterface.commandLine.CommandLineInspection"/>
    <lang.documentationProvider language="CommandLine"
-                                implementationClass="com.jetbrains.commandInterface.gnuCommandLine.CommandLineDocumentationProvider"/>
+                                implementationClass="com.jetbrains.commandInterface.commandLine.CommandLineDocumentationProvider"/>
  </extensions>
 </idea-plugin>
@@ -6,8 +6,8 @@

  <module value="com.intellij.modules.python"/>

-  <!-- TODO: Doc -->
-  <xi:include href="/META-INF/gnu-command-line.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <!-- Enable command-line language -->
+  <xi:include href="/META-INF/command-line.xml" xpointer="xpointer(/idea-plugin/*)"/>

  <extensions defaultExtensionNs="com.intellij">
    <library.type implementation="com.jetbrains.python.library.PythonLibraryType"/>
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Option;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineArgument;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineArgument;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Command;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineCommand;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineCommand;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -13,19 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.lang.documentation.DocumentationProviderEx;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Command;
 import com.jetbrains.commandInterface.command.Option;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+import com.jetbrains.commandInterface.commandLine.psi.*;
 import com.jetbrains.python.psi.PyUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.commandInterface.command.Command;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.AbstractElementManipulator;
@@ -13,18 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 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 com.jetbrains.commandInterface.commandLine.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
 *
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.LanguageFileType;
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 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.commandLine.psi.*;
 import com.jetbrains.commandInterface.command.Command;
 import com.jetbrains.python.PyBundle;
 import org.jetbrains.annotations.Nls;
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.lang.Language;

@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Option;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineOption;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineOption;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.lang.ASTNode;
 import com.intellij.lang.ParserDefinition;
@@ -27,8 +27,8 @@ 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 com.jetbrains.commandInterface.commandLine.CommandLineElementTypes.Factory;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.parser.GeneratedParserUtilBase;
@@ -13,11 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Command;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import org.jetbrains.annotations.Nullable;

 /**
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.*;
 import com.intellij.util.ProcessingContext;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.*;
+import com.jetbrains.commandInterface.commandLine.psi.*;
 import org.jetbrains.annotations.NotNull;

 /**
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.lexer.FlexAdapter;
 import com.intellij.lexer.Lexer;
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.codeInsight.completion.PrioritizedLookupElement;
 import com.intellij.codeInsight.lookup.LookupElement;
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Option;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineArgument;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineOption;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineArgument;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineOption;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -6,20 +6,20 @@

 {
   // All 3 elements should extend this class
-   mixin("option|argument|command")="com.jetbrains.commandInterface.gnuCommandLine.CommandLineElement"
+   mixin("option|argument|command")="com.jetbrains.commandInterface.commandLine.CommandLineElement"
   // And implement this interface
-   implements("option|argument|command")="com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart"
+   implements("option|argument|command")="com.jetbrains.commandInterface.commandLine.CommandLinePart"

-   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'
+   parserClass = 'com.jetbrains.commandInterface.commandLine.CommandLineParser'
+   parserUtilClass="com.jetbrains.commandInterface.commandLine.CommandLineParserUtil"
+   psiImplUtilClass="com.jetbrains.commandInterface.commandLine.psi.impl.CommandLinePsiImplUtils"
+   psiPackage = 'com.jetbrains.commandInterface.commandLine.psi'
+   psiImplPackage = 'com.jetbrains.commandInterface.commandLine.psi.impl'

-   elementTypeHolderClass = 'com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementTypes'
+   elementTypeHolderClass = 'com.jetbrains.commandInterface.commandLine.CommandLineElementTypes'
   psiClassPrefix = "CommandLine"
   psiVisitorName = "CommandLineVisitor"
-   elementTypeClass = 'com.jetbrains.commandInterface.gnuCommandLine.CommandLineElementType'
+   elementTypeClass = 'com.jetbrains.commandInterface.commandLine.CommandLineElementType'


  tokens=[
@@ -26,9 +26,9 @@
 * </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)}
+ * When parsed, {@link com.jetbrains.commandInterface.commandLine.psi.CommandLineFile} is root element for
+ * {@link com.jetbrains.commandInterface.commandLine.CommandLineLanguage}.
+ * <strong>Warning</strong>: always fill {@link com.jetbrains.commandInterface.commandLine.psi.CommandLineFile#setCommands(java.util.List)}
 * if possible.
 * </p>
 * <h2>Extension points</h2>
@@ -37,4 +37,4 @@
 *
 * @author Ilya.Kazakevich
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.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.commandLine.CommandLineLanguage;
 import com.jetbrains.commandInterface.command.Command;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
-import com.jetbrains.commandInterface.gnuCommandLine.ValidationResult;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.ValidationResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.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.commandLine.ValidationResult;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Command;
 import com.jetbrains.commandInterface.command.Option;
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+package com.jetbrains.commandInterface.commandLine.psi.impl;

 import com.intellij.psi.PsiElement;
 import com.jetbrains.commandInterface.command.Argument;
 import com.jetbrains.commandInterface.command.Option;
-import com.jetbrains.commandInterface.gnuCommandLine.CommandLinePart;
-import com.jetbrains.commandInterface.gnuCommandLine.ValidationResult;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineArgument;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineOption;
+import com.jetbrains.commandInterface.commandLine.CommandLinePart;
+import com.jetbrains.commandInterface.commandLine.ValidationResult;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineArgument;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineOption;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -16,9 +16,9 @@

 /**
 * Gnu command line language PSI implementation.
- * Do not use this package directly, consider using interfaces from {@link com.jetbrains.commandInterface.gnuCommandLine.psi} instead.
+ * Do not use this package directly, consider using interfaces from {@link com.jetbrains.commandInterface.commandLine.psi} instead.
 * <strong>Warning</strong>: most files in this package is autogenerated. Do not touch them directly.
 *
 * @author Ilya.Kazakevich
 */
-package com.jetbrains.commandInterface.gnuCommandLine.psi.impl;
+package com.jetbrains.commandInterface.commandLine.psi.impl;
@@ -20,4 +20,4 @@
 * <strong>Warning</strong>: most files in this package is autogenerated. Do not touch them directly.
 * @author Ilya.Kazakevich
 */
-package com.jetbrains.commandInterface.gnuCommandLine.psi;
+package com.jetbrains.commandInterface.commandLine.psi;
@@ -28,8 +28,8 @@ import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.psi.util.PsiModificationTracker.Listener;
 import com.intellij.util.messages.MessageBusConnection;
 import com.jetbrains.commandInterface.command.Argument;
-import com.jetbrains.commandInterface.gnuCommandLine.ValidationResult;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.ValidationResult;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.PyBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,8 +19,8 @@ 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.commandInterface.commandLine.CommandLineLanguage;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.psi.PyUtil;
 import org.jetbrains.annotations.NotNull;

@@ -31,8 +31,8 @@ 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.commandInterface.commandLine.CommandLineLanguage;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.psi.PyUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,12 +33,12 @@
 *     <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
+ *     <li>{@link com.jetbrains.commandInterface.commandLine} 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
+ *     {@link com.jetbrains.commandInterface.command.Command commands} to {@link com.jetbrains.commandInterface.commandLine.psi.CommandLineFile}
+ *      (see {@link com.jetbrains.commandInterface.commandLine.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>
@@ -13,11 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.util.Pair;
 import com.jetbrains.commandInterface.command.Argument;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.fixtures.PyTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
@@ -13,10 +13,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.psi.PsiFile;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.fixtures.PyTestCase;
 import org.junit.Assert;

@@ -13,13 +13,11 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;


 import com.intellij.testFramework.ParsingTestCase;

-import com.jetbrains.python.PythonTestUtil;
-

 /**
 * Tests command line parser
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.util.containers.HashSet;
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.jetbrains.commandInterface.gnuCommandLine;
+package com.jetbrains.commandInterface.commandLine;

 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture;
 import com.jetbrains.commandInterface.command.*;
-import com.jetbrains.commandInterface.gnuCommandLine.psi.CommandLineFile;
+import com.jetbrains.commandInterface.commandLine.psi.CommandLineFile;
 import com.jetbrains.python.PythonTestUtil;
 import org.easymock.EasyMock;
 import org.jetbrains.annotations.NotNull;