Skip to content

Commit

Permalink
prepare 0.0.58 (#138)
Browse files Browse the repository at this point in the history
* cleanup & prepare 0.0.58

* update extensions
  • Loading branch information
aeschli authored Sep 4, 2024
1 parent ed9ff7a commit bd939c3
Show file tree
Hide file tree
Showing 15 changed files with 121 additions and 117 deletions.
18 changes: 8 additions & 10 deletions fs-provider/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions fs-provider/package.nls.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
4 changes: 2 additions & 2 deletions fs-provider/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "ES2020",
"target": "ES2022",
"outDir": "dist",
"lib": [
"ES2020", "WebWorker"
"ES2022", "WebWorker"
],
"sourceMap": true,
"rootDir": "src",
Expand Down
94 changes: 47 additions & 47 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vscode/test-web",
"version": "0.0.57",
"version": "0.0.58",
"scripts": {
"install-extensions": "npm i --prefix=fs-provider && npm i --prefix=sample",
"compile": "tsc -b ./ && npm run compile-fs-provider",
Expand Down Expand Up @@ -51,8 +51,8 @@
"@types/minimist": "^1.2.5",
"@types/node": "^20.14.9",
"@types/tar-fs": "^2.0.4",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"@typescript-eslint/eslint-plugin": "^8.4.0",
"@typescript-eslint/parser": "^8.4.0",
"eslint": "^9.9.1",
"@tony.ganchev/eslint-plugin-header": "^3.1.2",
"typescript": "^5.5.4"
Expand Down
22 changes: 12 additions & 10 deletions sample/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sample/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"package-web": "webpack --mode production --devtool hidden-source-map"
},
"devDependencies": {
"@types/vscode": "^1.90.0",
"@types/vscode": "^1.92.0",
"@types/mocha": "10.0.7",
"mocha": "^10.7.3",
"typescript": "^5.5.4",
Expand Down
2 changes: 2 additions & 0 deletions sample/package.nls.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
4 changes: 2 additions & 2 deletions sample/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "ES2020",
"target": "ES2022",
"lib": [
"ES2020", "WebWorker"
"ES2022", "WebWorker"
],
"rootDir": "src",
"strict": true /* enable all strict type-checking options */
Expand Down
4 changes: 2 additions & 2 deletions sample/tsconfig.runTest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "ES2019",
"target": "ES2022",
"outDir": "dist",
"lib": [
"ES2019"
"ES2022"
],
"rootDir": "src",
"strict": true
Expand Down
12 changes: 6 additions & 6 deletions src/browser/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,20 @@ class WorkspaceProvider implements IWorkspaceProvider {
}

if ('folderUri' in workspaceA && 'folderUri' in workspaceB) {
return isEqual(workspaceA.folderUri, workspaceB.folderUri); // same workspace
return this.isEqualURI(workspaceA.folderUri, workspaceB.folderUri); // same workspace
}

if ('workspaceUri' in workspaceA && 'workspaceUri' in workspaceB) {
return isEqual(workspaceA.workspaceUri, workspaceB.workspaceUri); // same workspace
return this.isEqualURI(workspaceA.workspaceUri, workspaceB.workspaceUri); // same workspace
}

return false;
}

private isEqualURI(a: UriComponents, b: UriComponents): boolean {
return a.scheme === b.scheme && a.authority === b.authority && a.path === b.path;
}

}

class LocalStorageURLCallbackProvider implements IURLCallbackProvider, IDisposable {
Expand Down Expand Up @@ -251,10 +255,6 @@ class LocalStorageURLCallbackProvider implements IURLCallbackProvider, IDisposab
}
}

function isEqual(a: UriComponents, b: UriComponents): boolean {
return a.scheme === b.scheme && a.authority === b.authority && a.path === b.path;
}

(function () {
const configElement = window.document.getElementById('vscode-workbench-web-configuration');
const configElementAttribute = configElement ? configElement.getAttribute('data-settings') : undefined;
Expand Down
Loading

0 comments on commit bd939c3

Please sign in to comment.