Small cleanup

Author: AndreasArvidsson

.github/workflows/deploy.yaml

@@ -6,11 +6,14 @@ on:
     types: [completed]
     branches: [main]
 
+permissions:
+  contents: write
+
 jobs:
   publish-extension:
     name: Publish to marketplace
     runs-on: ubuntu-latest
-    environment: production
+    environment: Production
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
@@ -23,6 +26,7 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: npm
 
       - name: Install dependencies
         run: npm --color ci
@@ -32,20 +36,27 @@ jobs:
           VERSION=$(node -p "require('./package.json').version")
           echo "version=$VERSION" >> $GITHUB_ENV
 
-      - name: Create Git tag
+      - name: Check whether this version is already published
         run: |
-          git tag ${{ env.version }}
-          git push origin ${{ env.version }}
+          if git ls-remote --exit-code --tags origin "refs/tags/${{ env.version }}" > /dev/null; then
+            echo "Version ${{ env.version }} is already tagged."
+            exit 1
+          fi
 
       - name: Publish to Open VSX Registry
         id: publishToOpenVSX
         uses: HaaLeo/publish-vscode-extension@v2
         with:
-          pat: ${{ secrets.OPEN_VSX_TOKEN }}
+          pat: ${{ secrets.OPENVSX_PAT }}
 
       - name: Publish to Visual Studio Marketplace
         uses: HaaLeo/publish-vscode-extension@v2
         with:
-          pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
+          pat: ${{ secrets.VSCE_PAT }}
           registryUrl: https://marketplace.visualstudio.com
           extensionFile: ${{ steps.publishToOpenVSX.outputs.vsixPath }}
+
+      - name: Create Git tag
+        run: |
+          git tag "${{ env.version }}"
+          git push origin "${{ env.version }}"

.github/workflows/test.yaml

@@ -6,6 +6,9 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+permissions:
+  contents: read
+
 jobs:
   run-tests:
     name: Run tests
@@ -19,6 +22,7 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: npm
 
       - name: Install dependencies
         run: npm --color ci

src/commandRunner.ts

@@ -3,12 +3,11 @@ import * as vscode from "vscode";
 import { globsToRegex } from "./regex";
 
 export class CommandRunner {
-  private allowRegex!: RegExp;
-  private denyRegex!: RegExp | null;
+  private allowRegex: RegExp | undefined;
+  private denyRegex: RegExp | undefined;
   private backgroundWindowProtection!: boolean;
 
   public constructor() {
-    this.reloadConfiguration = this.reloadConfiguration.bind(this);
     this.runCommand = this.runCommand.bind(this);
 
     this.reloadConfiguration();
@@ -20,13 +19,12 @@ export class CommandRunner {
       .getConfiguration("command-server")
       .get<string[]>("allowList", []);
 
-    this.allowRegex = globsToRegex(allowList);
-
     const denyList = vscode.workspace
       .getConfiguration("command-server")
       .get<string[]>("denyList", []);
 
-    this.denyRegex = denyList.length === 0 ? null : globsToRegex(denyList);
+    this.allowRegex = globsToRegex(allowList);
+    this.denyRegex = globsToRegex(denyList);
 
     this.backgroundWindowProtection = vscode.workspace
       .getConfiguration("command-server")
@@ -46,11 +44,11 @@ export class CommandRunner {
       }
     }
 
-    if (!this.allowRegex.test(commandId)) {
+    if (this.allowRegex != null && !this.allowRegex.test(commandId)) {
       throw new Error("Command not in allowList");
     }
 
-    if (this.denyRegex != null && commandId.match(this.denyRegex)) {
+    if (this.denyRegex?.test(commandId)) {
       throw new Error("Command in denyList");
     }
 

src/regex.ts

@@ -1,10 +1,10 @@
 import { Minimatch } from "minimatch";
 
-export function globsToRegex(globs: string[]): RegExp {
+export function globsToRegex(globs: string[]): RegExp | undefined {
   const regexes = globs
     .map((glob) => new Minimatch(glob).makeRe())
     .filter((regex): regex is RegExp => regex !== false);
-  return any(regexes);
+  return regexes.length > 0 ? any(regexes) : undefined;
 }
 
 /**