Simplify parameters to updateProjectStructure and updateErrorCheck

Andy Hanson · Andy Hanson · commit bdd8d4d13db4 · 2017-07-13T11:17:42.000-07:00
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -343,7 +343,7 @@ namespace ts.server {
                 case ContextEvent:
                     const { project, fileName } = event.data;
                     this.projectService.logger.info(`got context event, updating diagnostics for ${fileName}`);
-                    this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], this.changeSeq, (n) => n === this.changeSeq, 100));
+                    this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], 100));
                     break;
                 case ConfigFileDiagEvent:
                     const { triggerFile, configFileName, diagnostics } = event.data;
@@ -459,22 +459,23 @@ namespace ts.server {
             }
         }
 
-        private updateProjectStructure(seq: number, matchSeq: (seq: number) => boolean, ms = 1500) {
+        private updateProjectStructure() {
+            const ms = 1500;
+            const seq = this.changeSeq;
             this.host.setTimeout(() => {
-                if (matchSeq(seq)) {
+                if (this.changeSeq === seq) {
                     this.projectService.refreshInferredProjects();
                 }
             }, ms);
         }
 
-        private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], seq: number, matchSeq: (seq: number) => boolean, ms = 1500, followMs = 200, requireOpen = true) {
-            if (followMs > ms) {
-                followMs = ms;
-            }
+        private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], ms: number, requireOpen = true) {
+            const seq = this.changeSeq;
+            const followMs = Math.min(ms, 200);
 
             let index = 0;
             const checkOne = () => {
-                if (matchSeq(seq)) {
+                if (this.changeSeq === seq) {
                     const checkSpec = checkList[index];
                     index++;
                     if (checkSpec.project.containsFile(checkSpec.fileName, requireOpen)) {
@@ -489,7 +490,7 @@ namespace ts.server {
                 }
             };
 
-            if ((checkList.length > index) && (matchSeq(seq))) {
+            if (checkList.length > index && this.changeSeq === seq) {
                 next.delay(ms, checkOne);
             }
         }
@@ -1268,14 +1269,14 @@ namespace ts.server {
         }
 
         private getDiagnostics(next: NextStep, delay: number, fileNames: string[]): void {
-            const checkList = mapDefined(fileNames, uncheckedFileName => {
+            const checkList = mapDefined<string, PendingErrorCheck>(fileNames, uncheckedFileName => {
                 const fileName = toNormalizedPath(uncheckedFileName);
                 const project = this.projectService.getDefaultProjectForFile(fileName, /*refreshInferredProjects*/ true);
                 return project && { fileName, project };
             });
 
             if (checkList.length > 0) {
-                this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay);
+                this.updateErrorCheck(next, checkList, delay);
             }
         }
 
@@ -1289,7 +1290,7 @@ namespace ts.server {
                     scriptInfo.editContent(start, end, args.insertString);
                     this.changeSeq++;
                 }
-                this.updateProjectStructure(this.changeSeq, n => n === this.changeSeq);
+                this.updateProjectStructure();
             }
         }
 
@@ -1644,7 +1645,7 @@ namespace ts.server {
                 const checkList = fileNamesInProject.map(fileName => ({ fileName, project }));
                 // Project level error analysis runs on background files too, therefore
                 // doesn't require the file to be opened
-                this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay, 200, /*requireOpen*/ false);
+                this.updateErrorCheck(next, checkList, delay, /*requireOpen*/ false);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ namespace ts.server {`
`343`	`343`	`case ContextEvent:`
`344`	`344`	`const { project, fileName } = event.data;`
`345`	`345`	this.projectService.logger.info(`got context event, updating diagnostics for ${fileName}`);
`346`		`- this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], this.changeSeq, (n) => n === this.changeSeq, 100));`
	`346`	`+ this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], 100));`
`347`	`347`	`break;`
`348`	`348`	`case ConfigFileDiagEvent:`
`349`	`349`	`const { triggerFile, configFileName, diagnostics } = event.data;`
`@@ -459,22 +459,23 @@ namespace ts.server {`
`459`	`459`	`}`
`460`	`460`	`}`
`461`	`461`
`462`		`- private updateProjectStructure(seq: number, matchSeq: (seq: number) => boolean, ms = 1500) {`
	`462`	`+ private updateProjectStructure() {`
	`463`	`+ const ms = 1500;`
	`464`	`+ const seq = this.changeSeq;`
`463`	`465`	`this.host.setTimeout(() => {`
`464`		`- if (matchSeq(seq)) {`
	`466`	`+ if (this.changeSeq === seq) {`
`465`	`467`	`this.projectService.refreshInferredProjects();`
`466`	`468`	`}`
`467`	`469`	`}, ms);`
`468`	`470`	`}`
`469`	`471`
`470`		`- private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], seq: number, matchSeq: (seq: number) => boolean, ms = 1500, followMs = 200, requireOpen = true) {`
`471`		`- if (followMs > ms) {`
`472`		`- followMs = ms;`
`473`		`- }`
	`472`	`+ private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], ms: number, requireOpen = true) {`
	`473`	`+ const seq = this.changeSeq;`
	`474`	`+ const followMs = Math.min(ms, 200);`
`474`	`475`
`475`	`476`	`let index = 0;`
`476`	`477`	`const checkOne = () => {`
`477`		`- if (matchSeq(seq)) {`
	`478`	`+ if (this.changeSeq === seq) {`
`478`	`479`	`const checkSpec = checkList[index];`
`479`	`480`	`index++;`
`480`	`481`	`if (checkSpec.project.containsFile(checkSpec.fileName, requireOpen)) {`
`@@ -489,7 +490,7 @@ namespace ts.server {`
`489`	`490`	`}`
`490`	`491`	`};`
`491`	`492`
`492`		`- if ((checkList.length > index) && (matchSeq(seq))) {`
	`493`	`+ if (checkList.length > index && this.changeSeq === seq) {`
`493`	`494`	`next.delay(ms, checkOne);`
`494`	`495`	`}`
`495`	`496`	`}`
`@@ -1268,14 +1269,14 @@ namespace ts.server {`
`1268`	`1269`	`}`
`1269`	`1270`
`1270`	`1271`	`private getDiagnostics(next: NextStep, delay: number, fileNames: string[]): void {`
`1271`		`- const checkList = mapDefined(fileNames, uncheckedFileName => {`
	`1272`	`+ const checkList = mapDefined<string, PendingErrorCheck>(fileNames, uncheckedFileName => {`
`1272`	`1273`	`const fileName = toNormalizedPath(uncheckedFileName);`
`1273`	`1274`	`const project = this.projectService.getDefaultProjectForFile(fileName, /refreshInferredProjects/ true);`
`1274`	`1275`	`return project && { fileName, project };`
`1275`	`1276`	`});`
`1276`	`1277`
`1277`	`1278`	`if (checkList.length > 0) {`
`1278`		`- this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay);`
	`1279`	`+ this.updateErrorCheck(next, checkList, delay);`
`1279`	`1280`	`}`
`1280`	`1281`	`}`
`1281`	`1282`
`@@ -1289,7 +1290,7 @@ namespace ts.server {`
`1289`	`1290`	`scriptInfo.editContent(start, end, args.insertString);`
`1290`	`1291`	`this.changeSeq++;`
`1291`	`1292`	`}`
`1292`		`- this.updateProjectStructure(this.changeSeq, n => n === this.changeSeq);`
	`1293`	`+ this.updateProjectStructure();`
`1293`	`1294`	`}`
`1294`	`1295`	`}`
`1295`	`1296`
`@@ -1644,7 +1645,7 @@ namespace ts.server {`
`1644`	`1645`	`const checkList = fileNamesInProject.map(fileName => ({ fileName, project }));`
`1645`	`1646`	`// Project level error analysis runs on background files too, therefore`
`1646`	`1647`	`// doesn't require the file to be opened`
`1647`		`- this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay, 200, /requireOpen/ false);`
	`1648`	`+ this.updateErrorCheck(next, checkList, delay, /requireOpen/ false);`
`1648`	`1649`	`}`
`1649`	`1650`	`}`
`1650`	`1651`