Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Voloar 2.4.11 #785

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
},
"dependencies": {
"@glimmer/syntax": "^0.84.3",
"@volar/kit": "2.4.0-alpha.16",
"@volar/language-core": "2.4.0-alpha.16",
"@volar/language-server": "2.4.0-alpha.16",
"@volar/language-service": "2.4.0-alpha.16",
"@volar/source-map": "2.4.0-alpha.16",
"@volar/test-utils": "2.4.0-alpha.16",
"@volar/typescript": "2.4.0-alpha.16",
"@volar/kit": "2.4.11",
"@volar/language-core": "2.4.11",
"@volar/language-server": "2.4.11",
"@volar/language-service": "2.4.11",
"@volar/source-map": "2.4.11",
"@volar/test-utils": "2.4.11",
"@volar/typescript": "2.4.11",
"computeds": "^0.0.1",
"escape-string-regexp": "^4.0.0",
"semver": "^7.5.2",
Expand Down
14 changes: 2 additions & 12 deletions packages/core/src/volar/language-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,13 @@ connection.onInitialize((parameters) => {
const diagnostics = await typeScriptPlugin.provideDiagnostics!(document, token);
return filterAndAugmentDiagnostics(context, document, diagnostics);
},
async provideSemanticDiagnostics(
document: TextDocument,
token: vscode.CancellationToken,
) {
const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics!(
document,
token,
);
return filterAndAugmentDiagnostics(context, document, diagnostics);
},
};
},
};
} else {
return plugin;
}
}),
{ pullModelDiagnostics: true },
);
});

Expand Down Expand Up @@ -316,7 +305,8 @@ connection.onInitialized(() => {

const extensions = ['js', 'ts', 'gjs', 'gts', 'hbs'];

server.watchFiles([`**.*.{${extensions.join(',')}}`]);
// TODO: figure out how to reinstate (and what this does exactly)
// server.watchFiles([`**.*.{${extensions.join(',')}}`]);
});

connection.listen();
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"@glint/core": "^1.4.0",
"@volar/typescript": "2.4.0-alpha.16"
"@volar/typescript": "2.4.11"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@
"@glint/core": "^1.4.0",
"@types/mocha": "^10.0.1",
"@types/vscode": "^1.68.1",
"@volar/language-server": "2.4.0-alpha.16",
"@volar/vscode": "2.4.0-alpha.16",
"@volar/language-server": "2.4.11",
"@volar/vscode": "2.4.11",
"@vscode/test-electron": "^2.3.8",
"@vscode/vsce": "^2.22.0",
"esbuild": "^0.15.16",
Expand Down
12 changes: 11 additions & 1 deletion test-packages/test-utils/src/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,13 @@ export class Project {
// '../',
// 'node_modules',
// 'typescript',
// 'lib'
// 'lib',
// ),
// },
};

// We need to construct a capabilities object that mirrors how VScode + similar editors
// will initialize the Language Server.
const capabilities = {
workspace: {
// Needed for tests that use didChangeWatchedFiles
Expand All @@ -87,6 +90,13 @@ export class Project {
},
symbols: {},
},

// This enables pull model diagnostics.
// TODO is this needed? or provided by the plugin?
// diagnosticProvider: {
// interFileDependencies: true,
// workspaceDiagnostics: false,
// },
};

