Skip to content

Commit 8b3786c

Browse files
starckestarcke
committed
Remove old language context filter.
1 parent 23dc8f1 commit 8b3786c

3 files changed

Lines changed: 2 additions & 311 deletions

File tree

‎extensions/ql-vscode/package.json‎

Lines changed: 0 additions & 229 deletions
Original file line numberDiff line numberDiff line change
@@ -752,78 +752,6 @@
752752
"command": "codeQLDatabases.addDatabaseSource",
753753
"title": "Add Database Source to Workspace"
754754
},
755-
{
756-
"command": "codeQLDatabases.displayAllLanguages",
757-
"title": "All languages"
758-
},
759-
{
760-
"command": "codeQLDatabases.displayAllLanguagesSelected",
761-
"title": "All languages (selected)"
762-
},
763-
{
764-
"command": "codeQLDatabases.displayCpp",
765-
"title": "C/C++"
766-
},
767-
{
768-
"command": "codeQLDatabases.displayCppSelected",
769-
"title": "C/C++ (selected)"
770-
},
771-
{
772-
"command": "codeQLDatabases.displayCsharp",
773-
"title": "C#"
774-
},
775-
{
776-
"command": "codeQLDatabases.displayCsharpSelected",
777-
"title": "C# (selected)"
778-
},
779-
{
780-
"command": "codeQLDatabases.displayGo",
781-
"title": "Go"
782-
},
783-
{
784-
"command": "codeQLDatabases.displayGoSelected",
785-
"title": "Go (selected)"
786-
},
787-
{
788-
"command": "codeQLDatabases.displayJava",
789-
"title": "Java/Kotlin"
790-
},
791-
{
792-
"command": "codeQLDatabases.displayJavaSelected",
793-
"title": "Java/Kotlin (selected)"
794-
},
795-
{
796-
"command": "codeQLDatabases.displayJavascript",
797-
"title": "JavaScript/TypeScript"
798-
},
799-
{
800-
"command": "codeQLDatabases.displayJavascriptSelected",
801-
"title": "JavaScript/TypeScript (selected)"
802-
},
803-
{
804-
"command": "codeQLDatabases.displayPython",
805-
"title": "Python"
806-
},
807-
{
808-
"command": "codeQLDatabases.displayPythonSelected",
809-
"title": "Python (selected)"
810-
},
811-
{
812-
"command": "codeQLDatabases.displayRuby",
813-
"title": "Ruby"
814-
},
815-
{
816-
"command": "codeQLDatabases.displayRubySelected",
817-
"title": "Ruby (selected)"
818-
},
819-
{
820-
"command": "codeQLDatabases.displaySwift",
821-
"title": "Swift"
822-
},
823-
{
824-
"command": "codeQLDatabases.displaySwiftSelected",
825-
"title": "Swift (selected)"
826-
},
827755
{
828756
"command": "codeQL.chooseDatabaseFolder",
829757
"title": "CodeQL: Choose Database from Folder"
@@ -1074,11 +1002,6 @@
10741002
"when": "view == codeQLDatabases",
10751003
"group": "1_databases@1"
10761004
},
1077-
{
1078-
"submenu": "codeQLDatabases.languages",
1079-
"when": "view == codeQLDatabases && config.codeQL.canary && config.codeQL.showLanguageFilter",
1080-
"group": "2_databases@0"
1081-
},
10821005
{
10831006
"command": "codeQLQueries.createQuery",
10841007
"when": "view == codeQLQueries",
@@ -1608,78 +1531,6 @@
16081531
"command": "codeQLDatabases.upgradeDatabase",
16091532
"when": "false"
16101533
},
1611-
{
1612-
"command": "codeQLDatabases.displayAllLanguages",
1613-
"when": "false"
1614-
},
1615-
{
1616-
"command": "codeQLDatabases.displayAllLanguagesSelected",
1617-
"when": "false"
1618-
},
1619-
{
1620-
"command": "codeQLDatabases.displayCpp",
1621-
"when": "false"
1622-
},
1623-
{
1624-
"command": "codeQLDatabases.displayCppSelected",
1625-
"when": "false"
1626-
},
1627-
{
1628-
"command": "codeQLDatabases.displayCsharp",
1629-
"when": "false"
1630-
},
1631-
{
1632-
"command": "codeQLDatabases.displayCsharpSelected",
1633-
"when": "false"
1634-
},
1635-
{
1636-
"command": "codeQLDatabases.displayGo",
1637-
"when": "false"
1638-
},
1639-
{
1640-
"command": "codeQLDatabases.displayGoSelected",
1641-
"when": "false"
1642-
},
1643-
{
1644-
"command": "codeQLDatabases.displayJava",
1645-
"when": "false"
1646-
},
1647-
{
1648-
"command": "codeQLDatabases.displayJavaSelected",
1649-
"when": "false"
1650-
},
1651-
{
1652-
"command": "codeQLDatabases.displayJavascript",
1653-
"when": "false"
1654-
},
1655-
{
1656-
"command": "codeQLDatabases.displayJavascriptSelected",
1657-
"when": "false"
1658-
},
1659-
{
1660-
"command": "codeQLDatabases.displayPython",
1661-
"when": "false"
1662-
},
1663-
{
1664-
"command": "codeQLDatabases.displayPythonSelected",
1665-
"when": "false"
1666-
},
1667-
{
1668-
"command": "codeQLDatabases.displayRuby",
1669-
"when": "false"
1670-
},
1671-
{
1672-
"command": "codeQLDatabases.displayRubySelected",
1673-
"when": "false"
1674-
},
1675-
{
1676-
"command": "codeQLDatabases.displaySwift",
1677-
"when": "false"
1678-
},
1679-
{
1680-
"command": "codeQLDatabases.displaySwiftSelected",
1681-
"when": "false"
1682-
},
16831534
{
16841535
"command": "codeQLQueryHistory.openQueryContextMenu",
16851536
"when": "false"
@@ -1878,88 +1729,8 @@
18781729
"command": "codeQL.gotoQLContextEditor",
18791730
"when": "editorLangId == ql-summary && config.codeQL.canary"
18801731
}
1881-
],
1882-
"codeQLDatabases.languages": [
1883-
{
1884-
"command": "codeQLDatabases.displayAllLanguages",
1885-
"when": "codeQLDatabases.languageFilter"
1886-
},
1887-
{
1888-
"command": "codeQLDatabases.displayAllLanguagesSelected",
1889-
"when": "!codeQLDatabases.languageFilter"
1890-
},
1891-
{
1892-
"command": "codeQLDatabases.displayCpp",
1893-
"when": "codeQLDatabases.languageFilter != cpp"
1894-
},
1895-
{
1896-
"command": "codeQLDatabases.displayCppSelected",
1897-
"when": "codeQLDatabases.languageFilter == cpp"
1898-
},
1899-
{
1900-
"command": "codeQLDatabases.displayCsharp",
1901-
"when": "codeQLDatabases.languageFilter != csharp"
1902-
},
1903-
{
1904-
"command": "codeQLDatabases.displayCsharpSelected",
1905-
"when": "codeQLDatabases.languageFilter == csharp"
1906-
},
1907-
{
1908-
"command": "codeQLDatabases.displayGo",
1909-
"when": "codeQLDatabases.languageFilter != go"
1910-
},
1911-
{
1912-
"command": "codeQLDatabases.displayGoSelected",
1913-
"when": "codeQLDatabases.languageFilter == go"
1914-
},
1915-
{
1916-
"command": "codeQLDatabases.displayJava",
1917-
"when": "codeQLDatabases.languageFilter != java"
1918-
},
1919-
{
1920-
"command": "codeQLDatabases.displayJavaSelected",
1921-
"when": "codeQLDatabases.languageFilter == java"
1922-
},
1923-
{
1924-
"command": "codeQLDatabases.displayJavascript",
1925-
"when": "codeQLDatabases.languageFilter != javascript"
1926-
},
1927-
{
1928-
"command": "codeQLDatabases.displayJavascriptSelected",
1929-
"when": "codeQLDatabases.languageFilter == javascript"
1930-
},
1931-
{
1932-
"command": "codeQLDatabases.displayPython",
1933-
"when": "codeQLDatabases.languageFilter != python"
1934-
},
1935-
{
1936-
"command": "codeQLDatabases.displayPythonSelected",
1937-
"when": "codeQLDatabases.languageFilter == python"
1938-
},
1939-
{
1940-
"command": "codeQLDatabases.displayRuby",
1941-
"when": "codeQLDatabases.languageFilter != ruby"
1942-
},
1943-
{
1944-
"command": "codeQLDatabases.displayRubySelected",
1945-
"when": "codeQLDatabases.languageFilter == ruby"
1946-
},
1947-
{
1948-
"command": "codeQLDatabases.displaySwift",
1949-
"when": "codeQLDatabases.languageFilter != swift"
1950-
},
1951-
{
1952-
"command": "codeQLDatabases.displaySwiftSelected",
1953-
"when": "codeQLDatabases.languageFilter == swift"
1954-
}
19551732
]
19561733
},
1957-
"submenus": [
1958-
{
1959-
"id": "codeQLDatabases.languages",
1960-
"label": "Languages"
1961-
}
1962-
],
19631734
"viewsContainers": {
19641735
"activitybar": [
19651736
{

‎extensions/ql-vscode/src/common/commands.ts‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -227,24 +227,6 @@ export type LocalDatabasesCommands = {
227227
"codeQLDatabases.chooseDatabaseGithub": () => Promise<void>;
228228
"codeQLDatabases.sortByName": () => Promise<void>;
229229
"codeQLDatabases.sortByDateAdded": () => Promise<void>;
230-
"codeQLDatabases.displayAllLanguages": () => Promise<void>;
231-
"codeQLDatabases.displayCpp": () => Promise<void>;
232-
"codeQLDatabases.displayCsharp": () => Promise<void>;
233-
"codeQLDatabases.displayGo": () => Promise<void>;
234-
"codeQLDatabases.displayJava": () => Promise<void>;
235-
"codeQLDatabases.displayJavascript": () => Promise<void>;
236-
"codeQLDatabases.displayPython": () => Promise<void>;
237-
"codeQLDatabases.displayRuby": () => Promise<void>;
238-
"codeQLDatabases.displaySwift": () => Promise<void>;
239-
"codeQLDatabases.displayAllLanguagesSelected": () => Promise<void>;
240-
"codeQLDatabases.displayCppSelected": () => Promise<void>;
241-
"codeQLDatabases.displayCsharpSelected": () => Promise<void>;
242-
"codeQLDatabases.displayGoSelected": () => Promise<void>;
243-
"codeQLDatabases.displayJavaSelected": () => Promise<void>;
244-
"codeQLDatabases.displayJavascriptSelected": () => Promise<void>;
245-
"codeQLDatabases.displayPythonSelected": () => Promise<void>;
246-
"codeQLDatabases.displayRubySelected": () => Promise<void>;
247-
"codeQLDatabases.displaySwiftSelected": () => Promise<void>;
248230

249231
// Database panel context menu
250232
"codeQLDatabases.setCurrentDatabase": (

‎extensions/ql-vscode/src/databases/local-databases-ui.ts‎

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import {
5151
createMultiSelectionCommand,
5252
createSingleSelectionCommand,
5353
} from "../common/vscode/selection-commands";
54-
import { QueryLanguage, tryGetQueryLanguage } from "../common/query-language";
54+
import { tryGetQueryLanguage } from "../common/query-language";
5555
import { LanguageContextStore } from "../language-context-store";
5656

5757
enum SortOrder {
@@ -218,7 +218,7 @@ export class DatabaseUI extends DisposableObject {
218218
public constructor(
219219
private app: App,
220220
private databaseManager: DatabaseManager,
221-
private languageContext: LanguageContextStore,
221+
languageContext: LanguageContextStore,
222222
private readonly queryServer: QueryRunner | undefined,
223223
private readonly storagePath: string,
224224
readonly extensionPath: string,
@@ -265,60 +265,6 @@ export class DatabaseUI extends DisposableObject {
265265
this.handleMakeCurrentDatabase.bind(this),
266266
"codeQLDatabases.sortByName": this.handleSortByName.bind(this),
267267
"codeQLDatabases.sortByDateAdded": this.handleSortByDateAdded.bind(this),
268-
"codeQLDatabases.displayAllLanguages":
269-
this.handleClearLanguageFilter.bind(this),
270-
"codeQLDatabases.displayCpp": this.handleChangeLanguageFilter.bind(
271-
this,
272-
QueryLanguage.Cpp,
273-
),
274-
"codeQLDatabases.displayCsharp": this.handleChangeLanguageFilter.bind(
275-
this,
276-
QueryLanguage.CSharp,
277-
),
278-
"codeQLDatabases.displayGo": this.handleChangeLanguageFilter.bind(
279-
this,
280-
QueryLanguage.Go,
281-
),
282-
"codeQLDatabases.displayJava": this.handleChangeLanguageFilter.bind(
283-
this,
284-
QueryLanguage.Java,
285-
),
286-
"codeQLDatabases.displayJavascript": this.handleChangeLanguageFilter.bind(
287-
this,
288-
QueryLanguage.Javascript,
289-
),
290-
"codeQLDatabases.displayPython": this.handleChangeLanguageFilter.bind(
291-
this,
292-
QueryLanguage.Python,
293-
),
294-
"codeQLDatabases.displayRuby": this.handleChangeLanguageFilter.bind(
295-
this,
296-
QueryLanguage.Ruby,
297-
),
298-
"codeQLDatabases.displaySwift": this.handleChangeLanguageFilter.bind(
299-
this,
300-
QueryLanguage.Swift,
301-
),
302-
"codeQLDatabases.displayAllLanguagesSelected":
303-
this.handleClearLanguageFilter.bind(this),
304-
"codeQLDatabases.displayCppSelected":
305-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Cpp),
306-
"codeQLDatabases.displayCsharpSelected":
307-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.CSharp),
308-
"codeQLDatabases.displayGoSelected": this.handleChangeLanguageFilter.bind(
309-
this,
310-
QueryLanguage.Go,
311-
),
312-
"codeQLDatabases.displayJavaSelected":
313-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Java),
314-
"codeQLDatabases.displayJavascriptSelected":
315-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Javascript),
316-
"codeQLDatabases.displayPythonSelected":
317-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Python),
318-
"codeQLDatabases.displayRubySelected":
319-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Ruby),
320-
"codeQLDatabases.displaySwiftSelected":
321-
this.handleChangeLanguageFilter.bind(this, QueryLanguage.Swift),
322268
"codeQLDatabases.removeDatabase": createMultiSelectionCommand(
323269
this.handleRemoveDatabase.bind(this),
324270
),
@@ -609,14 +555,6 @@ export class DatabaseUI extends DisposableObject {
609555
}
610556
}
611557

612-
private async handleClearLanguageFilter() {
613-
await this.languageContext.clearLanguageContext();
614-
}
615-
616-
private async handleChangeLanguageFilter(languageFilter: QueryLanguage) {
617-
await this.languageContext.setLanguageContext(languageFilter);
618-
}
619-
620558
private async handleUpgradeCurrentDatabase(): Promise<void> {
621559
return withProgress(
622560
async (progress, token) => {

0 commit comments

Comments
 (0)