Merge branch 'develop' into fix-149

.eslintrc.json

@@ -21,7 +21,11 @@
     "prefer-regex-literals": "warn",
     "require-await": "warn",
     "camelcase": "error",
+    "no-invalid-regexp": "off",
     "@typescript-eslint/no-var-requires": "warn",
-    "no-param-reassign": "warn" // Disable reassign, since this basically means you override the reference from the caller function with a new local version. (It doesn't do what you expect)
+    "no-param-reassign": "warn", // Disable reassign, since this basically means you override the reference from the caller function with a new local version. (It doesn't do what you expect)
+    "@typescript-eslint/no-namespace": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "@typescript-eslint/no-unused-vars": "off"
   }
 }

.github/dependabot.yml

@@ -3,13 +3,19 @@
 
 version: 2
 updates:
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: weekly
+    commit-message:
+      prefix: deps
+  # NPM
   - package-ecosystem: "npm"
     directory: "/"
     schedule:
       interval: monthly
     ignore:
       - dependency-name: "@types/vscode"
-    assignees:
-      - LuqueDaniel
     commit-message:
       prefix: deps

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

.github/workflows/pr-check.yml

@@ -2,6 +2,10 @@ name: PR Check
 
 on:
   pull_request:
+    types: [synchronize, opened, reopened, edited]
+    branches:
+      - master
+      - develop
 
 env:
   NODE_VERSION: 16
@@ -12,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/setup
         with:
@@ -25,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/setup
         with:
@@ -38,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/setup
         with:

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     name: Publish Extension
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: 16

.gitignore

@@ -3,3 +3,4 @@ node_modules
 out
 dist
 *.vsix
+dist/*

.prettierignore

@@ -3,4 +3,7 @@
 **/dist
 
 # Ignore all markdown files:
-*.md
+*.md
+
+# Ignore all generated typescript files:
+*.g.ts

.vscode/extensions.json

@@ -1,5 +1,5 @@
 {
   // See http://go.microsoft.com/fwlink/?LinkId=827846
   // for the documentation about the extensions.json format
-  "recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "ms-vscode.vscode-js-profile-flame"]
+  "recommendations": [ "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "ms-vscode.vscode-js-profile-flame" ]
 }

.vscode/launch.json

@@ -14,8 +14,9 @@
         "--extensionDevelopmentPath=${workspaceFolder}",
         "${workspaceFolder}/examples" // open examples directory
       ],
-      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "npm: watch"
+      "outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
+      "preLaunchTask": "npm: watch",
+      "skipFiles": [ "<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**", "**/node/extensionHostProcess.js" ]
     },
     {
       "name": "Launch Extension (Release)",
@@ -26,17 +27,19 @@
         "--extensionDevelopmentPath=${workspaceFolder}",
         "${workspaceFolder}/examples" // open examples directory
       ],
-      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "npm: watch-release"
+      "outFiles": [ "${workspaceFolder}/dist/**/*.js" ],
+      "preLaunchTask": "npm: watch-release",
+      "skipFiles": [ "<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**" ]
     },
     {
       "name": "Extension Tests",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test"],
-      "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-      "preLaunchTask": "npm: test-compile"
+      "args": [ "--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test" ],
+      "outFiles": [ "${workspaceFolder}/out/test/**/*.js" ],
+      "preLaunchTask": "npm: test-compile",
+      "skipFiles": [ "<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**" ]
     }
   ]
 }

.vscode/settings.json

@@ -14,11 +14,14 @@
   "editor.formatOnPaste": false,
   "editor.formatOnSave": true,
 
+  "json.format.enable": true,
+  "json.format.keepLines": true,
+
   "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.json-language-features"
   },
   "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.json-language-features"
   },
   "[python]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -27,5 +30,189 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
 
