Skip to content

Commit 4ffab3c

Browse files
committed
Remove feature flag guard around source archive jump-to-definition
1 parent bb3aa79 commit 4ffab3c

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

extensions/ql-vscode/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CodeQL for Visual Studio Code: Changelog
22

3+
## 1.2.0
4+
5+
- Add CodeQL-query-powered handlers for 'Go to Definition' and 'Go To
6+
References' on source archive files.
7+
38
## 1.1.5
49

510
- Links in results are no longer underlined and monospaced.

extensions/ql-vscode/src/config.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ const ROOT_SETTING = new Setting('codeQL');
4242
// Enable experimental features
4343

4444
/**
45-
* This setting is deliberately not in package.json so that it does
45+
* Any settings below deliberately not in package.json so that they do
4646
* not appear in the settings ui in vscode itself. If users want to
47-
* enable experimental features, they can add
48-
* "codeQl.experimentalFeatures" directly in their vscode settings
49-
* json file.
47+
* enable experimental features, they can add them directly in their
48+
* vscode settings json file.
5049
*/
51-
export const EXPERIMENTAL_FEATURES_SETTING = new Setting('experimentalFeatures', ROOT_SETTING);
5250

5351
/* Advanced setting: used to enable bqrs parsing in the cli instead of in the webview. */
5452
export const EXPERIMENTAL_BQRS_SETTING = new Setting('experimentalBqrsParsing', ROOT_SETTING);

extensions/ql-vscode/src/extension.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { LanguageClient } from 'vscode-languageclient';
33
import { testExplorerExtensionId, TestHub } from 'vscode-test-adapter-api';
44
import * as archiveFilesystemProvider from './archive-filesystem-provider';
55
import { CodeQLCliServer } from './cli';
6-
import { DistributionConfigListener, QueryHistoryConfigListener, QueryServerConfigListener, EXPERIMENTAL_FEATURES_SETTING } from './config';
6+
import { DistributionConfigListener, QueryHistoryConfigListener, QueryServerConfigListener } from './config';
77
import { DatabaseManager } from './databases';
88
import { DatabaseUI } from './databases-ui';
99
import { TemplateQueryDefinitionProvider, TemplateQueryReferenceProvider } from './definitions';
@@ -339,16 +339,16 @@ async function activateWithInstalledDistribution(ctx: ExtensionContext, distribu
339339

340340
ctx.subscriptions.push(client.start());
341341

342-
if (EXPERIMENTAL_FEATURES_SETTING.getValue()) {
343-
languages.registerDefinitionProvider(
344-
{ scheme: archiveFilesystemProvider.zipArchiveScheme },
345-
new TemplateQueryDefinitionProvider(cliServer, qs, dbm)
346-
);
347-
languages.registerReferenceProvider(
348-
{ scheme: archiveFilesystemProvider.zipArchiveScheme },
349-
new TemplateQueryReferenceProvider(cliServer, qs, dbm)
350-
);
351-
}
342+
// Jump-to-definition and find-references
343+
languages.registerDefinitionProvider(
344+
{ scheme: archiveFilesystemProvider.zipArchiveScheme },
345+
new TemplateQueryDefinitionProvider(cliServer, qs, dbm)
346+
);
347+
languages.registerReferenceProvider(
348+
{ scheme: archiveFilesystemProvider.zipArchiveScheme },
349+
new TemplateQueryReferenceProvider(cliServer, qs, dbm)
350+
);
351+
352352
}
353353

354354
function getContextStoragePath(ctx: ExtensionContext) {

0 commit comments

Comments
 (0)