await this.languageServerHandle
Expand Down
114 changes: 55 additions & 59 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3440,88 +3440,79 @@
loupe "^2.3.7"
pretty-format "^29.7.0"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/kit/-/kit-2.4.0-alpha.16.tgz#9d0329376e6b267587dce8169d6c329eb90eb03b"
integrity sha512-jRPfMrxl8N53UkFINMoY777FBqG49RUqWkJt4yOlNEW8CmUS8fmUw4cz/jMv08KnQUyD3IeZWFtt3XZcQqe4Zw==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/kit/-/kit-2.4.11.tgz#12fa1825bdbaa54752e86d9eecb0d3b6d1c60f5e"
integrity sha512-ups5RKbMzMCr6RKafcCqDRnJhJDNWqo2vfekwOAj6psZ15v5TlcQFQAyokQJ3wZxVkzxrQM+TqTRDENfQEXpmA==
dependencies:
"@volar/language-service" "2.4.0-alpha.16"
"@volar/typescript" "2.4.0-alpha.16"
"@volar/language-service" "2.4.11"
"@volar/typescript" "2.4.11"
typesafe-path "^0.2.2"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.0-alpha.16.tgz#fd4d38ccbf5ad13ebb29eacfdda719807749ffac"
integrity sha512-oOTnIZlx0P/idFwVw+W0NbzKDtZAQMzXSdIFfTePCKcXlb4Ys12GaGkx8NF9dsvPYV3nbv3ZsSxnkZWBmNKd7A==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-2.4.11.tgz#d95a9ec4f14fbdb41a6a64f9f321d11d23a5291c"
integrity sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==
dependencies:
"@volar/source-map" "2.4.0-alpha.16"
"@volar/source-map" "2.4.11"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/language-server/-/language-server-2.4.0-alpha.16.tgz#c47a316e0df523b7b337b5afc5bf7e811e2c62c2"
integrity sha512-DswMBlmmXPo9fb1Dmb2qrCtxRDgQPej5jUjAoUm+1wO5k02Tk+jIvbbd/R3EzyHFTARmiRH5/bSOfRefHyuMsg==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/language-server/-/language-server-2.4.11.tgz#e0d87bd8d4eee0470e806e832ed26f27caf08d81"
integrity sha512-W9P8glH1M8LGREJ7yHRCANI5vOvTrRO15EMLdmh5WNF9sZYSEbQxiHKckZhvGIkbeR1WAlTl3ORTrJXUghjk7g==
dependencies:
"@volar/language-core" "2.4.0-alpha.16"
"@volar/language-service" "2.4.0-alpha.16"
"@volar/snapshot-document" "2.4.0-alpha.16"
"@volar/typescript" "2.4.0-alpha.16"
"@volar/language-core" "2.4.11"
"@volar/language-service" "2.4.11"
"@volar/typescript" "2.4.11"
path-browserify "^1.0.1"
request-light "^0.7.0"
vscode-languageserver "^9.0.1"
vscode-languageserver-protocol "^3.17.5"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/language-service/-/language-service-2.4.0-alpha.16.tgz#b54c4e67eb98e0f56912aaaf8420375adf7d0895"
integrity sha512-iIRUY0EL9jp8Od7Py/GlYpCu469GFDYl7ai716pQgwipjpjEjRQiuGAD2+cSFjOVXDsMPFpJ+Dpei7aSvE/8pQ==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/language-service/-/language-service-2.4.11.tgz#44008ad68ff82c618fe4f6ad338af9164853e82b"
integrity sha512-KIb6g8gjUkS2LzAJ9bJCLIjfsJjeRtmXlu7b2pDFGD3fNqdbC53cCAKzgWDs64xtQVKYBU13DLWbtSNFtGuMLQ==
dependencies:
"@volar/language-core" "2.4.0-alpha.16"
"@volar/language-core" "2.4.11"
vscode-languageserver-protocol "^3.17.5"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

"@volar/[email protected]":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.16.tgz#c0d3d2da941d1f384b9b71590e6fe5ce9b657eb5"
integrity sha512-X9xZeLvkmhjkrz27J6nq9JhYWV8AUT1KS9fi4s+Mo1FOh5HHUIx/QzhrwsUN/pY1z3kO+vtrl2DE6NVJRYwwbw==
dependencies:
vscode-languageserver-protocol "^3.17.5"
vscode-languageserver-textdocument "^1.0.11"

