fix: bad merge caused build failure (#1375)

atscott · web-flow · commit cd758708da58 · 2021-05-20T10:00:23.000-07:00
Because 12.0.x and master diverged a little for renaming implementation
the change to return null instead of undefined caused a build error in
the patch branch.
diff --git a/server/src/session.ts b/server/src/session.ts
@@ -832,7 +832,7 @@ export class Session {
       // Because we cannot ensure our extension is prioritized for renames in TS files (see
       // https://github.com/microsoft/vscode/issues/115354) we disable renaming completely so we can
       // provide consistent expectations.
-      return;
+      return null;
     }
     const project = this.getDefaultProjectForScriptInfo(scriptInfo);
     if (project === undefined || this.renameDisabledProjects.has(project)) {

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ export class Session {`
`832`	`832`	`// Because we cannot ensure our extension is prioritized for renames in TS files (see`
`833`	`833`	`// https://github.com/microsoft/vscode/issues/115354) we disable renaming completely so we can`
`834`	`834`	`// provide consistent expectations.`
`835`		`- return;`
	`835`	`+ return null;`
`836`	`836`	`}`
`837`	`837`	`const project = this.getDefaultProjectForScriptInfo(scriptInfo);`
`838`	`838`	`if (project === undefined \|\| this.renameDisabledProjects.has(project)) {`