Merge remote-tracking branch 'origin/v201' into v202

joutvhu · joutvhu · commit 7f0c8bc79cea · 2022-07-15T13:11:54.000+07:00
# Conflicts:
#	build.gradle
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.202.2
+
+- Support specify `workingDirectory` and `executeInTerminal` options.
+  ```yaml
+  scripts:
+    # With options
+    pod_install:
+      script: pod install   # Script text                        (required)
+      directory: ios        # Working directory                  (default: <project directory>)
+      terminal: true        # Should execute script in terminal? (default: false)
+  ```
+
+## 1.201.2
+
+- Support specify `workingDirectory` and `executeInTerminal` options.
+
 ## 1.221.1
 
 - Fix "No such file or directory" on MacOS
diff --git a/README.md b/README.md
@@ -15,3 +15,19 @@ Dart Scripts Runner will add a run button on each script line.
 Click that button to run the script.
 
 ![Edit run configuration](docs/images/dart-script-configuration.png)
+
+## Example
+
+```yaml
+scripts:
+  # Without options:
+  #   directory: <project directory>
+  #   terminal:  false
+  pub_get: flutter pub get
+
+  # With options
+  pod_install:
+    script: pod install   # Script text                        (required)
+    directory: ./ios      # Working directory                  (default: <project directory>)
+    terminal: true        # Should execute script in terminal? (default: false)
+```
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'com.joutvhu.jetbrains'
-version '1.202.1'
+version '1.202.2'
 
 sourceCompatibility = 11
 
