Skip to content

Commit 3bd5b2c

Browse files
aewingaewing
authored
Merge branch 'master' into fix/respect-tsconfig-excludes-in-file-watching
2 parents c63b64f + 9d719db commit 3bd5b2c

File tree

14 files changed

+70
-48
lines changed

14 files changed

+70
-48
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"lint": "prettier --check ."
1414
},
1515
"dependencies": {
16-
"typescript": "^5.8.2"
16+
"typescript": "^5.9.2"
1717
},
1818
"devDependencies": {
1919
"cross-env": "^7.0.2",

‎packages/language-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"prettier-plugin-svelte": "^3.4.0",
6363
"svelte": "^4.2.19",
6464
"svelte2tsx": "workspace:~",
65-
"typescript": "^5.8.2",
65+
"typescript": "^5.9.2",
6666
"typescript-auto-import-cache": "^0.3.6",
6767
"vscode-css-languageservice": "~6.3.5",
6868
"vscode-html-languageservice": "~5.4.0",

‎packages/language-server/src/ls-config.ts

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,10 @@ export interface TSUserConfig {
212212
workspaceSymbols?: TsWorkspaceSymbolsConfig;
213213
}
214214

215+
interface TsJsSharedConfig {
216+
hover?: { maximumLength?: number };
217+
}
218+
215219
/**
216220
* A subset of the JS/TS VS Code settings which
217221
* are transformed to ts.UserPreferences.
@@ -291,6 +295,12 @@ export interface TsWorkspaceSymbolsConfig {
291295

292296
export type TsUserConfigLang = 'typescript' | 'javascript';
293297

298+
interface TsUserConfigLangMap {
299+
typescript?: TSUserConfig;
300+
javascript?: TSUserConfig;
301+
'js/ts'?: TsJsSharedConfig;
302+
}
303+
294304
/**
295305
* The config as the vscode-css-languageservice understands it
296306
*/
@@ -434,10 +444,11 @@ export class LSConfigManager {
434444
);
435445
}
436446

