volar-service-typescript 0.0.57 → 0.0.59

package/lib/plugins/semantic.js

@@ -775,15 +775,32 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             async function isCancellationRequestedWhileSync(token) {
                 if (sys.sync) {
                     let oldSysVersion;
-                    let newSysVersion = await sys.sync();
+                    let newSysVersion = sys.version;
                     do {
                         oldSysVersion = newSysVersion;
-                        languageService.getProgram(); // trigger sync
-                        newSysVersion = await sys.sync();
+                        languageService.getProgram(); // trigger file requests
+                        newSysVersion = await aggressiveSync(sys.sync);
                     } while (newSysVersion !== oldSysVersion && !token.isCancellationRequested);
                 }
                 return token.isCancellationRequested;
             }
+            async function aggressiveSync(fn) {
+                const promise = fn();
+                let newVersion;
+                let syncing = true;
+                promise.then(version => {
+                    newVersion = version;
+                    syncing = false;
+                });
+                while (syncing) {
+                    languageService.getProgram(); // trigger file requests before old requests are completed
+                    await Promise.race([promise, sleep(10)]);
+                }
+                return newVersion;
+            }
+            function sleep(ms) {
+                return new Promise(resolve => setTimeout(resolve, ms));
+            }
             function getVirtualScriptByUri(uri) {
                 const decoded = context.decodeEmbeddedDocumentUri(uri);
                 const sourceScript = decoded && context.language.scripts.get(decoded[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.57",
+	"version": "0.0.59",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -26,7 +26,7 @@
 	"devDependencies": {
 		"@types/path-browserify": "latest",
 		"@types/semver": "latest",
-		"@volar/typescript": "~2.4.0-alpha.11"
+		"@volar/typescript": "~2.4.0-alpha.12"
 	},
 	"dependencies": {
 		"path-browserify": "^1.0.1",
@@ -37,12 +37,12 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.4.0-alpha.11"
+		"@volar/language-service": "~2.4.0-alpha.12"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "8ec3487544e6b06d76f66202d222170446c91264"
+	"gitHead": "6be28592ce26a01838c84ef604feaee42980b50f"
 }