updates

volarjs · Dec 12, 2023 · 26d12e1 · 26d12e1
1 parent c228f4b
commit 26d12e1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/typescript/index.ts b/packages/typescript/index.ts
@@ -2,5 +2,6 @@ export * from './lib/documentRegistry';
 export * from './lib/node/decorateLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
 export * from './lib/node/decorateProgram';
+export * from './lib/node/proxyCreateProgram';
 export * from './lib/protocol/createProject';
 export * from './lib/protocol/createSys';
diff --git a/packages/typescript/lib/node/proxyCreateProgram.ts b/packages/typescript/lib/node/proxyCreateProgram.ts
@@ -6,7 +6,7 @@ export function proxyCreateProgram(
 	ts: typeof import('typescript'),
 	original: typeof ts['createProgram'],
 	extensions: string[],
-	getLanguagePlugins: (options: ts.CreateProgramOptions) => LanguagePlugin[],
+	getLanguagePlugins: (ts: typeof import('typescript/lib/tsserverlibrary'), options: ts.CreateProgramOptions) => LanguagePlugin[],
 ) {
 	return new Proxy(original, {
 		apply: (target, thisArg, args) => {
@@ -21,7 +21,7 @@ export function proxyCreateProgram(
 
 			const sourceFileToSnapshotMap = new WeakMap<ts.SourceFile, ts.IScriptSnapshot>();
 			const files = createFileProvider(
-				getLanguagePlugins(options),
+				getLanguagePlugins(ts, options),
 				ts.sys.useCaseSensitiveFileNames,
 				fileName => {
 					let snapshot: ts.IScriptSnapshot | undefined;

diff --git a/packages/typescript/lib/starters/runTsc.ts b/packages/typescript/lib/starters/runTsc.ts
@@ -2,18 +2,18 @@ import * as fs from 'fs';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import type { LanguagePlugin } from '@volar/language-core';
 
-export let getLanguagePlugins: (options: ts.CreateProgramOptions) => LanguagePlugin[] = () => [];
+export let getLanguagePlugins: (ts: typeof import('typescript/lib/tsserverlibrary'), options: ts.CreateProgramOptions) => LanguagePlugin[] = () => [];
 
 export function runTsc(
+	tscPath: string,
 	extensions: string[],
-	_getLanguagePlugins: (options: ts.CreateProgramOptions) => LanguagePlugin[],
+	_getLanguagePlugins: typeof getLanguagePlugins,
 ) {
 
 	getLanguagePlugins = _getLanguagePlugins;
 
 	const proxyApiPath = require.resolve('../node/proxyCreateProgram');
 	const currentFilePath = require.resolve('./runTsc');
-	const tscPath = require.resolve('typescript/lib/tsc');
 	const readFileSync = fs.readFileSync;
 
 	(fs as any).readFileSync = (...args: any[]) => {
@@ -32,7 +32,7 @@ export function runTsc(
 				+ `new Proxy({}, { get(_target, p, _receiver) {return eval(p); } } ), `
 				+ `_createProgram, `
 				+ `[${extsText}], `
-				+ `require(${currentFilePath}).getLanguagePlugins`
+				+ `require(${JSON.stringify(currentFilePath)}).getLanguagePlugins`
 				+ `);\n`
 				+ s.replace('createProgram', '_createProgram')
 			);