Merge pull request #1625 from github/aeisenberg/dil-fixes

aeisenberg · web-flow · commit a625a39999a3 · 2022-10-20T10:38:20.000-07:00
A couple of small changes around the new query server
diff --git a/extensions/ql-vscode/src/legacy-query-server/run-queries.ts b/extensions/ql-vscode/src/legacy-query-server/run-queries.ts
@@ -54,7 +54,7 @@ export class QueryInProgress {
   }
 
   get compiledQueryPath() {
-    return path.join(this.querySaveDir, 'compiledQuery.qlo');
+    return this.queryEvalInfo.compileQueryPath;
   }
 
 
diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts
@@ -192,7 +192,7 @@ export class QueryEvaluationInfo {
     if (await this.hasDil()) {
       return this.dilPath;
     }
-    const compiledQuery = path.join(this.querySaveDir, 'compiledQuery.qlo');
+    const compiledQuery = this.compileQueryPath;
     if (!(await fs.pathExists(compiledQuery))) {
       if (await cliServer.cliConstraints.supportsNewQueryServer()) {
         // This could be from the new query server

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export class QueryInProgress {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`get compiledQueryPath() {`
`57`		`- return path.join(this.querySaveDir, 'compiledQuery.qlo');`
	`57`	`+ return this.queryEvalInfo.compileQueryPath;`
`58`	`58`	`}`
`59`	`59`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ export class QueryEvaluationInfo {`
`192`	`192`	`if (await this.hasDil()) {`
`193`	`193`	`return this.dilPath;`
`194`	`194`	`}`
`195`		`- const compiledQuery = path.join(this.querySaveDir, 'compiledQuery.qlo');`
	`195`	`+ const compiledQuery = this.compileQueryPath;`
`196`	`196`	`if (!(await fs.pathExists(compiledQuery))) {`
`197`	`197`	`if (await cliServer.cliConstraints.supportsNewQueryServer()) {`
`198`	`198`	`// This could be from the new query server`