-  "eslint.validate": ["javascript", "typescript"]
+  "eslint.validate": [
+    "javascript",
+    "typescript"
+  ],
+  "cSpell.words": [
+    "Ren'Py",
+    "rpyc",
+    "Uncompiled"
+  ],
+
+  "editor.tokenColorCustomizations": {
+    "[*Light*]": {
+      "textMateRules": [
+        {
+          "scope": "ref.matchtext",
+          "settings": {
+            "foreground": "#000"
+          }
+        }
+      ]
+    },
+    "[*Dark*]": {
+      "textMateRules": [
+        {
+          "scope": "ref.matchtext",
+          "settings": {
+            "foreground": "#fff"
+          }
+        }
+      ]
+    },
+    "textMateRules": [
+      {
+        "scope": "renpy.meta.plain",
+        "settings": {
+          "fontStyle": ""
+        }
+      },
+      {
+        "scope": "renpy.meta.i",
+        "settings": {
+          "fontStyle": "italic"
+        }
+      },
+      {
+        "scope": "renpy.meta.b",
+        "settings": {
+          "fontStyle": "bold"
+        }
+      },
+      {
+        "scope": [
+          "renpy.meta.u",
+          "renpy.meta.a"
+        ],
+        "settings": {
+          "fontStyle": "underline"
+        }
+      },
+      {
+        "scope": "renpy.meta.s",
+        "settings": {
+          "fontStyle": "strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.b",
+        "settings": {
+          "fontStyle": "italic bold"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.u",
+        "settings": {
+          "fontStyle": "italic underline"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.s",
+        "settings": {
+          "fontStyle": "italic strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.b renpy.meta.u",
+        "settings": {
+          "fontStyle": "bold underline"
+        }
+      },
+      {
+        "scope": "renpy.meta.b renpy.meta.s",
+        "settings": {
+          "fontStyle": "bold strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.u renpy.meta.s",
+        "settings": {
+          "fontStyle": "underline strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.b renpy.meta.u",
+        "settings": {
+          "fontStyle": "italic bold underline"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.b renpy.meta.s",
+        "settings": {
+          "fontStyle": "italic bold strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.u renpy.meta.s",
+        "settings": {
+          "fontStyle": "italic underline strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.b renpy.meta.u renpy.meta.s",
+        "settings": {
+          "fontStyle": "bold underline strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.i renpy.meta.b renpy.meta.u  renpy.meta.s",
+        "settings": {
+          "fontStyle": "italic bold underline strikethrough"
+        }
+      },
+      {
+        "scope": "renpy.meta.color.text",
+        "settings": {
+          "foreground": "#ffffff"
+        }
+      },
+      {
+        "scope": "renpy.meta.color.#0000ffff",
+        "settings": {
+          "foreground": "#0000ffff"
+        }
+      },
+      {
+        "scope": "renpy.meta.color.#00ff00",
+        "settings": {
+          "foreground": "#00ff00"
+        }
+      },
+      {
+        "scope": "renpy.meta.color.#f00",
+        "settings": {
+          "foreground": "#f00"
+        }
+      },
+      {
+        "scope": "text.notes.info",
+        "settings": {
+          "foreground": "#17a2b8",
+          "fontStyle": "bold"
+        }
+      },
+      {
+        "scope": "text.notes.success",
+        "settings": {
+          "foreground": "#28a745",
+          "fontStyle": "bold"
+        }
+      },
+      {
+        "scope": "text.notes.warning",
+        "settings": {
+          "foreground": "#ffc107",
+          "fontStyle": "bold"
+        }
+      },
+      {
+        "scope": "text.notes.danger",
+        "settings": {
+          "foreground": "#dc3545",
+          "fontStyle": "bold"
+        }
+      }
+    ]
+  }
 }

.vscode/tasks.json

@@ -120,7 +120,7 @@
       "type": "npm",
       "script": "lint",
       "group": "build",
-      "problemMatcher": ["$eslint-stylish"]
+      "problemMatcher": [ "$eslint-stylish" ]
     }
   ]
 }