Merge pull request #252 from htmlhint/58-replace-uritofilepath-with-vscode-uri

chore: Use vscode-uri

Author: coliff

htmlhint-server/package-lock.json

@@ -11,7 +11,8 @@
     "htmlhint": "^1.5.1",
     "strip-json-comments": "3.1.1",
     "vscode-languageserver": "9.0.1",
-    "vscode-languageserver-textdocument": "^1.0.12"
+    "vscode-languageserver-textdocument": "^1.0.12",
+    "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "22.15.31",

htmlhint-server/package.json

@@ -41,6 +41,7 @@ import {
 import { TextDocument } from "vscode-languageserver-textdocument";
 import * as htmlhint from "htmlhint";
 import fs = require("fs");
+import { URI } from "vscode-uri";
 let stripJsonComments: any = require("strip-json-comments");
 
 interface Settings {
@@ -1481,13 +1482,8 @@ function doValidate(connection: Connection, document: TextDocument): void {
     }
 
     let uri = document.uri;
-    // Convert URI to file path manually since Files API is not available
-    let fsPath = uri.replace(/^file:\/\//, "");
-    // Decode URL encoding (e.g., %3A -> :)
-    fsPath = decodeURIComponent(fsPath);
-    if (process.platform === "win32" && fsPath.startsWith("/")) {
-      fsPath = fsPath.substring(1);
-    }
+    // Convert URI to file path using vscode-uri
+    let fsPath = URI.parse(uri).fsPath;
 
     trace(`[DEBUG] doValidate called for: ${fsPath}`);
 
@@ -1578,14 +1574,9 @@ connection.onDidChangeWatchedFiles((params) => {
   let shouldRevalidate = false;
 
   for (let i = 0; i < params.changes.length; i++) {
-    // Convert URI to file path manually since Files API is not available
+    // Convert URI to file path using vscode-uri
     let uri = params.changes[i].uri;
-    let fsPath = uri.replace(/^file:\/\//, "");
-    // Decode URL encoding (e.g., %3A -> :)
-    fsPath = decodeURIComponent(fsPath);
-    if (process.platform === "win32" && fsPath.startsWith("/")) {
-      fsPath = fsPath.substring(1);
-    }
+    let fsPath = URI.parse(uri).fsPath;
 
     trace(`[DEBUG] Processing config file change: ${fsPath}`);
     trace(`[DEBUG] Change type: ${params.changes[i].type}`);

htmlhint-server/src/server.ts

@@ -76,19 +76,19 @@
     "vscode:prepublish": "npm run compile && npm run bundle-dependencies",
     "compile": "tsc -p ./",
     "watch": "tsc -watch -p ./",
-    "bundle-dependencies": "npm install --no-package-lock --no-save htmlhint@^1.5.1 strip-json-comments@3.1.1 vscode-languageserver@9.0.1 vscode-languageserver-textdocument@^1.0.12",
+    "bundle-dependencies": "npm install --no-package-lock --no-save htmlhint@^1.5.1 strip-json-comments@3.1.1 vscode-languageserver@9.0.1 vscode-languageserver-textdocument@^1.0.12 vscode-uri@^3.1.0",
     "package": "vsce package"
   },
   "devDependencies": {
-    "typescript": "^5.2.2",
     "@types/node": "^22.15.31",
     "@types/vscode": "^1.89.0",
+    "typescript": "^5.2.2",
     "vscode-test": "^1.6.1"
   },
   "dependencies": {
-    "vscode-languageclient": "9.0.1",
     "htmlhint": "^1.5.1",
     "strip-json-comments": "3.1.1",
+    "vscode-languageclient": "9.0.1",
     "vscode-languageserver": "9.0.1"
   },
   "bundleDependencies": [