Merge pull request #2 from hnrobert/develop

use ANSI Viewer, add dim mode selection, add glob matching, fix some known issues

Author: hnrobert

.github/workflows/release.yml

@@ -32,7 +32,12 @@ jobs:
       - name: Generate Release Notes
         id: release_notes
         run: |
-          CURRENT_TAG=${GITHUB_REF#refs/tags/}
+          # Use the workflow input `version` as the current tag (ensure v-prefix)
+          if [[ "${{ github.event.inputs.version }}" == v* ]]; then
+            CURRENT_TAG=${{ github.event.inputs.version }}
+          else
+            CURRENT_TAG=v${{ github.event.inputs.version }}
+          fi
           LAST_TAG=$(git tag --sort=-creatordate | grep -v 'beta' | head -n 1)
 
           if [ -z "$LAST_TAG" ]; then
@@ -60,6 +65,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Set up Node.js
         uses: actions/setup-node@v2
@@ -70,7 +77,7 @@ jobs:
         run: |
           corepack enable
           corepack prepare pnpm@10.13.1 --activate
-          pnpm install --frozen-lockfile
+          pnpm install --frozen-lockfile --shamefully-hoist
 
       - name: Build the extension
         run: pnpm run build
@@ -86,21 +93,62 @@ jobs:
 
       - name: Extract tag name
         id: extract_tag
-        run: echo "tag=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+        run: |
+          if [[ "${{ github.event.inputs.version }}" == v* ]]; then
+            echo "tag=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Bump package version and create tag with pnpm
+        if: steps.extract_tag.outputs.tag != ''
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          INPUT_VERSION="${{ github.event.inputs.version }}"
+          # Normalize semver without leading v for pnpm
+          if [[ "$INPUT_VERSION" == v* ]]; then
+            SEMVER=${INPUT_VERSION#v}
+          else
+            SEMVER=${INPUT_VERSION}
+          fi
+
+          TAG=v${SEMVER}
+
+          # Configure git author
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          # Skip if tag already exists
+          if git rev-parse "$TAG" >/dev/null 2>&1; then
+            echo "Tag $TAG already exists - skipping pnpm version"
+          else
+            pnpm version "$SEMVER"
+            git push origin HEAD
+            git push origin --tags
+          fi
+
+      - name: Prune devDependencies (keep production deps)
+        run: |
+          rm -rf node_modules
+          pnpm install --prod --frozen-lockfile --shamefully-hoist
+          echo "Production dependencies present:" && ls -1 node_modules | head -n 50 || true
 
       - name: Package the extension
         run: |
           if [[ ${{ steps.prerelease.outputs.prerelease }} == 'true' ]]; then
-            pnpm exec vsce package --pre-release -o vscode-ansi-${{ steps.extract_tag.outputs.tag }}.vsix
+            pnpm dlx @vscode/vsce package --no-dependencies --pre-release -o ansi-viewer-${{ steps.extract_tag.outputs.tag }}.vsix
           else
-            pnpm exec vsce package -o vscode-ansi-${{ steps.extract_tag.outputs.tag }}.vsix
+            pnpm dlx @vscode/vsce package --no-dependencies -o ansi-viewer-${{ steps.extract_tag.outputs.tag }}.vsix
           fi
 
       - name: Create GitHub Release
         id: create_release
         uses: softprops/action-gh-release@v1
         with:
-          files: vscode-ansi-${{ steps.extract_tag.outputs.tag }}.vsix
+          tag_name: ${{ steps.extract_tag.outputs.tag }}
+          name: ${{ steps.extract_tag.outputs.tag }}
+          files: ansi-viewer-${{ steps.extract_tag.outputs.tag }}.vsix
           draft: false
           prerelease: ${{ steps.prerelease.outputs.prerelease }}
           generate_release_notes: false
@@ -111,9 +159,9 @@ jobs:
       - name: Publish to VSCode Marketplace
         run: |
           if [[ ${{ steps.prerelease.outputs.prerelease }} == 'true' ]]; then
-            pnpm exec vsce publish --pre-release -p ${{ secrets.VSCE_PAT }}
+            pnpm dlx @vscode/vsce publish --no-dependencies --pre-release -p ${{ secrets.VSCE_PAT }}
           else
-            pnpm exec vsce publish -p ${{ secrets.VSCE_PAT }}
+            pnpm dlx @vscode/vsce publish --no-dependencies -p ${{ secrets.VSCE_PAT }}
           fi
         env:
           NODE_AUTH_TOKEN: ${{ secrets.VSCE_PAT }}

.vscode/settings.json

@@ -9,6 +9,9 @@
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off",
     "cSpell.words": [
-        "iliazeus"
-    ]
+        "creatordate",
+        "iliazeus",
+        "softprops"
+    ],
+    "i18n-ally.localesPaths": []
 }

.vscodeignore