437-
updateTsJsUserPreferences(config: Record<TsUserConfigLang, TSUserConfig>): void {
447+
updateTsJsUserPreferences(config: TsUserConfigLangMap): void {
448+
const shared = config['js/ts'];
438449
(['typescript', 'javascript'] as const).forEach((lang) => {
439450
if (config[lang]) {
440-
this._updateTsUserPreferences(lang, config[lang]);
451+
this._updateTsUserPreferences(lang, config[lang], shared);
441452
this.rawTsUserConfig[lang] = config[lang];
442453
}
443454
});
@@ -458,7 +469,11 @@ export class LSConfigManager {
458469
this.notifyListeners();
459470
}
460471

461-
private _updateTsUserPreferences(lang: TsUserConfigLang, config: TSUserConfig) {
472+
private _updateTsUserPreferences(
473+
lang: TsUserConfigLang,
474+
config: TSUserConfig,
475+
shared?: TsJsSharedConfig
476+
) {
462477
const { inlayHints } = config;
463478

464479
this.tsUserPreferences[lang] = {
@@ -482,6 +497,7 @@ export class LSConfigManager {
482497
includeCompletionsWithObjectLiteralMethodSnippets:
483498
config.suggest?.objectLiteralMethodSnippets?.enabled ?? true,
484499
preferTypeOnlyAutoImports: config.preferences?.preferTypeOnlyAutoImports,
500+
maximumHoverLength: shared?.hover?.maximumLength,
485501

486502
// Although we don't support incompletion cache.
487503
// But this will make ts resolve the module specifier more aggressively
@@ -618,7 +634,7 @@ export class LSConfigManager {
618634
return this.htmlConfig;
619635
}
620636

621-
updateTsJsFormateConfig(config: Record<TsUserConfigLang, TSUserConfig>): void {
637+
updateTsJsFormateConfig(config: TsUserConfigLangMap): void {
622638
(['typescript', 'javascript'] as const).forEach((lang) => {
623639
if (config[lang]) {
624640
this._updateTsFormatConfig(lang, config[lang]);

‎packages/language-server/src/plugins/typescript/features/HoverProvider.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,19 @@ export class HoverProviderImpl implements HoverProvider {
1212
constructor(private readonly lsAndTsDocResolver: LSAndTSDocResolver) {}
1313

1414
async doHover(document: Document, position: Position): Promise<Hover | null> {
15-
const { lang, tsDoc } = await this.getLSAndTSDoc(document);
15+
const { lang, tsDoc, userPreferences } = await this.getLSAndTSDoc(document);
1616

1717
const eventHoverInfo = this.getEventHoverInfo(lang, document, tsDoc, position);
1818
if (eventHoverInfo) {
1919
return eventHoverInfo;
2020
}
2121

2222
const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
23-
const info = lang.getQuickInfoAtPosition(tsDoc.filePath, offset);
23+
const info = lang.getQuickInfoAtPosition(
24+
tsDoc.filePath,
25+
offset,
26+
userPreferences.maximumHoverLength
27+
);
2428
if (!info) {
2529
return null;
2630
}

‎packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"value": "MouseEvent",
1313
"location": {
1414
"range": {
15-
"start": { "line": 16546, "character": 10 },
16-
"end": { "line": 16546, "character": 20 }
15+
"start": { "line": 20928, "character": 10 },
16+
"end": { "line": 20928, "character": 20 }
1717
},
1818
"uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
1919
}

‎packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"value": "MouseEvent",
77
"location": {
88
"range": {
9-
"start": { "line": 16546, "character": 10 },
10-
"end": { "line": 16546, "character": 20 }
9+
"start": { "line": 20928, "character": 10 },
10+
"end": { "line": 20928, "character": 20 }
1111
},
1212
"uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
1313
}
@@ -21,8 +21,8 @@
2121
"value": "EventTarget",
2222
"location": {
2323
"range": {
24-
"start": { "line": 8857, "character": 10 },
25-
"end": { "line": 8857, "character": 21 }
24+
"start": { "line": 11562, "character": 10 },
25+
"end": { "line": 11562, "character": 21 }
2626
},
2727
"uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
2828
}
@@ -32,8 +32,8 @@
3232
"value": "HTMLButtonElement",
3333
"location": {
3434
"range": {
35-
"start": { "line": 10333, "character": 10 },
36-
"end": { "line": 10333, "character": 27 }
35+
"start": { "line": 13261, "character": 10 },
36+
"end": { "line": 13261, "character": 27 }
3737
},
3838
"uri": "<node_modules>/typescript/lib/lib.dom.d.ts"
3939
}

‎packages/svelte-check/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"rollup-plugin-copy": "^3.4.0",
5555
"svelte": "^4.2.19",
5656
"svelte-language-server": "workspace:*",
57-
"typescript": "^5.8.2",
57+
"typescript": "^5.9.2",
5858
"vscode-languageserver": "8.0.2",
5959
"vscode-languageserver-protocol": "3.17.2",
6060
"vscode-languageserver-types": "3.17.2",

‎packages/svelte-vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@
746746
"js-yaml": "^3.14.0",
747747
"semver": "^7.7.2",
748748
"tslib": "^2.4.0",
749-
"typescript": "^5.8.2",
749+
"typescript": "^5.9.2",
750750
"vitest": "^3.2.4",
751751
"vscode-tmgrammar-test": "^0.0.11"
752752
},

‎packages/svelte-vscode/src/extension.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ export function activateSvelteLanguageServer(context: ExtensionContext) {
175175
'emmet',
176176
'javascript',
177177
'typescript',
178+
'js/ts',
178179
'css',
179180
'less',
180181
'scss',
@@ -188,6 +189,7 @@ export function activateSvelteLanguageServer(context: ExtensionContext) {
188189
emmet: workspace.getConfiguration('emmet'),
189190
typescript: workspace.getConfiguration('typescript'),
190191
javascript: workspace.getConfiguration('javascript'),
192+
'js/ts': workspace.getConfiguration('js/ts'),
191193
css: workspace.getConfiguration('css'),
192194
less: workspace.getConfiguration('less'),
193195
scss: workspace.getConfiguration('scss'),

‎packages/svelte2tsx/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"svelte": "~4.2.19",
4141
"tiny-glob": "^0.2.6",
4242
"tslib": "^2.4.0",
43-
"typescript": "^5.8.2"
43+
"typescript": "^5.9.2"
4444
},
4545
"peerDependencies": {
4646
"svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",

0 commit comments

Comments
 (0)