"@volar/[email protected]":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.0-alpha.16.tgz#3a86ffadbba6928cd3f6717220dd87f8c1522904"
integrity sha512-sL9vNG7iR2hiKZor7UkD5Sufu3QCia4cbp2gX/nGRNSdaPbhOpdAoavwlBm0PrVkpiA19NZuavZoobD8krviFg==
"@volar/[email protected]":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-2.4.11.tgz#5876d4531508129724c2755e295db1df98bd5895"
integrity sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/test-utils/-/test-utils-2.4.0-alpha.16.tgz#20418e679c6f3ef2dc54ae41136e9f7849791109"
integrity sha512-O2MIR0H8f0LGSEWrFk+1g9PQmO9qlsv+djpnrnsBhx+mmnKmsX1T35CujOCvx8LLvlob+qlINrh3kTYCCUH7ww==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/test-utils/-/test-utils-2.4.11.tgz#6caddc065d323b404f285473c1535505d67a7d66"
integrity sha512-ogkLldPqFa/j9302Ns+nWeyTCQv8d4c7iN4t8ziq7j0XeMKWYsTAjLsx/9z0MTNrecBAcocgzEvCricASSq+Hw==
dependencies:
"@volar/language-core" "2.4.0-alpha.16"
"@volar/language-server" "2.4.0-alpha.16"
"@volar/language-core" "2.4.11"
"@volar/language-server" "2.4.11"
vscode-languageserver-textdocument "^1.0.11"
vscode-uri "^3.0.8"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.0-alpha.16.tgz#bd267e9389207761e9dcda61ace619a8943384e5"
integrity sha512-WCx7z5O81McCQp2cC0c8081y+MgTiAR2WAiJjVL4tr4Qh4GgqK0lgn3CqAjcKizaK1R5y3wfrUqgIYr+QeFYcw==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-2.4.11.tgz#aafbfa413337654db211bf4d8fb6670c89f6fa57"
integrity sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==
dependencies:
"@volar/language-core" "2.4.0-alpha.16"
"@volar/language-core" "2.4.11"
path-browserify "^1.0.1"
vscode-uri "^3.0.8"

"@volar/[email protected].0-alpha.16":
version "2.4.0-alpha.16"
resolved "https://registry.yarnpkg.com/@volar/vscode/-/vscode-2.4.0-alpha.16.tgz#c5cb2ac7cc4a389d230f0d1f61888fb25c6d6597"
integrity sha512-VVAuX8zyFglFqnRsLdlSXetDSII3SjLt3Vaaw88iXILP7Wcf0XFzen6jD+yCnMFR8GiFOXikHlcejKnghoBKgQ==
"@volar/[email protected].11":
version "2.4.11"
resolved "https://registry.yarnpkg.com/@volar/vscode/-/vscode-2.4.11.tgz#9faf69ec265484ffe125fc4af9394020720101b3"
integrity sha512-rhGIAMcF/lMBtUXrm7K0HLQlEYSdB7+0JXrkJ1snYv9iH9hiEEioq+jwb40+w2KWYO2HrlpfsQ1m+MvjiwW/AA==
dependencies:
"@volar/language-server" "2.4.0-alpha.16"
"@volar/language-server" "2.4.11"
path-browserify "^1.0.1"
vscode-languageclient "^9.0.1"
vscode-nls "^5.2.0"
Expand Down Expand Up @@ -12914,11 +12905,16 @@ semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semve
dependencies:
lru-cache "^6.0.0"

semver@^7.5.3, semver@^7.6.2:
semver@^7.5.3:
version "7.6.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==

semver@^7.6.2:
version "7.6.3"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

[email protected]:
version "0.18.0"
resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
Expand Down Expand Up @@ -14145,9 +14141,9 @@ typesafe-path@^0.2.2:
integrity sha512-OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA==

typescript-auto-import-cache@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz#45f376313d1eb0929ce47ef1d1aae5a353d060a3"
integrity sha512-ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==
version "0.3.5"
resolved "https://registry.yarnpkg.com/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.5.tgz#402f98995037734ef3fc208180331adfd5e495fc"
integrity sha512-fAIveQKsoYj55CozUiBoj4b/7WpN0i4o74wiGY5JVUEoD0XiqDk1tJqTEjgzL2/AizKQrXxyRosSebyDzBZKjw==
dependencies:
semver "^7.3.8"

Expand Down Expand Up @@ -14509,9 +14505,9 @@ vm2@^3.9.19:
acorn-walk "^8.2.0"

[email protected]:
version "0.0.59"
resolved "https://registry.yarnpkg.com/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz#9b549b3fd1e97026f0b4a9de199b39806ee02e5a"
integrity sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==
version "0.0.62"
resolved "https://registry.yarnpkg.com/volar-service-typescript/-/volar-service-typescript-0.0.62.tgz#d99c42e2e08742f27b9bb186180dac93ce730ee6"
integrity sha512-p7MPi71q7KOsH0eAbZwPBiKPp9B2+qrdHAd6VY5oTo9BUXatsOAdakTm9Yf0DUj6uWBAaOT01BSeVOPwucMV1g==
dependencies:
path-browserify "^1.0.1"
semver "^7.6.2"
Expand Down
Loading