Merge branch 'master' of github.com:Luke-zhang-04/processing-vscode

Author: Luke-zhang-04

README.md

@@ -85,7 +85,8 @@ Installing this extension will add the following commands to your command pallet
     -   Use the pallet command "Processing: Open Documentation for Selection" to open the processing documentation for the current selection.
     -   By default uses processing.org's documentation. Can change to p5js's if preferred using the `processing.docs` setting.
 -   Run
-    -   Runs the current Processing project (from current working directory). Will automatically detect if the project is Processing Java or Python
+    -   Runs the current Processing project (from current working directory). Will automatically detect if the project is Processing Java or Python.
+    -   If the setting `processing.shouldSendSigint` is set to `true`, run will interrupt the current running processing program before running the new one.
 -   RunJava
     -   Runs the current Processing Java project (from CWD)
 -   RunPy
@@ -119,5 +120,5 @@ This extension attempts to make Processing with Python easier to use. Follow the
 
 ## Development
 
-- Run `yarn vsce package`
-- Run `code --install-extension processing-vscode-<VERSION>.vsix`
+-   Run `yarn vsce package`
+-   Run `code --install-extension processing-vscode-<VERSION>.vsix`

package.json

@@ -24,7 +24,7 @@
   "keywords": [
     "processing",
     "pde",
-    "procesing.py",
+    "processing.py",
     "processing-python",
     "language",
     "snippets",
@@ -205,7 +205,12 @@
         "processing.shouldGiveDiagnostics": {
           "type": "boolean",
           "default": false,
-          "description": "If the extension should provide diagnostics (via processing-java)"
+          "description": "If the extension should provide diagnostics (via processing-java). Note that this feature is quite slow."
+        },
+        "processing.shouldSendSigint": {
+          "type": "boolean",
+          "default": false,
+          "description": "If the extension should send sigint to the terminal stop the current running processing program before running the new one by sending \"\\x03\" (^C). If true, it essentially presses ctrl+c for you."
         },
         "processing.runPathQuotes": {
           "type": "string",
@@ -224,7 +229,7 @@
         "processing.py.javaPath": {
           "type": "string",
           "default": "java",
-          "description": "Path to Java. Leave default if you've added java to your path, otherwise enter the path to `java` here. Example: `/usr/bin/java` for Unix, or `C:\\Program Files\\Java\\jdk1.8.0_202\\bin\\javac.exe` for Windows."
+          "description": "Path to Java. Leave default if you've added java to your path, otherwise enter the path to `java` here. Example: `/usr/bin/java` for Unix, or potentially `C:\\Program Files\\Java\\jdk1.8.0_202\\bin\\javac.exe` for Windows."
         },
         "processing.py.isEnabled": {
           "type": "boolean",

src/commands/run.ts

@@ -4,7 +4,13 @@
  * @copyright (C) 2021 Luke Zhang
  */
 
-import {jarPath, javaCommand, processingCommand, shouldAlwaysQuotePath} from "../config"
+import {
+    jarPath,
+    javaCommand,
+    processingCommand,
+    shouldAlwaysQuotePath,
+    shouldSendSigint,
+} from "../config"
 import path, {dirname} from "path"
 import {isValidProcessingProject} from "../utils"
 import vscode from "vscode"
@@ -76,7 +82,10 @@ class RunManager {
      * @param editor - Vscode text editor
      */
     private _runJavaMode = (editor: vscode.TextEditor): void => {
-        const currentTerminal = this._getTerminal("_terminal", "Processing")
+        const terminalName = "_terminal"
+        const hasTerminal =
+            this[terminalName] !== undefined && this[terminalName]?.exitStatus === undefined
+        const currentTerminal = this._getTerminal(terminalName, "Processing")
 
         let sketchName = dirname(editor.document.fileName)
         const isValidProjectName = isValidProcessingProject(sketchName.split(path.sep).pop())
@@ -95,7 +104,9 @@ class RunManager {
         }
 
         // If file is a processing project file
-        const cmd = `${processingCommand} --sketch=${sketchName} --run`
+        const cmd = `${
+            hasTerminal && shouldSendSigint ? "\x03" : ""
+        }${processingCommand} --sketch=${sketchName} --run`
 
         currentTerminal.sendText(cmd)
     }
@@ -106,12 +117,17 @@ class RunManager {
      * @param editor - Vscode text editor
      */
     private _runPythonMode = (editor: vscode.TextEditor): void => {
-        const currentTerminal = this._getTerminal("_pythonTerminal", "Processing-py")
+        const terminalName = "_terminal"
+        const hasTerminal =
+            this[terminalName] !== undefined && this[terminalName]?.exitStatus === undefined
+        const currentTerminal = this._getTerminal(terminalName, "Processing-py")
 
         currentTerminal.show()
 
         // If file is a processing project file
-        const cmd = `${javaCommand} -jar ${pythonUtils.getJarFilename()} ${pythonUtils.getProjectFilename(
+        const cmd = `${
+            hasTerminal && shouldSendSigint ? "\x03" : ""
+        }${javaCommand} -jar ${pythonUtils.getJarFilename()} ${pythonUtils.getProjectFilename(
             editor.document,
         )}`
 

src/config.ts

@@ -16,7 +16,7 @@ const getProcessingCommand = (): string => {
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return "processing-java"
     }
 
     return config
@@ -32,7 +32,7 @@ const getJavaCommand = (): string => {
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return "java"
     }
 
     return config
@@ -48,13 +48,13 @@ const getJarPath = (): string => {
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return "processing-py.jar"
     }
 
     return config
 }
 
-const getPythonEnablement = (): boolean => {
+const getShouldEnablePython = (): boolean => {
     const isEnabled = vscode.workspace
         .getConfiguration()
         .get<boolean>("processing.py.isEnabled", true)
@@ -64,14 +64,14 @@ const getPythonEnablement = (): boolean => {
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return true
     }
 
     return isEnabled
 }
 
-type DocOptions = "processing.org" | "p5js.org" | "py.processing.org" | "auto"
 type SearchEngines = "Google" | "DuckDuckGo"
+type DocOptions = "processing.org" | "p5js.org" | "py.processing.org" | "auto"
 
 const getSearchConfig = (): {searchEngine: SearchEngines; processingDocs: DocOptions} => {
     const config = vscode.workspace.getConfiguration("processing")
@@ -84,13 +84,13 @@ const getSearchConfig = (): {searchEngine: SearchEngines; processingDocs: DocOpt
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return {searchEngine: "Google", processingDocs: "auto"}
     } else if (!["Google", "DuckDuckGo"].includes(searchEngine)) {
         const msg = 'Config option processing.search must be "Google" | "DuckDuckGo"'
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return {searchEngine: "Google", processingDocs: "auto"}
     }
 
     return {
@@ -105,11 +105,11 @@ const getshouldEnableDiagnostics = (): boolean => {
         .get<boolean>("processing.shouldGiveDiagnostics", true)
 
     if (typeof shouldGiveDiagnostics !== "boolean") {
-        const msg = "Config option processing.shouldGiveDiagnostics must be of type string"
+        const msg = "Config option processing.shouldGiveDiagnostics must be of type boolean"
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return true
     }
 
     return shouldGiveDiagnostics
@@ -125,26 +125,44 @@ const getQuoteEnablement = (): boolean => {
 
         vscode.window.showErrorMessage(msg)
 
-        throw new Error(msg)
+        return false
     }
 
     return shouldQuotePath === "always"
 }
 
-export const processingCommand = getProcessingCommand()
-export const javaCommand = getJavaCommand()
-export const jarPath = getJarPath()
-export const shouldEnablePython = getPythonEnablement()
-export const searchConfig = getSearchConfig()
-export const shouldEnableDiagnostics = getshouldEnableDiagnostics()
-export const shouldAlwaysQuotePath = getQuoteEnablement()
-
-export default {
-    processingCommand,
-    javaCommand,
-    jarPath,
-    shouldEnablePython,
-    searchConfig,
-    shouldEnableDiagnostics,
-    shouldAlwaysQuotePath,
+const getShouldSendSigint = (): boolean => {
+    const isEnabled = vscode.workspace
+        .getConfiguration()
+        .get<boolean>("processing.shouldSendSigint", false)
+
+    if (typeof isEnabled !== "boolean") {
+        const msg = "Config option processing.shouldSendSigint must be of type boolean"
+
+        vscode.window.showErrorMessage(msg)
+
+        throw new Error(msg)
+    }
+
+    return isEnabled
 }
+
+export let processingCommand = getProcessingCommand()
+export let javaCommand = getJavaCommand()
+export let jarPath = getJarPath()
+export let shouldEnablePython = getShouldEnablePython()
+export let searchConfig = getSearchConfig()
+export let shouldEnableDiagnostics = getshouldEnableDiagnostics()
+export let shouldAlwaysQuotePath = getQuoteEnablement()
+export let shouldSendSigint = getShouldSendSigint()
+
+vscode.workspace.onDidChangeConfiguration(() => {
+    processingCommand = getProcessingCommand()
+    javaCommand = getJavaCommand()
+    jarPath = getJarPath()
+    shouldEnablePython = getShouldEnablePython()
+    searchConfig = getSearchConfig()
+    shouldEnableDiagnostics = getshouldEnableDiagnostics()
+    shouldAlwaysQuotePath = getQuoteEnablement()
+    shouldSendSigint = getShouldSendSigint()
+})