Merge pull request #957 from marcnjaramillo/fix-lgtm-download-message

aeisenberg · web-flow · commit 39fdd0cad532 · 2021-10-01T12:07:46.000-07:00
Remove line about selecting a language from the dropdown.
diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [UNRELEASED]
 
+
+- Remove line about selecting a language from the dropdown when downloading database from LGTM. This makes the download progress visible when the popup is not expanded. [#894](https://github.com/github/vscode-codeql/issues/894)
+
 - Fixed a bug where copying the version information fails when a CodeQL CLI cannot be found. [#958](https://github.com/github/vscode-codeql/pull/958)
 
 ## 1.5.5 - 08 September 2021
diff --git a/extensions/ql-vscode/src/databases-ui.ts b/extensions/ql-vscode/src/databases-ui.ts
@@ -295,7 +295,7 @@ export class DatabaseUI extends DisposableObject {
         'codeQLDatabases.chooseDatabaseLgtm',
         this.handleChooseDatabaseLgtm,
         {
-          title: 'Adding database from LGTM. Choose a language from the dropdown, if requested.',
+          title: 'Adding database from LGTM',
         })
     );
     this.push(
diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts
@@ -771,7 +771,7 @@ async function activateWithInstalledDistribution(
     ) =>
       databaseUI.handleChooseDatabaseLgtm(progress, token),
       {
-        title: 'Adding database from LGTM. Choose a language from the dropdown, if requested.',
+        title: 'Adding database from LGTM',
       })
   );
   ctx.subscriptions.push(

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ export class DatabaseUI extends DisposableObject {`
`295`	`295`	`'codeQLDatabases.chooseDatabaseLgtm',`
`296`	`296`	`this.handleChooseDatabaseLgtm,`
`297`	`297`	`{`
`298`		`- title: 'Adding database from LGTM. Choose a language from the dropdown, if requested.',`
	`298`	`+ title: 'Adding database from LGTM',`
`299`	`299`	`})`
`300`	`300`	`);`
`301`	`301`	`this.push(`
Original file line number	Diff line number	Diff line change
`@@ -771,7 +771,7 @@ async function activateWithInstalledDistribution(`
`771`	`771`	`) =>`
`772`	`772`	`databaseUI.handleChooseDatabaseLgtm(progress, token),`
`773`	`773`	`{`
`774`		`- title: 'Adding database from LGTM. Choose a language from the dropdown, if requested.',`
	`774`	`+ title: 'Adding database from LGTM',`
`775`	`775`	`})`
`776`	`776`	`);`
`777`	`777`	`ctx.subscriptions.push(`