From 5084f2416813056ae790b7c2de1e5f93229231a4 Mon Sep 17 00:00:00 2001 From: JohnHake Date: Tue, 11 Feb 2020 19:35:37 -0800 Subject: [PATCH] Checkpoint IJSDK-479B --- .../intellij/sdk/language/SimpleLexer.java | 4 +- .../sdk/language/parser/SimpleParser.java | 4 +- .../sdk/language/psi/SimpleProperty.java | 2 +- .../sdk/language/psi/SimpleTypes.java | 4 +- .../sdk/language/psi/SimpleVisitor.java | 2 +- .../language/psi/impl/SimplePropertyImpl.java | 6 +-- .../java/com/intellij/sdk/language/Simple.bnf | 30 -------------- .../sdk/language/psi/SimpleNamedElement.java | 8 ---- .../java/org/intellij/sdk/language/Simple.bnf | 30 ++++++++++++++ .../intellij/sdk/language/Simple.flex | 4 +- .../sdk/language/SimpleAnnotator.java | 4 +- .../intellij/sdk/language/SimpleBlock.java | 2 +- .../SimpleChooseByNameContributor.java | 6 +-- .../sdk/language/SimpleCodeStyleSettings.java | 4 +- .../SimpleCodeStyleSettingsProvider.java | 4 +- .../sdk/language/SimpleColorSettingsPage.java | 4 +- .../sdk/language/SimpleCommenter.java | 4 +- .../language/SimpleCompletionContributor.java | 6 +-- .../SimpleCreatePropertyQuickFix.java | 10 ++--- .../intellij/sdk/language/SimpleFileType.java | 2 +- .../sdk/language/SimpleFileTypeFactory.java | 2 +- .../language/SimpleFindUsagesProvider.java | 10 ++--- .../sdk/language/SimpleFoldingBuilder.java | 18 ++++----- .../SimpleFormattingModelBuilder.java | 6 +-- .../intellij/sdk/language/SimpleIcons.java | 2 +- .../intellij/sdk/language/SimpleLanguage.java | 2 +- ...mpleLanguageCodeStyleSettingsProvider.java | 4 +- .../sdk/language/SimpleLexerAdapter.java | 2 +- .../language/SimpleLineMarkerProvider.java | 11 +++-- .../sdk/language/SimpleParserDefinition.java | 6 +-- .../SimpleRefactoringSupportProvider.java | 6 +-- .../sdk/language/SimpleReference.java | 6 +-- .../language/SimpleReferenceContributor.java | 6 +-- .../language/SimpleStructureViewElement.java | 10 ++--- .../language/SimpleStructureViewFactory.java | 4 +- .../language/SimpleStructureViewModel.java | 6 +-- .../sdk/language/SimpleSyntaxHighlighter.java | 4 +- .../SimpleSyntaxHighlighterFactory.java | 2 +- .../intellij/sdk/language/SimpleUtil.java | 6 +-- .../language/psi/SimpleElementFactory.java | 29 +++++++------- .../sdk/language/psi/SimpleElementType.java | 4 +- .../intellij/sdk/language/psi/SimpleFile.java | 6 +-- .../sdk/language/psi/SimpleNamedElement.java | 6 +++ .../sdk/language/psi/SimpleTokenType.java | 4 +- .../psi/impl/SimpleNamedElementImpl.java | 4 +- .../language/psi/impl/SimplePsiImplUtil.java | 6 +-- .../src/main/resources/META-INF/plugin.xml | 40 +++++++++---------- .../sdk/language/SimpleCodeInsightTest.java | 6 +-- .../sdk/language/SimpleParsingTest.java | 4 +- .../AnnotatorTestData.java | 0 .../CompleteTestData.java | 0 .../DefaultTestData.simple | 0 .../FindUsagesTestData.java | 0 .../FindUsagesTestData.simple | 0 .../FoldingTestData.java | 0 .../FormatterTestData.simple | 0 .../ParsingTestData.simple | 0 .../ParsingTestData.txt | 0 .../ReferenceTestData.java | 0 .../RenameTestData.java | 0 .../RenameTestData.simple | 0 .../RenameTestDataAfter.simple | 0 62 files changed, 160 insertions(+), 202 deletions(-) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/SimpleLexer.java (99%) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/parser/SimpleParser.java (97%) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/psi/SimpleProperty.java (91%) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/psi/SimpleTypes.java (90%) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/psi/SimpleVisitor.java (92%) rename simple_language_plugin/src/main/gen/{com => org}/intellij/sdk/language/psi/impl/SimplePropertyImpl.java (90%) delete mode 100644 simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.bnf delete mode 100644 simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleNamedElement.java create mode 100644 simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.bnf rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/Simple.flex (94%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleAnnotator.java (97%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleBlock.java (97%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleChooseByNameContributor.java (81%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleCodeStyleSettings.java (56%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java (86%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleColorSettingsPage.java (95%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleCommenter.java (77%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleCompletionContributor.java (80%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleCreatePropertyQuickFix.java (91%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleFileType.java (95%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleFileTypeFactory.java (93%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleFindUsagesProvider.java (78%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleFoldingBuilder.java (81%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleFormattingModelBuilder.java (87%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleIcons.java (83%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleLanguage.java (85%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java (90%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleLexerAdapter.java (85%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleLineMarkerProvider.java (77%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleParserDefinition.java (92%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleRefactoringSupportProvider.java (64%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleReference.java (88%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleReferenceContributor.java (85%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleStructureViewElement.java (85%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleStructureViewFactory.java (77%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleStructureViewModel.java (76%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleSyntaxHighlighter.java (96%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java (92%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/SimpleUtil.java (93%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/SimpleElementFactory.java (78%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/SimpleElementType.java (77%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/SimpleFile.java (84%) create mode 100644 simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleNamedElement.java rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/SimpleTokenType.java (79%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java (81%) rename simple_language_plugin/src/main/java/{com => org}/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java (94%) rename simple_language_plugin/src/test/java/{com => org}/intellij/sdk/language/SimpleCodeInsightTest.java (96%) rename simple_language_plugin/src/test/java/{com => org}/intellij/sdk/language/SimpleParsingTest.java (89%) rename simple_language_plugin/src/test/{resources => testData}/AnnotatorTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/CompleteTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/DefaultTestData.simple (100%) rename simple_language_plugin/src/test/{resources => testData}/FindUsagesTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/FindUsagesTestData.simple (100%) rename simple_language_plugin/src/test/{resources => testData}/FoldingTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/FormatterTestData.simple (100%) rename simple_language_plugin/src/test/{resources => testData}/ParsingTestData.simple (100%) rename simple_language_plugin/src/test/{resources => testData}/ParsingTestData.txt (100%) rename simple_language_plugin/src/test/{resources => testData}/ReferenceTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/RenameTestData.java (100%) rename simple_language_plugin/src/test/{resources => testData}/RenameTestData.simple (100%) rename simple_language_plugin/src/test/{resources => testData}/RenameTestDataAfter.simple (100%) diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/SimpleLexer.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/SimpleLexer.java similarity index 99% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/SimpleLexer.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/SimpleLexer.java index d29665ebe..b20c23625 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/SimpleLexer.java +++ b/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; diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/parser/SimpleParser.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/parser/SimpleParser.java similarity index 97% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/parser/SimpleParser.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/parser/SimpleParser.java index a70231e85..a4bc36763 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/parser/SimpleParser.java +++ b/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; diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleProperty.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleProperty.java similarity index 91% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleProperty.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleProperty.java index 75a0af3b5..061a0a9a8 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleProperty.java +++ b/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.*; diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleTypes.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleTypes.java similarity index 90% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleTypes.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleTypes.java index 558678ca9..d02c33f56 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleTypes.java +++ b/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 { diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleVisitor.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleVisitor.java similarity index 92% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleVisitor.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/SimpleVisitor.java index aeacbe65d..51548f62f 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/SimpleVisitor.java +++ b/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; diff --git a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/impl/SimplePropertyImpl.java b/simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/impl/SimplePropertyImpl.java similarity index 90% rename from simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/impl/SimplePropertyImpl.java rename to simple_language_plugin/src/main/gen/org/intellij/sdk/language/psi/impl/SimplePropertyImpl.java index e9fc3a070..3094d83c2 100644 --- a/simple_language_plugin/src/main/gen/com/intellij/sdk/language/psi/impl/SimplePropertyImpl.java +++ b/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 com.intellij.sdk.language.psi.*; +import static org.intellij.sdk.language.psi.SimpleTypes.*; +import org.intellij.sdk.language.psi.*; import com.intellij.navigation.ItemPresentation; public class SimplePropertyImpl extends SimpleNamedElementImpl implements SimpleProperty { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.bnf b/simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.bnf deleted file mode 100644 index 3ae45df60..000000000 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.bnf +++ /dev/null @@ -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) \ No newline at end of file diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleNamedElement.java b/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleNamedElement.java deleted file mode 100644 index 0cb18830a..000000000 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleNamedElement.java +++ /dev/null @@ -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 { -} \ No newline at end of file diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.bnf b/simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.bnf new file mode 100644 index 000000000..d6dc75a4a --- /dev/null +++ b/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) \ No newline at end of file diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.flex b/simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.flex similarity index 94% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.flex rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/Simple.flex index d71c2a4a9..f306ff342 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/Simple.flex +++ b/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; %% diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java similarity index 97% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java index caef97733..10d024dbf 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleAnnotator.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleBlock.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java similarity index 97% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleBlock.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java index 1e7b05f7f..77623bbcd 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleBlock.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleChooseByNameContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java similarity index 81% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleChooseByNameContributor.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java index e172c0bdd..eea8b7e4c 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleChooseByNameContributor.java +++ b/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 com.intellij.sdk.language; +package org.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.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettings.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettings.java similarity index 56% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettings.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettings.java index 35c41c8a8..1d8a08311 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettings.java +++ b/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 com.intellij.sdk.language; +package org.intellij.sdk.language; import com.intellij.psi.codeStyle.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java similarity index 86% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java index 27823e310..093184c14 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCodeStyleSettingsProvider.java +++ b/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 com.intellij.sdk.language; +package org.intellij.sdk.language; import com.intellij.application.options.*; import com.intellij.psi.codeStyle.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleColorSettingsPage.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java similarity index 95% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleColorSettingsPage.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java index a0ee3f616..d6a265893 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleColorSettingsPage.java +++ b/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), diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCommenter.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCommenter.java similarity index 77% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCommenter.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCommenter.java index a8c5be9de..9b80882e2 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCommenter.java +++ b/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 com.intellij.sdk.language; +package org.intellij.sdk.language; import com.intellij.lang.Commenter; import org.jetbrains.annotations.Nullable; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java similarity index 80% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java index 4db1b4182..394c71902 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCompletionContributor.java +++ b/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 com.intellij.sdk.language; +package org.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 { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCreatePropertyQuickFix.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java similarity index 91% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCreatePropertyQuickFix.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java index bdb3d0f12..cdb1cb7dd 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleCreatePropertyQuickFix.java +++ b/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 com.intellij.sdk.language; +package org.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 com.intellij.sdk.language.psi.SimpleFile; -import com.intellij.sdk.language.psi.SimpleProperty; +import org.intellij.sdk.language.psi.SimpleElementFactory; +import org.intellij.sdk.language.psi.SimpleFile; +import org.intellij.sdk.language.psi.SimpleProperty; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileType.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileType.java similarity index 95% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileType.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileType.java index f1564fe64..31515ef3f 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileType.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileTypeFactory.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileTypeFactory.java similarity index 93% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileTypeFactory.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFileTypeFactory.java index 6d823c42c..f09f52ce0 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFileTypeFactory.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFindUsagesProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java similarity index 78% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFindUsagesProvider.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java index aa308a388..9e63147a0 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFindUsagesProvider.java +++ b/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 com.intellij.sdk.language; +package org.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 ""; } diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java similarity index 81% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java index f08168d60..f1009835a 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFoldingBuilder.java +++ b/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 com.intellij.sdk.language; +package org.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 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 diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFormattingModelBuilder.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java similarity index 87% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFormattingModelBuilder.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java index 31e179678..50970d0a0 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleFormattingModelBuilder.java +++ b/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 com.intellij.sdk.language; +package org.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 { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleIcons.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleIcons.java similarity index 83% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleIcons.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleIcons.java index f891e06af..2286ee0ea 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleIcons.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguage.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguage.java similarity index 85% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguage.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguage.java index 49e3d2eda..70ccdc383 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguage.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java similarity index 90% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java index 974c1e223..7d71eebf5 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java +++ b/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 com.intellij.sdk.language; +package org.intellij.sdk.language; import com.intellij.lang.Language; import com.intellij.psi.codeStyle.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLexerAdapter.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLexerAdapter.java similarity index 85% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLexerAdapter.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLexerAdapter.java index 426ac5226..ed2428eef 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLexerAdapter.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLineMarkerProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java similarity index 77% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLineMarkerProvider.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java index a70ec514e..314e6f4cb 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleLineMarkerProvider.java +++ b/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() ); - final List< SimpleProperty > properties = SimpleUtil.findProperties( project, possibleProperties ); + String possibleProperties = value.substring( SimpleAnnotator.SIMPLE_PREFIX_STR.length()+ SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() ); + final List properties = SimpleUtil.findProperties( project, possibleProperties ); if ( properties.size() > 0 ) { // Add the property to a collection of line marker info NavigationGutterIconBuilder< PsiElement > builder = diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleParserDefinition.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java similarity index 92% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleParserDefinition.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java index 838c1b9fd..a8c38edda 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleParserDefinition.java +++ b/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 com.intellij.sdk.language.psi.*; +import org.intellij.sdk.language.parser.SimpleParser; +import org.intellij.sdk.language.psi.*; import org.jetbrains.annotations.NotNull; public class SimpleParserDefinition implements ParserDefinition { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleRefactoringSupportProvider.java similarity index 64% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleRefactoringSupportProvider.java index f54b4253b..4842a35bf 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleRefactoringSupportProvider.java +++ b/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 com.intellij.sdk.language; +package org.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 { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReference.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java similarity index 88% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReference.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java index 859ddbaf0..3cfb0ebbb 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReference.java +++ b/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 com.intellij.sdk.language; +package org.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.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java similarity index 85% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java index 66f11f782..cd8681dcd 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleReferenceContributor.java +++ b/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 com.intellij.sdk.language; +package org.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 diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java similarity index 85% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewElement.java index 2e5efc95f..737f8131e 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewElement.java +++ b/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 com.intellij.sdk.language; +package org.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 com.intellij.sdk.language.psi.SimpleProperty; -import com.intellij.sdk.language.psi.impl.SimplePropertyImpl; +import org.intellij.sdk.language.psi.*; +import org.intellij.sdk.language.psi.SimpleProperty; +import org.intellij.sdk.language.psi.impl.SimplePropertyImpl; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewFactory.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java similarity index 77% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewFactory.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewFactory.java index 4ef9a11d9..3668a449d 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewFactory.java +++ b/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 com.intellij.sdk.language; +package org.intellij.sdk.language; import com.intellij.ide.structureView.*; import com.intellij.lang.PsiStructureViewFactory; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewModel.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java similarity index 76% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewModel.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java index e7352cf82..c06f95a80 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleStructureViewModel.java +++ b/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 com.intellij.sdk.language; +package org.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 diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighter.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java similarity index 96% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighter.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java index 44ea221ab..41a2c4a13 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighter.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java similarity index 92% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java index d8fd3732b..3c176b8d1 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleSyntaxHighlighterFactory.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java similarity index 93% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java index 4666fa6b3..2e9ad989c 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/SimpleUtil.java +++ b/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 com.intellij.sdk.language.psi.*; +import org.intellij.sdk.language.psi.SimpleFile; +import org.intellij.sdk.language.psi.SimpleProperty; import java.util.*; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementFactory.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementFactory.java similarity index 78% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementFactory.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementFactory.java index 5789a7f1e..eeb7e76c9 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementFactory.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementFactory.java @@ -1,29 +1,28 @@ -// 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; +package org.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) { final SimpleFile file = createFile(project, name); return (SimpleProperty) file.getFirstChild(); } - - public static SimpleProperty createProperty(Project project, String name, String value) { - final SimpleFile file = createFile(project, name + " = " + value); - return (SimpleProperty) file.getFirstChild(); - } - - public static PsiElement createCRLF(Project project) { - final SimpleFile file = createFile(project, "\n"); - 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); } + + public static SimpleProperty createProperty(Project project, String name, String value) { + final SimpleFile file = createFile(project, name + " = " + value); + return (SimpleProperty) file.getFirstChild(); + } + + public static PsiElement createCRLF(Project project) { + final SimpleFile file = createFile(project, "\n"); + return file.getFirstChild(); + } + } \ No newline at end of file diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementType.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementType.java similarity index 77% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementType.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleElementType.java index cbc6b76d8..8ebb8e5ba 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleElementType.java +++ b/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; diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleFile.java similarity index 84% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleFile.java index 95cf389c3..73af603df 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleFile.java +++ b/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); diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleNamedElement.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleNamedElement.java new file mode 100644 index 000000000..e358953a0 --- /dev/null +++ b/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 { +} \ No newline at end of file diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleTokenType.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenType.java similarity index 79% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleTokenType.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenType.java index 3300afdc0..863482287 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/SimpleTokenType.java +++ b/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 { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java similarity index 81% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java index 367dd8f99..1ff9751f0 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimpleNamedElementImpl.java +++ b/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 { diff --git a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java similarity index 94% rename from simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java rename to simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java index 25ccc748c..3316985da 100644 --- a/simple_language_plugin/src/main/java/com/intellij/sdk/language/psi/impl/SimplePsiImplUtil.java +++ b/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 com.intellij.sdk.language.psi.*; +import org.intellij.sdk.language.SimpleIcons; +import org.intellij.sdk.language.psi.*; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/simple_language_plugin/src/main/resources/META-INF/plugin.xml b/simple_language_plugin/src/main/resources/META-INF/plugin.xml index f09d17ce4..048ca7664 100644 --- a/simple_language_plugin/src/main/resources/META-INF/plugin.xml +++ b/simple_language_plugin/src/main/resources/META-INF/plugin.xml @@ -3,7 +3,7 @@ - com.intellij.sdk.simple_language + org.intellij.sdk.simple_language SDK: Simple Language Sample Project @@ -40,28 +40,28 @@ IntelliJ Platform SDK - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java similarity index 96% rename from simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java rename to simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java index bcfd58774..53fcfb509 100644 --- a/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleCodeInsightTest.java +++ b/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() { diff --git a/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java similarity index 89% rename from simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java rename to simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java index b0a96d281..342aecc9c 100644 --- a/simple_language_plugin/src/test/java/com/intellij/sdk/language/SimpleParsingTest.java +++ b/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 diff --git a/simple_language_plugin/src/test/resources/AnnotatorTestData.java b/simple_language_plugin/src/test/testData/AnnotatorTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/AnnotatorTestData.java rename to simple_language_plugin/src/test/testData/AnnotatorTestData.java diff --git a/simple_language_plugin/src/test/resources/CompleteTestData.java b/simple_language_plugin/src/test/testData/CompleteTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/CompleteTestData.java rename to simple_language_plugin/src/test/testData/CompleteTestData.java diff --git a/simple_language_plugin/src/test/resources/DefaultTestData.simple b/simple_language_plugin/src/test/testData/DefaultTestData.simple similarity index 100% rename from simple_language_plugin/src/test/resources/DefaultTestData.simple rename to simple_language_plugin/src/test/testData/DefaultTestData.simple diff --git a/simple_language_plugin/src/test/resources/FindUsagesTestData.java b/simple_language_plugin/src/test/testData/FindUsagesTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/FindUsagesTestData.java rename to simple_language_plugin/src/test/testData/FindUsagesTestData.java diff --git a/simple_language_plugin/src/test/resources/FindUsagesTestData.simple b/simple_language_plugin/src/test/testData/FindUsagesTestData.simple similarity index 100% rename from simple_language_plugin/src/test/resources/FindUsagesTestData.simple rename to simple_language_plugin/src/test/testData/FindUsagesTestData.simple diff --git a/simple_language_plugin/src/test/resources/FoldingTestData.java b/simple_language_plugin/src/test/testData/FoldingTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/FoldingTestData.java rename to simple_language_plugin/src/test/testData/FoldingTestData.java diff --git a/simple_language_plugin/src/test/resources/FormatterTestData.simple b/simple_language_plugin/src/test/testData/FormatterTestData.simple similarity index 100% rename from simple_language_plugin/src/test/resources/FormatterTestData.simple rename to simple_language_plugin/src/test/testData/FormatterTestData.simple diff --git a/simple_language_plugin/src/test/resources/ParsingTestData.simple b/simple_language_plugin/src/test/testData/ParsingTestData.simple similarity index 100% rename from simple_language_plugin/src/test/resources/ParsingTestData.simple rename to simple_language_plugin/src/test/testData/ParsingTestData.simple diff --git a/simple_language_plugin/src/test/resources/ParsingTestData.txt b/simple_language_plugin/src/test/testData/ParsingTestData.txt similarity index 100% rename from simple_language_plugin/src/test/resources/ParsingTestData.txt rename to simple_language_plugin/src/test/testData/ParsingTestData.txt diff --git a/simple_language_plugin/src/test/resources/ReferenceTestData.java b/simple_language_plugin/src/test/testData/ReferenceTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/ReferenceTestData.java rename to simple_language_plugin/src/test/testData/ReferenceTestData.java diff --git a/simple_language_plugin/src/test/resources/RenameTestData.java b/simple_language_plugin/src/test/testData/RenameTestData.java similarity index 100% rename from simple_language_plugin/src/test/resources/RenameTestData.java rename to simple_language_plugin/src/test/testData/RenameTestData.java diff --git a/simple_language_plugin/src/test/resources/RenameTestData.simple b/simple_language_plugin/src/test/testData/RenameTestData.simple similarity index 100% rename from simple_language_plugin/src/test/resources/RenameTestData.simple rename to simple_language_plugin/src/test/testData/RenameTestData.simple diff --git a/simple_language_plugin/src/test/resources/RenameTestDataAfter.simple b/simple_language_plugin/src/test/testData/RenameTestDataAfter.simple similarity index 100% rename from simple_language_plugin/src/test/resources/RenameTestDataAfter.simple rename to simple_language_plugin/src/test/testData/RenameTestDataAfter.simple