diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af21989..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npx lint-staged diff --git a/package-lock.json b/package-lock.json index e08421bc0..afa203c83 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "ISC", "devDependencies": { "@cloudflare/workers-types": "^4.20250109.0", - "@github1s/vscode-web": "^0.29.0", + "@github1s/vscode-web": "^0.30.1", "chokidar": "^4.0.3", "clean-css": "^5.3.3", "copy-webpack-plugin": "^14.0.0", @@ -251,9 +251,9 @@ } }, "node_modules/@github1s/vscode-web": { - "version": "0.29.0", - "resolved": "https://registry.npmjs.org/@github1s/vscode-web/-/vscode-web-0.29.0.tgz", - "integrity": "sha512-e0d+8B8F1rdDjoCSCw8F08R22MEXpmnQ5iN8H/d/WzUDDf6igiMWOnVhKOlF3IO0rbMHs5cZEsSCbkRv08v2OA==", + "version": "0.30.1", + "resolved": "https://registry.npmjs.org/@github1s/vscode-web/-/vscode-web-0.30.1.tgz", + "integrity": "sha512-W4vzRSdqc5UcYbAA9fgfTd2KJerNthoY6Z/J34x7Qla9TGbLCJmiheCbzKG2KG3ku1N40XNmK7H+POL6waL67A==", "dev": true, "license": "MIT" }, diff --git a/package.json b/package.json index bf9256fc6..81c533a46 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "license": "ISC", "devDependencies": { "@cloudflare/workers-types": "^4.20250109.0", - "@github1s/vscode-web": "^0.29.0", + "@github1s/vscode-web": "^0.30.1", "chokidar": "^4.0.3", "clean-css": "^5.3.3", "copy-webpack-plugin": "^14.0.0", diff --git a/vscode-web/.VERSION b/vscode-web/.VERSION index 12f5b64c8..e351d98a8 100644 --- a/vscode-web/.VERSION +++ b/vscode-web/.VERSION @@ -1 +1 @@ -1.132.0 \ No newline at end of file +1.132.1 \ No newline at end of file diff --git a/vscode-web/package-lock.json b/vscode-web/package-lock.json index da933de2c..950a9662b 100644 --- a/vscode-web/package-lock.json +++ b/vscode-web/package-lock.json @@ -1,12 +1,12 @@ { "name": "@github1s/vscode-web", - "version": "0.29.0", + "version": "0.30.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@github1s/vscode-web", - "version": "0.29.0", + "version": "0.30.1", "license": "MIT", "devDependencies": { "chokidar": "^4.0.3", diff --git a/vscode-web/package.json b/vscode-web/package.json index 970031796..db106c6e5 100644 --- a/vscode-web/package.json +++ b/vscode-web/package.json @@ -1,6 +1,6 @@ { "name": "@github1s/vscode-web", - "version": "0.29.0", + "version": "0.30.1", "description": "VS Code web for GitHub1s", "author": "github1s", "license": "MIT", diff --git a/vscode-web/src/vs/workbench/services/label/common/labelService.ts b/vscode-web/src/vs/workbench/services/label/common/labelService.ts index 7832cb933..2557d4b4f 100644 --- a/vscode-web/src/vs/workbench/services/label/common/labelService.ts +++ b/vscode-web/src/vs/workbench/services/label/common/labelService.ts @@ -77,9 +77,7 @@ const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoin const posixPathSeparatorRegexp = /\//g; // on Unix, backslash is a valid filename character const winPathSeparatorRegexp = /[\\\/]/g; // on Windows, neither slash nor backslash are valid filename characters -// below codes are changed by github1s -const labelMatchingRegexp = /\$\{(scheme|authoritySuffix(?::\d+)?|authority|path|(query)\.(.+?))\}/g; -// above codes are changed by github1s +const labelMatchingRegexp = /\$\{(scheme|authoritySuffix|authority|path|(query)\.(.+?))\}/g; function hasDriveLetterIgnorePlatform(path: string): boolean { return !!(path && path[2] === ':'); @@ -454,19 +452,13 @@ export class LabelService extends Disposable implements ILabelService { } private formatUri(resource: URI, formatting: ResourceLabelFormatting, forceNoTildify?: boolean): string { - // below codes are changed by github1s - let label = formatting.label.replace(labelMatchingRegexp, (match, tokenWithArgument, qsToken, qsValue) => { - const [token, argument] = tokenWithArgument.split(':'); - // above codes are changed by github1s + let label = formatting.label.replace(labelMatchingRegexp, (match, token, qsToken, qsValue) => { switch (token) { case 'scheme': return resource.scheme; case 'authority': return resource.authority; case 'authoritySuffix': { const i = resource.authority.indexOf('+'); - // below codes are changed by github1s - const authoritySuffix = i === -1 ? resource.authority : resource.authority.slice(i + 1); - return argument === undefined ? authoritySuffix : authoritySuffix.slice(0, Number(argument)); - // above codes are changed by github1s + return i === -1 ? resource.authority : resource.authority.slice(i + 1); } case 'path': { let pathValue = resource.path;