Remover deprecated API

sbtqa · Apr 23, 2023 · 9d6e9bf · 9d6e9bf
1 parent deec985
commit 9d6e9bf
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 allprojects {
 
     group = "ru.sbtqa.tag"
-    version = "1.5.9"
+    version = "1.5.10"
 
     repositories {
         mavenCentral()
@@ -50,6 +50,6 @@ tasks {
 
     patchPluginXml {
         changeNotes.set("""
-      Added support for 2023.1""")
+      Updated deprecated API""")
     }
 }
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -90,7 +90,7 @@
     <spellchecker.support language="Gherkin" implementationClass="ru.sbtqa.tag.spellchecker.GherkinSpellcheckerStrategy"/>
     <lang.inspectionSuppressor language="Gherkin" implementationClass="ru.sbtqa.tag.cucumber.inspections.model.GherkinInspectionSuppressor"/>
 
-    <liveTemplateContext implementation="ru.sbtqa.tag.cucumber.GherkinLiveTemplateContextType"/>
+    <liveTemplateContext implementation="ru.sbtqa.tag.cucumber.GherkinLiveTemplateContextType" contextId="CUCUMBER_FEATURE_FILE"/>
 
     <extendWordSelectionHandler implementation="ru.sbtqa.tag.cucumber.actions.GherkinStepParameterSelectioner"/>
 

diff --git a/src/ru/sbtqa/tag/cucumber/GherkinLiveTemplateContextType.java b/src/ru/sbtqa/tag/cucumber/GherkinLiveTemplateContextType.java
@@ -16,10 +16,11 @@ public class GherkinLiveTemplateContextType extends TemplateContextType {
   @NonNls
   private static final String CONTEXT_NAME = "CUCUMBER_FEATURE_FILE";
 
-  public GherkinLiveTemplateContextType() {
-    super(CONTEXT_NAME, CucumberBundle.message("live.templates.context.cucumber.name"));
+  protected GherkinLiveTemplateContextType() {
+    super(CucumberBundle.message("live.templates.context.cucumber.name"));
   }
 
+
   @Override
   public boolean isInContext(TemplateActionContext templateActionContext) {
     return templateActionContext.getFile() instanceof  GherkinFileImpl;

diff --git a/src/ru/sbtqa/tag/cucumber/java/CucumberJava8Extension.java b/src/ru/sbtqa/tag/cucumber/java/CucumberJava8Extension.java
@@ -60,7 +60,10 @@ public StepDefinitionCreator getStepDefinitionCreator() {
     @Override
     public List<AbstractStepDefinition> loadStepsFor(@Nullable PsiFile featureFile, @NotNull Module module) {
         DaemonProgressIndicator progressIndicator = new DaemonProgressIndicator();
-        progressIndicator.setText("Loading steps for" + featureFile.getName());
+
+        progressIndicator.setText("Loading steps for " + (featureFile == null
+                ? "unexpected feature file"
+                : featureFile.getName()));
         List<AbstractStepDefinition> definitions = new ArrayList<>();
 
         try {
@@ -76,7 +79,7 @@ public List<AbstractStepDefinition> loadStepsFor(@Nullable PsiFile featureFile,
                 return result;
             }, progressIndicator));
         } finally {
-            progressIndicator.dispose();
+            progressIndicator.cancel();
         }
         return definitions;
     }

diff --git a/src/ru/sbtqa/tag/cucumber/java/CucumberJavaUtil.java b/src/ru/sbtqa/tag/cucumber/java/CucumberJavaUtil.java
@@ -290,7 +290,7 @@ public static MapParameterTypeManager getAllParameterTypes(@NotNull Module modul
                         CachedValueProvider.Result
                                 .create(doGetAllParameterTypes(module), PsiModificationTracker.MODIFICATION_COUNT)), progressIndicator);
             } finally {
-                progressIndicator.dispose();
+                progressIndicator.cancel();
             }
         }
 
@@ -315,8 +315,7 @@ private static MapParameterTypeManager doGetAllParameterTypes(@NotNull Module mo
         Map<String, SmartPsiElementPointer<PsiElement>> declarations = new HashMap<>();
         for (UsageInfo ui : processor.getResults()) {
             PsiElement element = ui.getElement();
-            if (element != null && element.getParent() instanceof PsiNewExpression) {
-                PsiNewExpression newExpression = (PsiNewExpression) element.getParent();
+            if (element != null && element.getParent() instanceof PsiNewExpression newExpression) {
                 PsiExpressionList arguments = newExpression.getArgumentList();
                 if (arguments != null) {
                     PsiExpression[] expressions = arguments.getExpressions();

diff --git a/src/ru/sbtqa/tag/cucumber/java/steps/search/CucumberJavaPomDeclarationSearcher.java b/src/ru/sbtqa/tag/cucumber/java/steps/search/CucumberJavaPomDeclarationSearcher.java
@@ -26,10 +26,7 @@ private static boolean isFirstConstructorArgument(@NotNull PsiElement element, @
             return false;
         }
 
-        if (argumentList.getExpressions()[0] != element) {
-            return false;
-        }
-        return true;
+        return argumentList.getExpressions()[0] == element;
     }
 
     @Override
@@ -39,10 +36,9 @@ public void findDeclarationsAt(@NotNull PsiElement element, int offsetInElement,
         }
 
         Object value = ((PsiLiteralExpression) element).getValue();
-        if (!(value instanceof String)) {
+        if (!(value instanceof String stringValue)) {
             return;
         }
-        String stringValue = (String) value;
 
         PsiNewExpression newExp = PsiTreeUtil.getParentOfType(element, PsiNewExpression.class);
         if (newExp != null) {

diff --git a/src/ru/sbtqa/tag/cucumber/psi/GherkinFoldingBuilder.java b/src/ru/sbtqa/tag/cucumber/psi/GherkinFoldingBuilder.java
@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author yole
@@ -25,10 +26,10 @@ public class GherkinFoldingBuilder implements FoldingBuilder, DumbAware {
 
   @Override
   @NotNull
-  public FoldingDescriptor[] buildFoldRegions(@NotNull ASTNode node, @NotNull Document document) {
+  public FoldingDescriptor @NotNull [] buildFoldRegions(@NotNull ASTNode node, @NotNull Document document) {
     List<FoldingDescriptor> descriptors = new ArrayList<>();
     appendDescriptors(node, descriptors);
-    return descriptors.toArray(FoldingDescriptor.EMPTY);
+    return descriptors.toArray(FoldingDescriptor.EMPTY_ARRAY);
   }
 
   private void appendDescriptors(ASTNode node, List<FoldingDescriptor> descriptors) {
@@ -46,7 +47,7 @@ private void appendDescriptors(ASTNode node, List<FoldingDescriptor> descriptors
   public String getPlaceholderText(@NotNull ASTNode node) {
     if (node.getPsi() instanceof GherkinStepsHolder ||
         node.getPsi() instanceof GherkinExamplesBlockImpl) {
-      return ((NavigationItem) node.getPsi()).getPresentation().getPresentableText();
+      return Objects.requireNonNull(((NavigationItem) node.getPsi()).getPresentation()).getPresentableText();
     }
     return "...";
   }

diff --git a/src/ru/sbtqa/tag/cucumber/psi/GherkinKeywordList.java b/src/ru/sbtqa/tag/cucumber/psi/GherkinKeywordList.java
@@ -7,6 +7,7 @@
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -15,8 +16,8 @@
 */
 public class GherkinKeywordList {
   // maps custom language keyword to base (English) keyword
-  private final Map<String, String> myKeyword2BaseNameTable = new THashMap<>();
-  private final Set<String> myKeywordsWithNoSpaceAfter = new THashSet<>();
+  private final Map<String, String> myKeyword2BaseNameTable = new HashMap<>();
+  private final Set<String> myKeywordsWithNoSpaceAfter = new HashSet<>();
   private final GherkinKeywordTable myKeywordsTable = new GherkinKeywordTable();
 
   public GherkinKeywordList() {
@@ -47,7 +48,7 @@ else if (!key.equals("name") && !key.equals("native") && !key.equals("encoding")
         }
       }
       if (forceSpaceAfterKeyword != null) {
-        if (forceSpaceAfterKeyword.booleanValue()) {
+        if (forceSpaceAfterKeyword) {
           myKeywordsWithNoSpaceAfter.clear();
         }
         else {