@@ -1,10 +1,23 @@
-.vscode/**
-.vscode-test/**
-out/test/**
+# 忽略源码和构建配置
 src/**
+tsconfig.json
+tsup.config.ts
+.eslintrc*
+.prettierrc*
+pnpm-lock.yaml
+pnpm-workspace.yaml
+
+# 忽略 CI/CD 文件
+.github/**
+.vscode/**
 .gitignore
-vsc-extension-quickstart.md
-**/tsconfig.json
-**/.eslintrc.json
-**/*.map
-**/*.ts
+*.yml
+
+# 忽略测试文件
+**/test
+**/*.spec.*
+**/*.test.*
+**/.claude
+
+# 其它你不想要的
+*.md

README.md

@@ -1,16 +1,28 @@
-# ANSI Previewer
+# ANSI Viewer
 
 ANSI Color styling and previewer for your text editor.
 
-[![Visual Studio Marketplace](https://flat.badgen.net/vs-marketplace/i/HNRobert.vscode-ansi?icon=visualstudio)](https://marketplace.visualstudio.com/items?itemName=HNRobert.vscode-ansi)
-[![GitHub](https://flat.badgen.net/github/release/HNRobert/vscode-ansi?icon=github)](https://github.com/HNRobert/vscode-ansi)
+[![Visual Studio Marketplace](https://flat.badgen.net/vs-marketplace/i/HNRobert.ansi-viewer?icon=visualstudio)](https://marketplace.visualstudio.com/items?itemName=HNRobert.ansi-viewer)
+[![GitHub](https://flat.badgen.net/github/release/HNRobert/ansi-viewer?icon=github)](https://github.com/HNRobert/ansi-viewer)
 [![MIT License](https://flat.badgen.net/badge/license/MIT/blue)](LICENSE)
-[![Open Issues](https://flat.badgen.net/github/open-issues/HNRobert/vscode-ansi?icon=github)](https://github.com/HNRobert/vscode-ansi/issues)
-[![Closed Issues](https://flat.badgen.net/github/closed-issues/HNRobert/vscode-ansi?icon=github)](https://github.com/HNRobert/vscode-ansi/issues?q=is%3Aissue+is%3Aclosed)
+[![Open Issues](https://flat.badgen.net/github/open-issues/HNRobert/ansi-viewer?icon=github)](https://github.com/HNRobert/ansi-viewer/issues)
+[![Closed Issues](https://flat.badgen.net/github/closed-issues/HNRobert/ansi-viewer?icon=github)](https://github.com/HNRobert/ansi-viewer/issues?q=is%3Aissue+is%3Aclosed)
 
 > Forked from [iliazeus/vscode-ansi](https://github.com/iliazeus/vscode-ansi) and enhanced with more complete ANSI escape code and additional function support.
 
-<https://github.com/user-attachments/assets/486f77fc-1d21-4315-a244-3df765640669>
+## Demo
+
+### Enable / Disable
+
+![demo1](https://github.com/user-attachments/assets/fa74dd85-6a7b-42eb-8353-67231240c557)
+
+### Switch Normal / Dim / Hidden
+
+![demo2](https://github.com/user-attachments/assets/4f833bf0-5304-4a4d-9135-b50b7a9a7c92)
+
+### Apply matching file glob rules for workspace
+
+![demo3](https://github.com/user-attachments/assets/af70205f-c33b-4197-b7d1-2c3403c6082a)
 
 ## Basic usage
 
@@ -68,7 +80,7 @@ Basic colors and formatting:
 
   ```json
   {
-    "ansiPreviewer.autoLanguageModeFiles": [
+    "ansiViewer.autoLanguageModeFiles": [
       "**/*.ans",
       "**/*.ansi",
       "*.log", // All .log files in any directory
@@ -80,7 +92,6 @@ Basic colors and formatting:
   ```
 
   **Pattern support:**
-
   - `*.log` - matches `.log` files in any directory (same as `**/*.log`)
   - `logs/*.txt` - matches `.txt` files only in `logs` folder
   - `build/**` - matches all files in `build` directory and subdirectories

package.json

@@ -1,21 +1,21 @@
 {
-  "name": "vscode-ansi",
+  "name": "ansi-viewer",
   "publisher": "HNRobert",
-  "displayName": "ANSI Previewer",
+  "displayName": "ANSI Viewer",
   "description": "ANSI color styling and previewer for text documents",
-  "version": "1.0.0",
+  "version": "0.0.14",
   "license": "MIT",
   "repository": {
-    "url": "https://github.com/HNRobert/vscode-ansi"
+    "url": "https://github.com/HNRobert/ansi-viewer"
   },
   "bugs": {
-    "url": "https://github.com/HNRobert/vscode-ansi/issues",
+    "url": "https://github.com/HNRobert/ansi-viewer/issues",
     "email": "hnrobert@qq.com"
   },
   "packageManager": "pnpm@10.13.1",
   "icon": "images/icon.png",
   "engines": {
-    "vscode": "^1.74.0"
+    "vscode": "^1.104.0"
   },
   "categories": [
     "Themes",
@@ -34,42 +34,42 @@
   "contributes": {
     "commands": [
       {
-        "command": "HNRobert.vscode-ansi.showPreview",
+        "command": "HNRobert.ansi-viewer.showPreview",
         "title": "Open Preview",
         "category": "ANSI Text",
         "icon": "$(open-preview)"
       },
       {
-        "command": "HNRobert.vscode-ansi.showPreviewToSide",
+        "command": "HNRobert.ansi-viewer.showPreviewToSide",
         "title": "Open Preview to the Side",
         "category": "ANSI Text",
         "icon": "$(open-preview)"
       },
       {
-        "command": "HNRobert.vscode-ansi.toggleEnable",
-        "title": "Toggle ANSI Previewer",
+        "command": "HNRobert.ansi-viewer.toggleEnable",
+        "title": "Toggle ANSI Viewer",
         "category": "ANSI Text"
       }
     ],
     "menus": {
       "editor/title": [
         {
-          "command": "HNRobert.vscode-ansi.showPreviewToSide",
-          "alt": "HNRobert.vscode-ansi.showPreview",
+          "command": "HNRobert.ansi-viewer.showPreviewToSide",
+          "alt": "HNRobert.ansi-viewer.showPreview",
           "when": "editorLangId == ansi",
           "group": "navigation"
         }
       ]
     },
     "keybindings": [
       {
-        "command": "HNRobert.vscode-ansi.showPreview",
+        "command": "HNRobert.ansi-viewer.showPreview",
         "key": "shift+ctrl+v",
         "mac": "shift+cmd+v",
         "when": "editorLangId == ansi"
       },
       {
-        "command": "HNRobert.vscode-ansi.showPreviewToSide",
+        "command": "HNRobert.ansi-viewer.showPreviewToSide",
         "key": "ctrl+k v",
         "mac": "cmd+k v",
         "when": "editorLangId == ansi"
@@ -89,14 +89,14 @@
       }
     ],
     "configuration": {
-      "title": "ANSI Previewer",
+      "title": "ANSI Viewer",
       "properties": {
-        "ansiPreviewer.enable": {
+        "ansiViewer.enable": {
           "type": "boolean",
           "default": true,
-          "description": "Enable ANSI Previewer extension functionality"
+          "description": "Enable ANSI Viewer extension functionality"
         },
-        "ansiPreviewer.autoLanguageModeFiles": {
+        "ansiViewer.autoLanguageModeFiles": {
           "type": "array",
           "items": {
             "type": "string"
@@ -107,7 +107,7 @@
           ],
           "description": "File glob patterns for files that should automatically be set to ANSI language mode when opened. This enables ANSI escape sequence highlighting. Supports gitignore-style patterns: '*.log' matches log files in any directory, 'logs/*.txt' matches txt files in logs folder."
         },
-        "ansiPreviewer.escapeSequenceDisplay": {
+        "ansiViewer.escapeSequenceDisplay": {
           "type": "string",
           "enum": [
             "normal",

src/AnsiDecorationProvider.ts

@@ -66,10 +66,10 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
 
   private _provideDecorationsForAnsiLanguageType(document: TextDocument): ProviderResult<[string, Range[]][]> {
     const result = new Map<string, Range[]>();
-    
-    const config = workspace.getConfiguration("ansiPreviewer");
+
+    const config = workspace.getConfiguration("ansiViewer");
     const escapeSequenceDisplay: string = config.get("escapeSequenceDisplay", "dimmed");
-    
+
     for (const key of this._decorationTypes.keys()) {
       result.set(key, []);
     }
@@ -130,7 +130,7 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
           lineNumber,
           offset - totalEscapeLength,
           lineNumber,
-          offset + length - totalEscapeLength
+          offset + length - totalEscapeLength,
         );
 
         const key = JSON.stringify(style);
@@ -157,12 +157,12 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
   }
 
   private getEscapeSequenceDecorationType(): TextEditorDecorationType {
-    const config = workspace.getConfiguration("ansiPreviewer");
+    const config = workspace.getConfiguration("ansiViewer");
     const escapeSequenceDisplay: string = config.get("escapeSequenceDisplay", "dimmed");
-    
+
     const cacheKey = `escape_${escapeSequenceDisplay}`;
     let decorationType = this._decorationTypes.get(cacheKey);
-    
+
     if (!decorationType) {
       // 清理之前的转义序列装饰类型
       for (const [key, oldDecorationType] of this._decorationTypes.entries()) {
@@ -171,16 +171,16 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
           this._decorationTypes.delete(key);
         }
       }
-      
+
       switch (escapeSequenceDisplay) {
         case "normal":
           decorationType = window.createTextEditorDecorationType({});
           break;
         case "hidden":
-          decorationType = window.createTextEditorDecorationType({ 
+          decorationType = window.createTextEditorDecorationType({
             opacity: "0%",
             // 或者使用 textDecoration 来完全隐藏
-            textDecoration: "none; font-size: 0px;"
+            textDecoration: "none; font-size: 0px;",
           });
           break;
         case "dimmed":
@@ -190,7 +190,7 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
       }
       this._decorationTypes.set(cacheKey, decorationType);
     }
-    
+
     return decorationType;
   }
 
@@ -199,7 +199,7 @@ export class AnsiDecorationProvider implements TextEditorDecorationProvider {
     if (key.startsWith("escape_")) {
       return this.getEscapeSequenceDecorationType();
     }
-    
+
     let decorationType = this._decorationTypes.get(key);
 
     if (decorationType) {