Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { basename, dirname, extname } from 'path';
import ts from 'typescript/lib/tsserverlibrary';
import type ts from 'typescript';
import { Logger } from '../logger';
import { isSvelteFilePath, replaceDeep } from '../utils';

type _ts = typeof ts;

const componentPostfix = '__SvelteComponent_';

export function decorateCompletions(ls: ts.LanguageService, logger: Logger): void {
export function decorateCompletions(ls: ts.LanguageService, ts: _ts, logger: Logger): void {
const getCompletionsAtPosition = ls.getCompletionsAtPosition;
ls.getCompletionsAtPosition = (fileName, position, options) => {
const completions = getCompletionsAtPosition(fileName, position, options);
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-plugin/src/language-service/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function decorateLanguageServiceInner(
decorateRename(ls, snapshotManager, logger);
decorateDiagnostics(ls, logger);
decorateFindReferences(ls, snapshotManager, logger);
decorateCompletions(ls, logger);
decorateCompletions(ls, typescript, logger);
decorateGetDefinition(ls, snapshotManager, logger);
decorateGetImplementation(ls, snapshotManager, logger);
decorateUpdateImports(ls, snapshotManager, logger);
Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-plugin/src/module-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export function patchModuleLoader(
project: ts.server.Project,
configManager: ConfigManager
): void {
const svelteSys = createSvelteSys(logger);
const svelteSys = createSvelteSys(typescript, logger);
const moduleCache = new ModuleResolutionCache(project.projectService);
const origResolveModuleNames = lsHost.resolveModuleNames?.bind(lsHost);
const origResolveModuleNamLiterals = lsHost.resolveModuleNameLiterals?.bind(lsHost);
Expand Down
6 changes: 4 additions & 2 deletions packages/typescript-plugin/src/svelte-sys.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import ts from 'typescript';
import type ts from 'typescript';
import { Logger } from './logger';
import { ensureRealSvelteFilePath, isVirtualSvelteFilePath, toRealSvelteFilePath } from './utils';

type _ts = typeof ts;

/**
* This should only be accessed by TS svelte module resolution.
*/
export function createSvelteSys(logger: Logger) {
export function createSvelteSys(ts: _ts, logger: Logger) {
const svelteSys: ts.System = {
...ts.sys,
fileExists(path: string) {
Expand Down