@volar/monaco 2.0.4 → 2.1.1

package/lib/ata.js

@@ -32,21 +32,21 @@ export function activateAutomaticTypeAcquisition(env, onFetch) {
                     };
                 }
                 if (fileName.startsWith('/node_modules/')) {
-                    const path = uri.substring('/node_modules/'.length);
+                    const path = fileName.substring('/node_modules/'.length);
                     return await _stat(path);
                 }
             },
             async readFile(uri) {
                 const fileName = env.typescript.uriToFileName(uri);
                 if (fileName.startsWith('/node_modules/')) {
-                    const path = uri.substring('/node_modules/'.length);
+                    const path = fileName.substring('/node_modules/'.length);
                     return await _readFile(path);
                 }
             },
             async readDirectory(uri) {
                 const fileName = env.typescript.uriToFileName(uri);
                 if (fileName.startsWith('/node_modules/')) {
-                    const path = uri.substring('/node_modules/'.length);
+                    const path = fileName.substring('/node_modules/'.length);
                     return _readDirectory(path);
                 }
                 return [];
@@ -185,10 +185,10 @@ export function activateAutomaticTypeAcquisition(env, onFetch) {
         const parts = path.split('/');
         let pkgName = parts[0];
         if (pkgName.startsWith('@')) {
-            if (parts.length < 2 || !parts[1]) {
+            if (!parts[1]) {
                 return undefined;
             }
-            pkgName += '/' + parts[2];
+            pkgName += '/' + parts[1];
         }
         return pkgName;
     }

package/lib/provider.js

@@ -184,9 +184,10 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         async provideCompletionItems(model, position, context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeResult = await languageService.doComplete(model.uri.toString(), fromPosition(position), fromCompletionContext(context));
+            const wordInfo = model.getWordUntilPosition(position);
             const monacoResult = toCompletionList(codeResult, {
                 range: {
-                    startColumn: position.column,
+                    startColumn: wordInfo.startColumn,
                     startLineNumber: position.lineNumber,
                     endColumn: position.column,
                     endLineNumber: position.lineNumber,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.0.4",
+	"version": "2.1.1",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,14 +13,14 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.0.4",
-		"@volar/typescript": "2.0.4",
-		"monaco-languageserver-types": "^0.3.2",
+		"@volar/language-service": "2.1.1",
+		"@volar/typescript": "2.1.1",
+		"monaco-languageserver-types": "^0.3.3",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "b3dc544424c95f8b72e832fbaa0f85a34442389b"
+	"gitHead": "e56916097fe7be2920aab6592a564a8e2ceafd14"
 }

package/worker.js

@@ -30,6 +30,7 @@ export function createTypeScriptWorkerService({ typescript: ts, compilerOptions,
     let projectVersion = 0;
     const modelSnapshot = new WeakMap();
     const modelVersions = new Map();
+    const sys = createSys(ts, env, env.typescript.uriToFileName(env.workspaceFolder));
     const host = {
         getCurrentDirectory() {
             return env.typescript.uriToFileName(env.workspaceFolder);
@@ -73,7 +74,6 @@ export function createTypeScriptWorkerService({ typescript: ts, compilerOptions,
         },
         getLanguageId: id => resolveCommonLanguageId(id),
     };
-    const sys = createSys(ts, env, host);
     const languageContext = createLanguage(ts, sys, languagePlugins, undefined, host, {
         fileNameToFileId: env.typescript.fileNameToUri,
         fileIdToFileName: env.typescript.uriToFileName,