From eb1b9e27dcb38bb560c393b839f5d4ae1f3be925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 7 Sep 2022 17:42:34 +0200 Subject: [PATCH] simple language: add SimpleTokenSets (IJSDK-1533) --- .../sdk/language/SimpleFindUsagesProvider.java | 6 +++--- .../sdk/language/SimpleParserDefinition.java | 5 ++--- .../intellij/sdk/language/psi/SimpleTokenSets.java | 13 +++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenSets.java diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java index 1a631b73c..c1c456547 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java @@ -9,7 +9,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.tree.TokenSet; import org.intellij.sdk.language.psi.SimpleProperty; -import org.intellij.sdk.language.psi.SimpleTypes; +import org.intellij.sdk.language.psi.SimpleTokenSets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,8 +19,8 @@ public class SimpleFindUsagesProvider implements FindUsagesProvider { @Override public WordsScanner getWordsScanner() { return new DefaultWordsScanner(new SimpleLexerAdapter(), - TokenSet.create(SimpleTypes.KEY), - TokenSet.create(SimpleTypes.COMMENT), + SimpleTokenSets.IDENTIFIERS, + SimpleTokenSets.COMMENTS, TokenSet.EMPTY); } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java index a2a2b7549..737921040 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleParserDefinition.java @@ -14,13 +14,12 @@ import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.intellij.sdk.language.parser.SimpleParser; import org.intellij.sdk.language.psi.SimpleFile; +import org.intellij.sdk.language.psi.SimpleTokenSets; import org.intellij.sdk.language.psi.SimpleTypes; import org.jetbrains.annotations.NotNull; public class SimpleParserDefinition implements ParserDefinition { - public static final TokenSet COMMENTS = TokenSet.create(SimpleTypes.COMMENT); - public static final IFileElementType FILE = new IFileElementType(SimpleLanguage.INSTANCE); @NotNull @@ -32,7 +31,7 @@ public class SimpleParserDefinition implements ParserDefinition { @NotNull @Override public TokenSet getCommentTokens() { - return COMMENTS; + return SimpleTokenSets.COMMENTS; } @NotNull diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenSets.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenSets.java new file mode 100644 index 000000000..44a4d9a9d --- /dev/null +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/psi/SimpleTokenSets.java @@ -0,0 +1,13 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. + +package org.intellij.sdk.language.psi; + +import com.intellij.psi.tree.TokenSet; + +public interface SimpleTokenSets { + + TokenSet IDENTIFIERS = TokenSet.create(SimpleTypes.KEY); + + TokenSet COMMENTS = TokenSet.create(SimpleTypes.COMMENT); + +}