v1.201.0

Author: joutvhu

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.joutvhu.jetbrains'
-version '1.202.0'
+version '1.201.0'
 
 sourceCompatibility = 11
 
@@ -23,7 +23,7 @@ dependencies {
 }
 
 intellij {
-    version = '2020.2'
+    version = '2020.1'
     plugins = [
             'org.jetbrains.plugins.terminal',
             'org.jetbrains.plugins.yaml'

src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java

@@ -130,7 +130,7 @@ public boolean canMergeWith(@NotNull MergeableLineMarkerInfo<?> info) {
         }
 
         @Override
-        public Icon getCommonIcon(@NotNull List<? extends MergeableLineMarkerInfo<?>> infos) {
+        public Icon getCommonIcon(@NotNull List<MergeableLineMarkerInfo> infos) {
             return getIcon();
         }
     }

src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java

@@ -2,19 +2,18 @@
 
 import com.intellij.execution.Executor;
 import com.intellij.execution.executors.DefaultRunExecutor;
-import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.NlsActions;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.joutvhu.intellij.dartscripts.PubspecLineMarkerProvider;
 import com.joutvhu.intellij.dartscripts.run.PubspecTerminalHelper;
+import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.yaml.psi.YAMLFile;
@@ -26,8 +25,8 @@ public class PubspecRunScriptAction extends AnAction {
     public static final String ID = "runPubspecScriptAction";
 
     public PubspecRunScriptAction(
-            @Nullable @NlsActions.ActionText String text,
-            @Nullable @NlsActions.ActionDescription String description,
+            @Nullable @Nls(capitalization = Nls.Capitalization.Title) String text,
+            @Nullable @Nls(capitalization = Nls.Capitalization.Sentence) String description,
             @Nullable Icon icon
     ) {
         super(text, description, icon);
@@ -79,7 +78,9 @@ private static YAMLKeyValue getElement(@NotNull AnActionEvent e) {
     }
 
     @Override
-    public @Nullable @NlsActions.ActionText String getTemplateText() {
+    @Nullable
+    @Nls(capitalization = Nls.Capitalization.Title)
+    public String getTemplateText() {
         return super.getTemplateText();
     }
 }

src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptRunner.java

@@ -1,15 +1,14 @@
 package com.joutvhu.intellij.dartscripts.run;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.NlsContexts;
 import org.jetbrains.annotations.NotNull;
 
 public interface DartScriptRunner {
     void run(
             @NotNull Project project,
             @NotNull String command,
             @NotNull String workingDirectory,
-            @NotNull @NlsContexts.TabTitle String title,
+            @NotNull String title,
             boolean activateToolWindow
     );
 

src/main/java/com/joutvhu/intellij/dartscripts/run/DartScriptTerminalRunner.java

@@ -2,7 +2,6 @@
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.NlsContexts;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
@@ -27,7 +26,7 @@ public void run(
             @NotNull Project project,
             @NotNull String command,
             @NotNull String workingDirectory,
-            @NotNull @NlsContexts.TabTitle String title,
+            @NotNull String title,
             boolean activateToolWindow
     ) {
         TerminalView terminalView = TerminalView.getInstance(project);