Merge branch 'IJSDK-479B'

simple_language_plugin/src/main/gen/org/intellij/sdk/language/SimpleLexer.java

@@ -1,10 +1,10 @@
 /* The following code was generated by JFlex 1.7.0 tweaked for IntelliJ platform */
 
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.sdk.language.psi.SimpleTypes;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import com.intellij.psi.TokenType;
 
 

simple_language_plugin/src/main/gen/org/intellij/sdk/language/parser/SimpleParser.java

@@ -1,9 +1,9 @@
 // This is a generated file. Not intended for manual editing.
-package com.intellij.sdk.language.parser;
+package org.intellij.sdk.language.parser;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilder.Marker;
-import static com.intellij.sdk.language.psi.SimpleTypes.*;
+import static org.intellij.sdk.language.psi.SimpleTypes.*;
 import static com.intellij.lang.parser.GeneratedParserUtilBase.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.ASTNode;

simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleProperty.java

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;

simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleTypes.java

@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.PsiElement;
 import com.intellij.lang.ASTNode;
-import com.intellij.sdk.language.psi.impl.*;
+import org.intellij.sdk.language.psi.impl.*;
 
 public interface SimpleTypes {
 

simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleVisitor.java

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElementVisitor;

simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/impl/SimplePropertyImpl.java

@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.intellij.sdk.language.psi.impl;
+package org.intellij.sdk.language.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.intellij.sdk.language.psi.SimpleTypes.*;
+import static org.intellij.sdk.language.psi.SimpleTypes.*;
-import com.intellij.sdk.language.psi.*;
+import org.intellij.sdk.language.psi.*;
 import com.intellij.navigation.ItemPresentation;
 
 public class SimplePropertyImpl extends SimpleNamedElementImpl implements SimpleProperty {

simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.bnf

@@ -1,30 +0,0 @@
-{
-  parserClass="com.intellij.sdk.language.parser.SimpleParser"
-
-  extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
-
-  psiClassPrefix="Simple"
-  psiImplClassSuffix="Impl"
-  psiPackage="com.intellij.sdk.language.psi"
-  psiImplPackage="com.intellij.sdk.language.psi.impl"
-
-  elementTypeHolderClass="com.intellij.sdk.language.psi.SimpleTypes"
-  elementTypeClass="com.intellij.sdk.language.psi.SimpleElementType"
-  tokenTypeClass="com.intellij.sdk.language.psi.SimpleTokenType"
-
-  psiImplUtilClass="com.intellij.sdk.language.psi.impl.SimplePsiImplUtil"
-}
-
-simpleFile ::= item_*
-
-private item_ ::= (property|COMMENT|CRLF)
-
-property ::= (KEY? SEPARATOR VALUE?) | KEY {
-  pin=3
-  recoverWhile="recover_property"
-  mixin="com.intellij.sdk.language.psi.impl.SimpleNamedElementImpl"
-  implements="com.intellij.sdk.language.psi.SimpleNamedElement"
-  methods=[getKey getValue getName setName getNameIdentifier getPresentation]
-}
-
-private recover_property ::= !(KEY|SEPARATOR|COMMENT)

simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleNamedElement.java

@@ -1,8 +0,0 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-
-package com.intellij.sdk.language.psi;
-
-import com.intellij.psi.PsiNameIdentifierOwner;
-
-public interface SimpleNamedElement extends PsiNameIdentifierOwner {
-}

simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.bnf

@@ -0,0 +1,30 @@
+{
+  parserClass="org.intellij.sdk.language.parser.SimpleParser"
+
+  extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
+
+  psiClassPrefix="Simple"
+  psiImplClassSuffix="Impl"
+  psiPackage="org.intellij.sdk.language.psi"
+  psiImplPackage="org.intellij.sdk.language.psi.impl"
+
+  elementTypeHolderClass="org.intellij.sdk.language.psi.SimpleTypes"
+  elementTypeClass="org.intellij.sdk.language.psi.SimpleElementType"
+  tokenTypeClass="org.intellij.sdk.language.psi.SimpleTokenType"
+
+  psiImplUtilClass="org.intellij.sdk.language.psi.impl.SimplePsiImplUtil"
+}
+
+simpleFile ::= item_*
+
+private item_ ::= (property|COMMENT|CRLF)
+
+property ::= (KEY? SEPARATOR VALUE?) | KEY {
+  pin=3
+  recoverWhile="recover_property"
+  mixin="org.intellij.sdk.language.psi.impl.SimpleNamedElementImpl"
+  implements="org.intellij.sdk.language.psi.SimpleNamedElement"
+  methods=[getKey getValue getName setName getNameIdentifier getPresentation]
+}
+
+private recover_property ::= !(KEY|SEPARATOR|COMMENT)

simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.flex

@@ -1,8 +1,8 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.sdk.language.psi.SimpleTypes;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import com.intellij.psi.TokenType;
 
 %%

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java

@@ -1,10 +1,10 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lang.annotation.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java

@@ -1,6 +1,6 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.formatting.*;
 import com.intellij.lang.ASTNode;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java

@@ -1,10 +1,8 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.navigation.*;
 import com.intellij.openapi.project.Project;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettings.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.psi.codeStyle.*;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.application.options.*;
 import com.intellij.psi.codeStyle.*;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -8,8 +8,6 @@ import org.jetbrains.annotations.*;
 import javax.swing.*;
 import java.util.Map;
 
-import static com.intellij.sdk.language.SimpleLanguage.*;
-
 public class SimpleColorSettingsPage implements ColorSettingsPage {
   private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{
         new AttributesDescriptor("Key", SimpleSyntaxHighlighter.KEY),

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCommenter.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.lang.Commenter;
 import org.jetbrains.annotations.Nullable;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java

@@ -1,12 +1,10 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.codeInsight.completion.*;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.util.ProcessingContext;
-import com.intellij.sdk.language.psi.SimpleTypes;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import org.jetbrains.annotations.NotNull;
 
 public class SimpleCompletionContributor extends CompletionContributor {

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.codeInsight.intention.impl.BaseIntentionAction;
 import com.intellij.lang.ASTNode;
@@ -20,9 +18,9 @@ import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.FileTypeIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.sdk.language.psi.SimpleElementFactory;
+import org.intellij.sdk.language.psi.SimpleElementFactory;
-import com.intellij.sdk.language.psi.SimpleFile;
+import org.intellij.sdk.language.psi.SimpleFile;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileType.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import org.jetbrains.annotations.NotNull;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileTypeFactory.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java

@@ -1,14 +1,12 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.lang.cacheBuilder.*;
 import com.intellij.lang.findUsages.FindUsagesProvider;
 import com.intellij.psi.*;
 import com.intellij.psi.tree.TokenSet;
-import com.intellij.sdk.language.psi.*;
+import org.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import org.jetbrains.annotations.*;
-import static com.intellij.sdk.language.SimpleAnnotator.*;
 
 public class SimpleFindUsagesProvider implements FindUsagesProvider {
   @Nullable
@@ -55,7 +53,7 @@ public class SimpleFindUsagesProvider implements FindUsagesProvider {
   @Override
   public String getNodeText(@NotNull PsiElement element, boolean useFullName) {
     if (element instanceof SimpleProperty) {
-      return ((SimpleProperty) element).getKey() + SIMPLE_SEPARATOR_STR + ((SimpleProperty) element).getValue();
+      return ((SimpleProperty) element).getKey() + SimpleAnnotator.SIMPLE_SEPARATOR_STR + ((SimpleProperty) element).getValue();
     } else {
       return "";
     }

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.folding.*;
@@ -9,11 +7,9 @@ import com.intellij.openapi.project.*;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.*;
 
-import static com.intellij.sdk.language.SimpleAnnotator.*;
-
 import java.util.*;
 
 public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware {
@@ -21,7 +17,7 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware
   @Override
   public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull Document document, boolean quick) {
     // Initialize the group of folding regions that will expand/collapse together.
-    FoldingGroup group = FoldingGroup.newGroup(SIMPLE_PREFIX_STR);
+    FoldingGroup group = FoldingGroup.newGroup(SimpleAnnotator.SIMPLE_PREFIX_STR);
     // Initialize the list of folding regions
     List< FoldingDescriptor > descriptors = new ArrayList< FoldingDescriptor >();
     // Get a collection of the literal expressions in the document below root
@@ -30,11 +26,11 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware
     // Evaluate the collection
     for ( final PsiLiteralExpression literalExpression : literalExpressions ) {
       String value = literalExpression.getValue() instanceof String ? (String) literalExpression.getValue() : null;
-      if ( value != null && value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR) ) {
+      if ( value != null && value.startsWith(SimpleAnnotator.SIMPLE_PREFIX_STR + SimpleAnnotator.SIMPLE_SEPARATOR_STR) ) {
         Project project = literalExpression.getProject();
-        String key = value.substring(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length());
+        String key = value.substring(SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length());
         // Get a list of all properties for a given key in the project
-        final List< SimpleProperty > properties = SimpleUtil.findProperties(project, key);
+        final List<SimpleProperty> properties = SimpleUtil.findProperties(project, key);
         if ( properties.size() == 1 ) {
           // Add a folding descriptor for the literal expression at this node.
           descriptors.add(new FoldingDescriptor(literalExpression.getNode(),
@@ -59,7 +55,7 @@ public class SimpleFoldingBuilder extends FoldingBuilderEx implements DumbAware
     String retTxt = "...";
     if ( node.getPsi() instanceof PsiLiteralExpression ) {
       PsiLiteralExpression nodeElement = (PsiLiteralExpression) node.getPsi();
-      String key = ((String) nodeElement.getValue()).substring(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length());
+      String key = ((String) nodeElement.getValue()).substring(SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length());
       final List< SimpleProperty > properties = SimpleUtil.findProperties(nodeElement.getProject(), key);
       String place = properties.get(0).getValue();
       // IMPORTANT: keys can come with no values, so a test for null is needed

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java

@@ -1,13 +1,11 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.formatting.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
-import com.intellij.sdk.language.psi.SimpleTypes;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import org.jetbrains.annotations.*;
 
 public class SimpleFormattingModelBuilder implements FormattingModelBuilder {

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleIcons.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.util.IconLoader;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguage.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lang.Language;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.lang.Language;
 import com.intellij.psi.codeStyle.*;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLexerAdapter.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lexer.FlexAdapter;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java

@@ -1,13 +1,12 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.codeInsight.daemon.*;
 import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.tree.java.PsiJavaTokenImpl;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.NotNull;
-import static com.intellij.sdk.language.SimpleAnnotator.*;
 
 import java.util.*;
 
@@ -21,12 +20,12 @@ public class SimpleLineMarkerProvider extends RelatedItemLineMarkerProvider {
     // The literal expression must start with the Simple language literal expression
     PsiLiteralExpression literalExpression = (PsiLiteralExpression) element.getParent();
     String value = literalExpression.getValue() instanceof String ? (String) literalExpression.getValue() : null;
-    if ( ( value == null ) || !value.startsWith( SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR ) ) return;
+    if ( ( value == null ) || !value.startsWith( SimpleAnnotator.SIMPLE_PREFIX_STR + SimpleAnnotator.SIMPLE_SEPARATOR_STR ) ) return;
 
     // Get the Simple language property usage
     Project project = element.getProject();
-    String possibleProperties = value.substring( SIMPLE_PREFIX_STR.length()+SIMPLE_SEPARATOR_STR.length() );
+    String possibleProperties = value.substring( SimpleAnnotator.SIMPLE_PREFIX_STR.length()+ SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() );
-    final List< SimpleProperty > properties = SimpleUtil.findProperties( project, possibleProperties );
+    final List<SimpleProperty> properties = SimpleUtil.findProperties( project, possibleProperties );
     if ( properties.size() > 0 ) {
       // Add the property to a collection of line marker info
       NavigationGutterIconBuilder< PsiElement > builder =

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java

@@ -1,12 +1,12 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lang.*;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.tree.*;
-import com.intellij.sdk.language.parser.SimpleParser;
+import org.intellij.sdk.language.parser.SimpleParser;
-import com.intellij.sdk.language.psi.*;
+import org.intellij.sdk.language.psi.*;
 import org.jetbrains.annotations.NotNull;
 
 public class SimpleParserDefinition implements ParserDefinition {

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleRefactoringSupportProvider.java

@@ -1,10 +1,8 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.lang.refactoring.RefactoringSupportProvider;
 import com.intellij.psi.PsiElement;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.*;
 
 public class SimpleRefactoringSupportProvider extends RefactoringSupportProvider {

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java

@@ -1,12 +1,10 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.codeInsight.lookup.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.openapi.util.TextRange;
 import com.intellij.patterns.PlatformPatterns;
@@ -8,7 +6,7 @@ import com.intellij.psi.*;
 import com.intellij.util.ProcessingContext;
 import org.jetbrains.annotations.NotNull;
 
-import static com.intellij.sdk.language.SimpleAnnotator.*;
+import static org.intellij.sdk.language.SimpleAnnotator.*;
 
 public class SimpleReferenceContributor extends PsiReferenceContributor {
   @Override

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.structureView.StructureViewTreeElement;
@@ -9,9 +7,9 @@ import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.sdk.language.psi.SimpleFile;
+import org.intellij.sdk.language.psi.*;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
-import com.intellij.sdk.language.psi.impl.SimplePropertyImpl;
+import org.intellij.sdk.language.psi.impl.SimplePropertyImpl;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java

@@ -1,6 +1,4 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.ide.structureView.*;
 import com.intellij.lang.PsiStructureViewFactory;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java

@@ -1,11 +1,9 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language;
-
-package com.intellij.sdk.language;
 
 import com.intellij.ide.structureView.*;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
 import com.intellij.psi.PsiFile;
-import com.intellij.sdk.language.psi.SimpleFile;
+import org.intellij.sdk.language.psi.SimpleFile;
 import org.jetbrains.annotations.NotNull;
 
 public class SimpleStructureViewModel extends StructureViewModelBase implements

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.*;
@@ -6,7 +6,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
-import com.intellij.sdk.language.psi.SimpleTypes;
+import org.intellij.sdk.language.psi.SimpleTypes;
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.fileTypes.*;
 import com.intellij.openapi.project.Project;

simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java

@@ -1,12 +1,12 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.search.*;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.indexing.FileBasedIndex;
+import org.intellij.sdk.language.psi.SimpleFile;
-import com.intellij.sdk.language.psi.*;
+import org.intellij.sdk.language.psi.SimpleProperty;
 
 import java.util.*;
 
@@ -14,7 +14,7 @@ public class SimpleUtil {
   
   // Searches the entire project for Simple language files with instances of the Simple property with the given key
   public static List<SimpleProperty> findProperties(Project project, String key) {
-    List<SimpleProperty> result = null;
+    List<SimpleProperty> result = new ArrayList<>();
     Collection<VirtualFile> virtualFiles =
           FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project));
     for (VirtualFile virtualFile : virtualFiles) {
@@ -24,16 +24,13 @@ public class SimpleUtil {
         if (properties != null) {
           for (SimpleProperty property : properties) {
             if (key.equals(property.getKey())) {
-              if (result == null) {
+               result.add(property);
-                result = new ArrayList<SimpleProperty>();
-              }
-              result.add(property);
             }
           }
         }
       }
     }
-    return result != null ? result : Collections.<SimpleProperty>emptyList();
+    return result;
   }
   
   public static List<SimpleProperty> findProperties(Project project) {

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementFactory.java

@@ -1,10 +1,8 @@
-// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.intellij.sdk.language.psi;
-
-package com.intellij.sdk.language.psi;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.sdk.language.SimpleFileType;
+import org.intellij.sdk.language.SimpleFileType;
 
 public class SimpleElementFactory {
   public static SimpleProperty createProperty(Project project, String name) {
@@ -12,6 +10,11 @@ public class SimpleElementFactory {
     return (SimpleProperty) file.getFirstChild();
   }
 
+  public static SimpleFile createFile(Project project, String text) {
+    String name = "dummy.simple";
+    return (SimpleFile) PsiFileFactory.getInstance( project).createFileFromText(name, SimpleFileType.INSTANCE, text);
+  }
+
   public static SimpleProperty createProperty(Project project, String name, String value) {
     final SimpleFile file = createFile(project, name + " = " + value);
     return (SimpleProperty) file.getFirstChild();
@@ -22,8 +25,4 @@ public class SimpleElementFactory {
     return file.getFirstChild();
   }
 
-  public static SimpleFile createFile(Project project, String text) {
-    String name = "dummy.simple";
-    return (SimpleFile) PsiFileFactory.getInstance( project).createFileFromText(name, SimpleFileType.INSTANCE, text);
-  }
 }

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementType.java

@@ -1,7 +1,7 @@
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import com.intellij.psi.tree.IElementType;
-import com.intellij.sdk.language.SimpleLanguage;
+import org.intellij.sdk.language.SimpleLanguage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleFile.java

@@ -1,13 +1,11 @@
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
-import com.intellij.sdk.language.*;
+import org.intellij.sdk.language.*;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class SimpleFile extends PsiFileBase {
   public SimpleFile(@NotNull FileViewProvider viewProvider) {
     super(viewProvider, SimpleLanguage.INSTANCE);

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleNamedElement.java

@@ -0,0 +1,6 @@
+package org.intellij.sdk.language.psi;
+
+import com.intellij.psi.PsiNameIdentifierOwner;
+
+public interface SimpleNamedElement extends PsiNameIdentifierOwner {
+}

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenType.java

@@ -1,7 +1,7 @@
-package com.intellij.sdk.language.psi;
+package org.intellij.sdk.language.psi;
 
 import com.intellij.psi.tree.IElementType;
-import com.intellij.sdk.language.SimpleLanguage;
+import org.intellij.sdk.language.SimpleLanguage;
 import org.jetbrains.annotations.*;
 
 public class SimpleTokenType extends IElementType {

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java

@@ -1,10 +1,10 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
-package com.intellij.sdk.language.psi.impl;
+package org.intellij.sdk.language.psi.impl;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
-import com.intellij.sdk.language.psi.SimpleNamedElement;
+import org.intellij.sdk.language.psi.SimpleNamedElement;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class SimpleNamedElementImpl extends ASTWrapperPsiElement implements SimpleNamedElement {

simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java

@@ -1,11 +1,11 @@
-package com.intellij.sdk.language.psi.impl;
+package org.intellij.sdk.language.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.sdk.language.SimpleIcons;
+import org.intellij.sdk.language.SimpleIcons;
-import com.intellij.sdk.language.psi.*;
+import org.intellij.sdk.language.psi.*;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;

simple_language_plugin/src/main/resources/META-INF/plugin.xml

@@ -3,7 +3,7 @@
 <idea-plugin>
 
   <!--  Unique id for this plugin. Must stay constant for the life of the plugin.  -->
-  <id>com.intellij.sdk.simple_language</id>
+  <id>org.intellij.sdk.simple_language</id>
 
   <!-- Text to display as name on Preferences/Settings | Plugin page  -->
   <name>SDK: Simple Language Sample Project</name>
@@ -40,28 +40,28 @@
   <vendor url="https://plugins.jetbrains.com">IntelliJ Platform SDK</vendor>
 
   <extensions defaultExtensionNs="com.intellij">
-    <fileType name="Simple file" implementationClass="com.intellij.sdk.language.SimpleFileType" fieldName="INSTANCE"
+    <fileType name="Simple file" implementationClass="org.intellij.sdk.language.SimpleFileType" fieldName="INSTANCE"
-            language="Simple" extensions="simple"/>
+              language="Simple" extensions="simple"/>
     <!-- Only required for versions of the IntelliJ Platform prior to v2019.2.
          Use fileTypeFactory extension point INSTEAD of fileType.
-    <fileTypeFactory implementation="com.intellij.sdk.language.SimpleFileTypeFactory"/>
+    <fileTypeFactory implementation="org.intellij.sdk.language.SimpleFileTypeFactory"/>
     -->
-    <lang.parserDefinition language="Simple" implementationClass="com.intellij.sdk.language.SimpleParserDefinition"/>
+    <lang.parserDefinition language="Simple" implementationClass="org.intellij.sdk.language.SimpleParserDefinition"/>
-    <lang.syntaxHighlighterFactory language="Simple" implementationClass="com.intellij.sdk.language.SimpleSyntaxHighlighterFactory"/>
+    <lang.syntaxHighlighterFactory language="Simple" implementationClass="org.intellij.sdk.language.SimpleSyntaxHighlighterFactory"/>
-    <colorSettingsPage implementation="com.intellij.sdk.language.SimpleColorSettingsPage"/>
+    <colorSettingsPage implementation="org.intellij.sdk.language.SimpleColorSettingsPage"/>
-    <annotator language="JAVA" implementationClass="com.intellij.sdk.language.SimpleAnnotator"/>
+    <annotator language="JAVA" implementationClass="org.intellij.sdk.language.SimpleAnnotator"/>
-    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.sdk.language.SimpleLineMarkerProvider"/>
+    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.intellij.sdk.language.SimpleLineMarkerProvider"/>
-    <completion.contributor language="Simple" implementationClass="com.intellij.sdk.language.SimpleCompletionContributor"/>
+    <completion.contributor language="Simple" implementationClass="org.intellij.sdk.language.SimpleCompletionContributor"/>
-    <psi.referenceContributor implementation="com.intellij.sdk.language.SimpleReferenceContributor"/>
+    <psi.referenceContributor implementation="org.intellij.sdk.language.SimpleReferenceContributor"/>
-    <lang.refactoringSupport language="Simple" implementationClass="com.intellij.sdk.language.SimpleRefactoringSupportProvider"/>
+    <lang.refactoringSupport language="Simple" implementationClass="org.intellij.sdk.language.SimpleRefactoringSupportProvider"/>
-    <lang.findUsagesProvider language="Simple" implementationClass="com.intellij.sdk.language.SimpleFindUsagesProvider"/>
+    <lang.findUsagesProvider language="Simple" implementationClass="org.intellij.sdk.language.SimpleFindUsagesProvider"/>
-    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.sdk.language.SimpleFoldingBuilder"/>
+    <lang.foldingBuilder language="JAVA" implementationClass="org.intellij.sdk.language.SimpleFoldingBuilder"/>
-    <gotoSymbolContributor implementation="com.intellij.sdk.language.SimpleChooseByNameContributor"/>
+    <gotoSymbolContributor implementation="org.intellij.sdk.language.SimpleChooseByNameContributor"/>
-    <lang.psiStructureViewFactory language="Simple" implementationClass="com.intellij.sdk.language.SimpleStructureViewFactory"/>
+    <lang.psiStructureViewFactory language="Simple" implementationClass="org.intellij.sdk.language.SimpleStructureViewFactory"/>
-    <lang.formatter language="Simple" implementationClass="com.intellij.sdk.language.SimpleFormattingModelBuilder"/>
+    <lang.formatter language="Simple" implementationClass="org.intellij.sdk.language.SimpleFormattingModelBuilder"/>
-    <codeStyleSettingsProvider implementation="com.intellij.sdk.language.SimpleCodeStyleSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="org.intellij.sdk.language.SimpleCodeStyleSettingsProvider"/>
-    <langCodeStyleSettingsProvider implementation="com.intellij.sdk.language.SimpleLanguageCodeStyleSettingsProvider"/>
+    <langCodeStyleSettingsProvider implementation="org.intellij.sdk.language.SimpleLanguageCodeStyleSettingsProvider"/>
-    <lang.commenter language="Simple" implementationClass="com.intellij.sdk.language.SimpleCommenter"/>
+    <lang.commenter language="Simple" implementationClass="org.intellij.sdk.language.SimpleCommenter"/>
   </extensions>
 
 </idea-plugin>

simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.completion.CompletionType;
@@ -9,7 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.ContainerUtil;
-import com.intellij.sdk.language.psi.SimpleProperty;
+import org.intellij.sdk.language.psi.SimpleProperty;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,7 +23,7 @@ public class SimpleCodeInsightTest extends LightJavaCodeInsightFixtureTestCase {
    */
   @Override
   protected String getTestDataPath() {
-    return "src/test/resources";
+    return "src/test/testData";
   }
 
   public void testCompletion() {
@@ -40,7 +40,7 @@ public class SimpleCodeInsightTest extends LightJavaCodeInsightFixtureTestCase {
   }
 
   public void testFormatter() {
-    myFixture.configureByFiles("FormatterTestData.simple");
+    myFixture.configureByFile("FormatterTestData.simple");
     CodeStyle.getLanguageSettings(myFixture.getFile()).SPACE_AROUND_ASSIGNMENT_OPERATORS = true;
     CodeStyle.getLanguageSettings(myFixture.getFile()).KEEP_BLANK_LINES_IN_CODE = 2;
     WriteCommandAction.writeCommandAction(getProject()).run(() -> {
@@ -57,7 +57,7 @@ public class SimpleCodeInsightTest extends LightJavaCodeInsightFixtureTestCase {
   }
 
   public void testFolding() {
-    myFixture.configureByFiles("DefaultTestData.simple");
+    myFixture.configureByFile("DefaultTestData.simple");
     myFixture.testFolding(getTestDataPath() + "/FoldingTestData.java");
   }
 

simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java

@@ -1,4 +1,4 @@
-package com.intellij.sdk.language;
+package org.intellij.sdk.language;
 
 import com.intellij.testFramework.ParsingTestCase;
 
@@ -17,7 +17,7 @@ public class SimpleParsingTest extends ParsingTestCase {
    */
   @Override
   protected String getTestDataPath() {
-    return "src/test/resources";
+    return "src/test/testData";
   }
 
   @Override