Merge branch 'main' into robertbrignull/data-unsaved-changes

robertbrignull · robertbrignull · commit 930103b3a859 · 2023-07-11T15:11:24.000+01:00
diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json
diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json
@@ -1740,7 +1740,7 @@
     "prepare": "cd ../.. && husky install"
   },
   "dependencies": {
-    "@octokit/plugin-retry": "^3.0.9",
+    "@octokit/plugin-retry": "^4.1.6",
     "@octokit/rest": "^19.0.4",
     "@vscode/codicons": "^0.0.31",
     "@vscode/debugadapter": "^1.59.0",
@@ -1845,7 +1845,7 @@
     "eslint-plugin-etc": "^2.0.2",
     "eslint-plugin-github": "^4.4.1",
     "eslint-plugin-jest-dom": "^5.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-storybook": "^0.6.4",
@@ -1866,7 +1866,7 @@
     "mini-css-extract-plugin": "^2.6.1",
     "npm-run-all": "^4.1.5",
     "patch-package": "^7.0.0",
-    "prettier": "^2.7.1",
+    "prettier": "^3.0.0",
     "tar-stream": "^3.0.0",
     "through2": "^4.0.2",
     "ts-jest": "^29.0.1",
diff --git a/extensions/ql-vscode/src/codeql-cli/distribution.ts b/extensions/ql-vscode/src/codeql-cli/distribution.ts
@@ -954,7 +954,10 @@ export interface GithubReleaseAsset {
 }
 
 export class GithubApiError extends Error {
-  constructor(public status: number, public body: string) {
+  constructor(
+    public status: number,
+    public body: string,
+  ) {
     super(`API call failed with status code ${status}, body: ${body}`);
   }
 }
diff --git a/extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts b/extensions/ql-vscode/src/common/vscode/archive-filesystem-provider.ts
@@ -14,7 +14,10 @@ export class File implements vscode.FileStat {
   mtime: number;
   size: number;
 
-  constructor(public name: string, public data: Uint8Array) {
+  constructor(
+    public name: string,
+    public data: Uint8Array,
+  ) {
     this.type = vscode.FileType.File;
     this.ctime = Date.now();
     this.mtime = Date.now();
diff --git a/extensions/ql-vscode/src/common/vscode/file-path-discovery.ts b/extensions/ql-vscode/src/common/vscode/file-path-discovery.ts
@@ -67,7 +67,10 @@ export abstract class FilePathDiscovery<T extends PathData> extends Discovery {
    * @param name Name of the discovery operation, for logging purposes.
    * @param fileWatchPattern Passed to `vscode.RelativePattern` to determine the files to watch for changes to.
    */
-  constructor(name: string, private readonly fileWatchPattern: string) {
+  constructor(
+    name: string,
+    private readonly fileWatchPattern: string,
+  ) {
     super(name, extLogger);
 
     this.onDidChangePathDataEmitter = this.push(new EventEmitter<void>());
diff --git a/extensions/ql-vscode/src/common/vscode/progress.ts b/extensions/ql-vscode/src/common/vscode/progress.ts
@@ -10,7 +10,10 @@ export class UserCancellationException extends Error {
    * @param message The error message
    * @param silent If silent is true, then this exception will avoid showing a warning message to the user.
    */
-  constructor(message?: string, public readonly silent = false) {
+  constructor(
+    message?: string,
+    public readonly silent = false,
+  ) {
     super(message);
   }
 }
diff --git a/extensions/ql-vscode/src/common/vscode/webview-html.ts b/extensions/ql-vscode/src/common/vscode/webview-html.ts
@@ -72,10 +72,10 @@ export function getHtmlForWebview(
   <head>
     <meta http-equiv="Content-Security-Policy"
           content="default-src 'none'; script-src 'nonce-${nonce}'${
-    allowWasmEval ? " 'wasm-unsafe-eval'" : ""
-  }; font-src ${fontSrc}; style-src ${styleSrc}; connect-src ${
-    webview.cspSource
-  };">
+            allowWasmEval ? " 'wasm-unsafe-eval'" : ""
+          }; font-src ${fontSrc}; style-src ${styleSrc}; connect-src ${
+            webview.cspSource
+          };">
         ${stylesheetsHtmlLines.join(`    ${EOL}`)}
   </head>
   <body>
diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts
@@ -693,7 +693,7 @@ const AUTOGENERATE_QL_PACKS = new Setting(
 );
 
 const AutogenerateQLPacksValues = ["ask", "never"] as const;
-type AutogenerateQLPacks = typeof AutogenerateQLPacksValues[number];
+type AutogenerateQLPacks = (typeof AutogenerateQLPacksValues)[number];
 
 export function getAutogenerateQlPacks(): AutogenerateQLPacks {
   const value = AUTOGENERATE_QL_PACKS.getValue<AutogenerateQLPacks>();
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -216,9 +216,8 @@ function getCommands(
     "codeQL.restartLegacyQueryServerOnConfigChange": restartQueryServer,
     "codeQL.restartQueryServerOnExternalConfigChange": restartQueryServer,
     "codeQL.copyVersion": async () => {
-      const text = `CodeQL extension version: ${
-        extension?.packageJSON.version
-      } \nCodeQL CLI version: ${await getCliVersion()} \nPlatform: ${platform()} ${arch()}`;
+      const text = `CodeQL extension version: ${extension?.packageJSON
+        .version} \nCodeQL CLI version: ${await getCliVersion()} \nPlatform: ${platform()} ${arch()}`;
       await env.clipboard.writeText(text);
       void showAndLogInformationMessage(extLogger, text);
     },
diff --git a/extensions/ql-vscode/src/language-support/contextual/template-provider.ts b/extensions/ql-vscode/src/language-support/contextual/template-provider.ts
@@ -279,7 +279,10 @@ export class TemplatePrintAstProvider {
 export class TemplatePrintCfgProvider {
   private cache: CachedOperation<[Uri, Record<string, string>] | undefined>;
 
-  constructor(private cli: CodeQLCliServer, private dbm: DatabaseManager) {
+  constructor(
+    private cli: CodeQLCliServer,
+    private dbm: DatabaseManager,
+  ) {
     this.cache = new CachedOperation<[Uri, Record<string, string>] | undefined>(
       this.getCfgUri.bind(this),
     );
diff --git a/extensions/ql-vscode/src/query-testing/test-ui.ts b/extensions/ql-vscode/src/query-testing/test-ui.ts
@@ -40,7 +40,10 @@ class QLTestListener extends DisposableObject {
 export class TestUIService extends TestManagerBase implements TestController {
   private readonly listeners: Map<TestAdapter, QLTestListener> = new Map();
 
-  public constructor(app: App, private readonly testHub: TestHub) {
+  public constructor(
+    app: App,
+    private readonly testHub: TestHub,
+  ) {
     super(app);
 
     testHub.registerTestController(this);
diff --git a/extensions/ql-vscode/src/variant-analysis/export-results.ts b/extensions/ql-vscode/src/variant-analysis/export-results.ts
@@ -289,10 +289,13 @@ export async function exportToGist(
   }
 
   // Convert markdownFiles to the appropriate format for uploading to gist
-  const gistFiles = markdownFiles.reduce((acc, cur) => {
-    acc[`${cur.fileName}.md`] = { content: cur.content.join("\n") };
-    return acc;
-  }, {} as { [key: string]: { content: string } });
+  const gistFiles = markdownFiles.reduce(
+    (acc, cur) => {
+      acc[`${cur.fileName}.md`] = { content: cur.content.join("\n") };
+      return acc;
+    },
+    {} as { [key: string]: { content: string } },
+  );
 
   const gistUrl = await createGist(credentials, description, gistFiles);
   if (gistUrl) {
diff --git a/extensions/ql-vscode/src/variant-analysis/shared/variant-analysis-filter-sort.ts b/extensions/ql-vscode/src/variant-analysis/shared/variant-analysis-filter-sort.ts
@@ -158,8 +158,8 @@ export function filterAndSortRepositoriesWithResults<
     filterSortState.repositoryIds.length > 0
   ) {
     return repositories
-      .filter((repo) =>
-        filterSortState.repositoryIds?.includes(repo.repository.id),
+      .filter(
+        (repo) => filterSortState.repositoryIds?.includes(repo.repository.id),
       )
       .sort(compareWithResults(filterSortState));
   }
diff --git a/extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx b/extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx
@@ -197,7 +197,7 @@ export function DataExtensionsEditor({
     [],
   );
 
-  const onGenerateClick = useCallback(() => {
+  const onGenerateFromSourceClick = useCallback(() => {
     vscode.postMessage({
       t: "generateExternalApi",
     });
@@ -297,7 +297,7 @@ export function DataExtensionsEditor({
                   Refresh
                 </VSCodeButton>
               )}
-              <VSCodeButton onClick={onGenerateClick}>
+              <VSCodeButton onClick={onGenerateFromSourceClick}>
                 {viewState?.mode === Mode.Framework
                   ? "Generate"
                   : "Download and generate"}
@@ -319,6 +319,7 @@ export function DataExtensionsEditor({
               onChange={onChange}
               onSaveModelClick={onSaveModelClick}
               onGenerateFromLlmClick={onGenerateFromLlmClick}
+              onGenerateFromSourceClick={onGenerateFromSourceClick}
             />
           </EditorContainer>
         </>
diff --git a/extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx b/extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx
@@ -87,6 +87,7 @@ type Props = {
     externalApiUsages: ExternalApiUsage[],
     modeledMethods: Record<string, ModeledMethod>,
   ) => void;
+  onGenerateFromSourceClick: () => void;
 };
 
 export const LibraryRow = ({
@@ -99,6 +100,7 @@ export const LibraryRow = ({
   onChange,
   onSaveModelClick,
   onGenerateFromLlmClick,
+  onGenerateFromSourceClick,
 }: Props) => {
   const modeledPercentage = useMemo(() => {
     return calculateModeledPercentage(externalApiUsages);
@@ -119,10 +121,14 @@ export const LibraryRow = ({
     [externalApiUsages, modeledMethods, onGenerateFromLlmClick],
   );
 
-  const handleModelFromSource = useCallback(async (e: React.MouseEvent) => {
-    e.stopPropagation();
-    e.preventDefault();
-  }, []);
+  const handleModelFromSource = useCallback(
+    async (e: React.MouseEvent) => {
+      onGenerateFromSourceClick();
+      e.stopPropagation();
+      e.preventDefault();
+    },
+    [onGenerateFromSourceClick],
+  );
 
   const handleModelDependency = useCallback(async (e: React.MouseEvent) => {
     e.stopPropagation();
diff --git a/extensions/ql-vscode/src/view/data-extensions-editor/ModeledMethodsList.tsx b/extensions/ql-vscode/src/view/data-extensions-editor/ModeledMethodsList.tsx
@@ -30,6 +30,7 @@ type Props = {
     externalApiUsages: ExternalApiUsage[],
     modeledMethods: Record<string, ModeledMethod>,
   ) => void;
+  onGenerateFromSourceClick: () => void;
 };
 
 export const ModeledMethodsList = ({
@@ -41,6 +42,7 @@ export const ModeledMethodsList = ({
   onChange,
   onSaveModelClick,
   onGenerateFromLlmClick,
+  onGenerateFromSourceClick,
 }: Props) => {
   const grouped = useMemo(
     () => groupMethods(externalApiUsages, mode),
@@ -63,6 +65,7 @@ export const ModeledMethodsList = ({
           onChange={onChange}
           onSaveModelClick={onSaveModelClick}
           onGenerateFromLlmClick={onGenerateFromLlmClick}
+          onGenerateFromSourceClick={onGenerateFromSourceClick}
         />
       ))}
     </>
diff --git a/extensions/ql-vscode/src/view/results/results.tsx b/extensions/ql-vscode/src/view/results/results.tsx

Original file line number	Diff line number	Diff line change
`@@ -954,7 +954,10 @@ export interface GithubReleaseAsset {`
`954`	`954`	`}`
`955`	`955`
`956`	`956`	`export class GithubApiError extends Error {`
`957`		`- constructor(public status: number, public body: string) {`
	`957`	`+ constructor(`
	`958`	`+ public status: number,`
	`959`	`+ public body: string,`
	`960`	`+ ) {`
`958`	`961`	super(`API call failed with status code ${status}, body: ${body}`);
`959`	`962`	`}`
`960`	`963`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,10 @@ export class UserCancellationException extends Error {`
`10`	`10`	`* @param message The error message`
`11`	`11`	`* @param silent If silent is true, then this exception will avoid showing a warning message to the user.`
`12`	`12`	`*/`
`13`		`- constructor(message?: string, public readonly silent = false) {`
	`13`	`+ constructor(`
	`14`	`+ message?: string,`
	`15`	`+ public readonly silent = false,`
	`16`	`+ ) {`
`14`	`17`	`super(message);`
`15`	`18`	`}`
`16`	`19`	`}`