Merge pull request #3327 from github/robertbrignull/VsCodeWindow

Introduce VsCodeWindow to provide types for the fields we're reading/writing

Author: robertbrignull

extensions/ql-vscode/src/view/common/CodePaths/__tests__/CodePaths.spec.tsx

@@ -29,7 +29,7 @@ describe(CodePaths.name, () => {
 
     await userEvent.click(screen.getByText("Show paths"));
 
-    expect((window as any).vsCodeApi.postMessage).toHaveBeenCalledWith({
+    expect(window.vsCodeApi.postMessage).toHaveBeenCalledWith({
       t: "showDataFlowPaths",
       dataFlowPaths: {
         codeFlows: createMockCodeFlows(),

extensions/ql-vscode/src/view/jest.setup.ts

@@ -16,14 +16,12 @@ Object.defineProperty(window, "matchMedia", {
 });
 
 // Used by Primer React
-(window as any).CSS = {
-  supports: jest.fn().mockResolvedValue(false),
-};
+window.CSS.supports = jest.fn().mockResolvedValue(false);
 
 // Store this on the window so we can mock it
-(window as any).vsCodeApi = {
+window.vsCodeApi = {
   postMessage: jest.fn(),
   setState: jest.fn(),
 };
 
-(window as any).acquireVsCodeApi = () => (window as any).vsCodeApi;
+window.acquireVsCodeApi = () => window.vsCodeApi;

extensions/ql-vscode/src/view/variant-analysis/__tests__/RepoRow.spec.tsx

@@ -355,7 +355,7 @@ describe(RepoRow.name, () => {
       );
     });
 
-    expect((window as any).vsCodeApi.postMessage).toHaveBeenCalledWith({
+    expect(window.vsCodeApi.postMessage).toHaveBeenCalledWith({
       t: "requestRepositoryResults",
       repositoryFullName: "octodemo/hello-world-1",
     });

extensions/ql-vscode/src/view/vscode-window.ts

@@ -0,0 +1,11 @@
+import type { VsCodeApi } from "./vscode-api";
+
+declare global {
+  interface Window {
+    CSS: {
+      supports: () => Promise<boolean>;
+    };
+    vsCodeApi: VsCodeApi;
+    acquireVsCodeApi: () => VsCodeApi;
+  }
+}