Simplify parameters to updateProjectStructure and updateErrorCheck (microsoft#17175)

Andy · web-flow · commit 9ea2350a6d81 · 2017-08-08T07:31:21.000-07:00
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -337,7 +337,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;
@@ -453,22 +453,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)) {
@@ -483,7 +484,7 @@ namespace ts.server {
                 }
             };
 
-            if ((checkList.length > index) && (matchSeq(seq))) {
+            if (checkList.length > index && this.changeSeq === seq) {
                 next.delay(ms, checkOne);
             }
         }
@@ -1262,14 +1263,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);
             }
         }
 
@@ -1283,7 +1284,7 @@ namespace ts.server {
                     scriptInfo.editContent(start, end, args.insertString);
                     this.changeSeq++;
                 }
-                this.updateProjectStructure(this.changeSeq, n => n === this.changeSeq);
+                this.updateProjectStructure();
             }
         }
 
@@ -1638,7 +1639,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
`@@ -337,7 +337,7 @@ namespace ts.server {`
`337`	`337`	`case ContextEvent:`
`338`	`338`	`const { project, fileName } = event.data;`
`339`	`339`	this.projectService.logger.info(`got context event, updating diagnostics for ${fileName}`);
`340`		`- this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], this.changeSeq, (n) => n === this.changeSeq, 100));`
	`340`	`+ this.errorCheck.startNew(next => this.updateErrorCheck(next, [{ fileName, project }], 100));`
`341`	`341`	`break;`
`342`	`342`	`case ConfigFileDiagEvent:`
`343`	`343`	`const { triggerFile, configFileName, diagnostics } = event.data;`
`@@ -453,22 +453,23 @@ namespace ts.server {`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`
`456`		`- private updateProjectStructure(seq: number, matchSeq: (seq: number) => boolean, ms = 1500) {`
	`456`	`+ private updateProjectStructure() {`
	`457`	`+ const ms = 1500;`
	`458`	`+ const seq = this.changeSeq;`
`457`	`459`	`this.host.setTimeout(() => {`
`458`		`- if (matchSeq(seq)) {`
	`460`	`+ if (this.changeSeq === seq) {`
`459`	`461`	`this.projectService.refreshInferredProjects();`
`460`	`462`	`}`
`461`	`463`	`}, ms);`
`462`	`464`	`}`
`463`	`465`
`464`		`- private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], seq: number, matchSeq: (seq: number) => boolean, ms = 1500, followMs = 200, requireOpen = true) {`
`465`		`- if (followMs > ms) {`
`466`		`- followMs = ms;`
`467`		`- }`
	`466`	`+ private updateErrorCheck(next: NextStep, checkList: PendingErrorCheck[], ms: number, requireOpen = true) {`
	`467`	`+ const seq = this.changeSeq;`
	`468`	`+ const followMs = Math.min(ms, 200);`
`468`	`469`
`469`	`470`	`let index = 0;`
`470`	`471`	`const checkOne = () => {`
`471`		`- if (matchSeq(seq)) {`
	`472`	`+ if (this.changeSeq === seq) {`
`472`	`473`	`const checkSpec = checkList[index];`
`473`	`474`	`index++;`
`474`	`475`	`if (checkSpec.project.containsFile(checkSpec.fileName, requireOpen)) {`
`@@ -483,7 +484,7 @@ namespace ts.server {`
`483`	`484`	`}`
`484`	`485`	`};`
`485`	`486`
`486`		`- if ((checkList.length > index) && (matchSeq(seq))) {`
	`487`	`+ if (checkList.length > index && this.changeSeq === seq) {`
`487`	`488`	`next.delay(ms, checkOne);`
`488`	`489`	`}`
`489`	`490`	`}`
`@@ -1262,14 +1263,14 @@ namespace ts.server {`
`1262`	`1263`	`}`
`1263`	`1264`
`1264`	`1265`	`private getDiagnostics(next: NextStep, delay: number, fileNames: string[]): void {`
`1265`		`- const checkList = mapDefined(fileNames, uncheckedFileName => {`
	`1266`	`+ const checkList = mapDefined<string, PendingErrorCheck>(fileNames, uncheckedFileName => {`
`1266`	`1267`	`const fileName = toNormalizedPath(uncheckedFileName);`
`1267`	`1268`	`const project = this.projectService.getDefaultProjectForFile(fileName, /refreshInferredProjects/ true);`
`1268`	`1269`	`return project && { fileName, project };`
`1269`	`1270`	`});`
`1270`	`1271`
`1271`	`1272`	`if (checkList.length > 0) {`
`1272`		`- this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay);`
	`1273`	`+ this.updateErrorCheck(next, checkList, delay);`
`1273`	`1274`	`}`
`1274`	`1275`	`}`
`1275`	`1276`
`@@ -1283,7 +1284,7 @@ namespace ts.server {`
`1283`	`1284`	`scriptInfo.editContent(start, end, args.insertString);`
`1284`	`1285`	`this.changeSeq++;`
`1285`	`1286`	`}`
`1286`		`- this.updateProjectStructure(this.changeSeq, n => n === this.changeSeq);`
	`1287`	`+ this.updateProjectStructure();`
`1287`	`1288`	`}`
`1288`	`1289`	`}`
`1289`	`1290`
`@@ -1638,7 +1639,7 @@ namespace ts.server {`
`1638`	`1639`	`const checkList = fileNamesInProject.map(fileName => ({ fileName, project }));`
`1639`	`1640`	`// Project level error analysis runs on background files too, therefore`
`1640`	`1641`	`// doesn't require the file to be opened`
`1641`		`- this.updateErrorCheck(next, checkList, this.changeSeq, (n) => n === this.changeSeq, delay, 200, /requireOpen/ false);`
	`1642`	`+ this.updateErrorCheck(next, checkList, delay, /requireOpen/ false);`
`1642`	`1643`	`}`
`1643`	`1644`	`}`
`1644`	`1645`