diff options
Diffstat (limited to 'sd-plugin/src/main/java/org')
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java | 1 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java | 2 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java | 18 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java (renamed from sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java) | 4 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex | 2 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java | 2 | ||||
-rw-r--r-- | sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf | 4 |
7 files changed, 24 insertions, 9 deletions
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java b/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java index aaceaaa02cd..7ff108fc8f6 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/SdSyntaxHighlighter.java @@ -10,6 +10,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 org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdTypes; import org.jetbrains.annotations.NotNull; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java index 56aaae6d02a..e3eb6b431c7 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdFindUsagesProvider.java @@ -7,7 +7,7 @@ import com.intellij.lang.findUsages.FindUsagesProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.tree.TokenSet; -import org.intellij.sdk.language.SdLexerAdapter; +import org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdDeclaration; import org.intellij.sdk.language.psi.SdIdentifierVal; import org.intellij.sdk.language.psi.SdIdentifierWithDashVal; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java index 0423db89cd6..b67c561e8d4 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/findUsages/SdUsageGroup.java @@ -9,6 +9,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.usages.UsageGroup; +import com.intellij.usages.UsageView; import org.intellij.sdk.language.psi.SdDeclaration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +60,8 @@ public class SdUsageGroup implements UsageGroup { @Override public int compareTo(@NotNull UsageGroup usageGroup) { - return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText()); +// return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText()); + return getText(null).compareTo(usageGroup.getText(null)); } @Override @@ -91,6 +93,18 @@ public class SdUsageGroup implements UsageGroup { return myIcon; } + // here because JetBrains asked: + + @SuppressWarnings("deprecation") + public Icon getIcon(boolean isOpen) { + return myIcon; + } + + @SuppressWarnings("deprecation") + public String getText(UsageView view) { + return myText; + } + @Override - public void update() {} // here because JetBrains asked + public void update() {} } diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java index 58329222a19..c7463fc9823 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/SdLexerAdapter.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/SdLexerAdapter.java @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package org.intellij.sdk.language; +package org.intellij.sdk.language.lexer; import com.intellij.lexer.FlexAdapter; @@ -10,6 +10,6 @@ import com.intellij.lexer.FlexAdapter; public class SdLexerAdapter extends FlexAdapter { public SdLexerAdapter() { - super(new org.intellij.sdk.language.SdLexer(null)); + super(new SdLexer(null)); } } diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex index 47dddb9c33f..235b494cb0e 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/lexer/sd.flex @@ -1,4 +1,4 @@ -package org.intellij.sdk.language; +package org.intellij.sdk.language.lexer; import com.intellij.lexer.FlexLexer; import com.intellij.psi.tree.IElementType; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java index fbaa8d0cac5..0497f0b4960 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/SdParserDefinition.java @@ -13,7 +13,7 @@ import com.intellij.psi.TokenType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.intellij.sdk.language.SdLanguage; -import org.intellij.sdk.language.SdLexerAdapter; +import org.intellij.sdk.language.lexer.SdLexerAdapter; import org.intellij.sdk.language.psi.SdFile; import org.intellij.sdk.language.psi.SdTypes; import org.jetbrains.annotations.NotNull; diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf index 6ae9d26729c..c8c7af8ade8 100644 --- a/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf +++ b/sd-plugin/src/main/java/org/intellij/sdk/language/parser/sd.bnf @@ -52,8 +52,8 @@ SchemaFieldDefinition ::= field IdentifierVal type FieldTypeName '{' SchemaField implements=["org.intellij.sdk.language.psi.SdDeclaration" "org.intellij.sdk.language.psi.SdNamedElement"] } -FieldTypeName ::= "array" '<' (FieldTypeName | IdentifierVal) '>' | "weightedset" '<' SingleValueFieldTypeName '>'| - "map" '<' (FieldTypeName | IdentifierVal) ',' (FieldTypeName | IdentifierVal) '>' | TensorType | +FieldTypeName ::= ("array" '<' (FieldTypeName | IdentifierVal) '>') | ("weightedset" '<' SingleValueFieldTypeName '>') | + ("map" '<' (FieldTypeName | IdentifierVal) ',' (FieldTypeName | IdentifierVal) '>') | TensorType | SingleValueFieldTypeName private SingleValueFieldTypeName ::= "string" | "int" | "long" | "bool" | "byte" | "float" | "double" | "position" | "predicate" | "raw" | "uri" | "reference" '<' IdentifierVal '>' | "annotationreference" '<' IdentifierVal '>' | IdentifierVal |