diff --git a/docs/images/pubspec-scripts-running.png b/docs/images/pubspec-scripts-running.png
diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java b/src/main/java/com/joutvhu/intellij/dartscripts/PubspecLineMarkerProvider.java
@@ -18,14 +18,17 @@
 import org.jetbrains.yaml.psi.YAMLScalar;
 import org.jetbrains.yaml.psi.impl.YAMLBlockMappingImpl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class PubspecLineMarkerProvider extends RunLineMarkerProvider {
     public static final String SCRIPT_KEY = "scripts";
+    public static final String SCRIPT_TEXT_KEY = "script";
     public static final String PUBSPEC_FILE = "pubspec.yaml";
 
     @Override
     public LineMarkerInfo<?> getLineMarkerInfo(@NotNull PsiElement element) {
         if (element instanceof YAMLKeyValue &&
-                ((YAMLKeyValue) element).getValue() instanceof YAMLScalar &&
                 element.getParent() instanceof YAMLBlockMappingImpl &&
                 element.getParent().getParent() instanceof YAMLKeyValue) {
             YAMLKeyValue scriptsElement = (YAMLKeyValue) element.getParent().getParent();
@@ -38,7 +41,9 @@ public LineMarkerInfo<?> getLineMarkerInfo(@NotNull PsiElement element) {
                     if (doc.getParent() instanceof YAMLFile) {
                         VirtualFile file = ((YAMLFile) doc.getParent()).getVirtualFile();
                         if (!file.isDirectory() && PUBSPEC_FILE.equals(file.getName())) {
-                            return createMarkerInfo((YAMLKeyValue) element);
+                            Map<String, String> params = getActionParams((YAMLKeyValue) element);
+                            if (params != null && params.containsKey(SCRIPT_TEXT_KEY))
+                                return createMarkerInfo((YAMLKeyValue) element);
                         }
                     }
                 }
@@ -54,4 +59,21 @@ private LineMarkerInfo<?> createMarkerInfo(YAMLKeyValue element) {
         actionGroup.add(new LineMarkerActionWrapper(element, action));
         return new RunLineMarkerInfo(element, AllIcons.Actions.Execute, psiElement -> "", actionGroup);
     }
+
+    public static Map<String, String> getActionParams(YAMLKeyValue element) {
+        Map<String, String> params = new HashMap<>();
+        if (element.getValue() instanceof YAMLScalar) {
+            params.put(SCRIPT_TEXT_KEY, ((YAMLScalar) element.getValue()).getTextValue());
+            return params;
+        } else if (element.getValue() instanceof YAMLBlockMappingImpl) {
+            YAMLBlockMappingImpl childBlock = (YAMLBlockMappingImpl) element.getValue();
+            for (PsiElement child = childBlock.getFirstChild(); child != null; child = child.getNextSibling()) {
+                if (child instanceof YAMLKeyValue && ((YAMLKeyValue) child).getValue() instanceof YAMLScalar) {
+                    params.put(((YAMLKeyValue) child).getKeyText(), ((YAMLKeyValue) child).getValueText());
+                }
+            }
+            return params;
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java b/src/main/java/com/joutvhu/intellij/dartscripts/action/PubspecRunScriptAction.java
@@ -13,16 +13,21 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.joutvhu.intellij.dartscripts.LineMarkerActionWrapper;
+import com.joutvhu.intellij.dartscripts.PubspecLineMarkerProvider;
 import com.joutvhu.intellij.dartscripts.run.PubspecTerminalHelper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.yaml.psi.YAMLFile;
 import org.jetbrains.yaml.psi.YAMLKeyValue;
 
 import javax.swing.*;
+import java.nio.file.Paths;
+import java.util.Map;
 
 public class PubspecRunScriptAction extends AnAction {
     public static final String ID = "runPubspecScriptAction";
+    public static final String DIRECTORY_KEY = "directory";
+    public static final String TERMINAL_KEY = "terminal";
 
     public PubspecRunScriptAction(
             @Nullable @NlsActions.ActionText String text,
@@ -38,12 +43,36 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         PsiFile file = e.getData(CommonDataKeys.PSI_FILE);
         YAMLKeyValue element = getElement(e);
         if (project != null && file instanceof YAMLFile && element != null) {
-            PubspecTerminalHelper.runScript(
-                    this.getExecutor(),
-                    e.getData(CommonDataKeys.PROJECT),
-                    element.getKeyText(),
-                    element.getValueText(),
-                    file.getVirtualFile().getParent().getPath());
+            Map<String, String> params = PubspecLineMarkerProvider.getActionParams(element);
+            if (params != null) {
+                String scriptText = params.get(PubspecLineMarkerProvider.SCRIPT_TEXT_KEY);
+                if (scriptText != null) {
+                    String workingDirectory = file.getVirtualFile().getParent().getPath();
+                    if (params.containsKey(DIRECTORY_KEY)) {
+                        workingDirectory = Paths.get(workingDirectory)
+                                .resolve(params.get(DIRECTORY_KEY))
+                                .normalize()
+                                .toAbsolutePath()
+                                .toString();
+                    }
+                    Boolean executeInTerminal = null;
+                    if (params.containsKey(TERMINAL_KEY)) {
+                        String terminalOption = params.get(TERMINAL_KEY);
+                        if ("true".equalsIgnoreCase(terminalOption) || "yes".equalsIgnoreCase(terminalOption))
+                            executeInTerminal = true;
+                        if ("false".equalsIgnoreCase(terminalOption) || "no".equalsIgnoreCase(terminalOption))
+                            executeInTerminal = false;
+                    }
+
+                    PubspecTerminalHelper.runScript(
+                            this.getExecutor(),
+                            e.getData(CommonDataKeys.PROJECT),
+                            element.getKeyText(),
+                            scriptText,
+                            workingDirectory,
+                            executeInTerminal);
+                }
+            }
         }
     }
 
diff --git a/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java b/src/main/java/com/joutvhu/intellij/dartscripts/run/PubspecTerminalHelper.java
@@ -17,7 +17,8 @@ public RunConfiguration runScript(
             Project project,
             String name,
             String script,
-            String workingDirectory
+            String workingDirectory,
+            Boolean executeInTerminal
     ) {
         RunManager runManager = RunManager.getInstance(project);
         DartScriptConfigurationType configurationType = ConfigurationTypeUtil
@@ -33,7 +34,7 @@ public RunConfiguration runScript(
 
         DartScriptRunConfiguration runConfiguration = (DartScriptRunConfiguration) configurationSettings.getConfiguration();
         runConfiguration.setScriptText(script);
-        runConfiguration.setExecuteInTerminal(false);
+        runConfiguration.setExecuteInTerminal(Boolean.TRUE.equals(executeInTerminal));
         runConfiguration.setScriptWorkingDirectory(workingDirectory);
 
         ExecutionEnvironmentBuilder builder = ExecutionEnvironmentBuilder

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`group 'com.joutvhu.jetbrains'`
`7`		`-version '1.202.1'`
	`7`	`+version '1.202.2'`
`8`	`8`
`9`	`9`	`sourceCompatibility = 11`
`10`	`10`