From 4ffab3c16df96034d28a1ad7a73e4d572623a8ac Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Thu, 14 May 2020 10:53:33 -0400 Subject: [PATCH 1/2] Remove feature flag guard around source archive jump-to-definition --- extensions/ql-vscode/CHANGELOG.md | 5 +++++ extensions/ql-vscode/src/config.ts | 8 +++----- extensions/ql-vscode/src/extension.ts | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 816d1ddfb34..68d4751f321 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -1,5 +1,10 @@ # CodeQL for Visual Studio Code: Changelog +## 1.2.0 + +- Add CodeQL-query-powered handlers for 'Go to Definition' and 'Go To + References' on source archive files. + ## 1.1.5 - Links in results are no longer underlined and monospaced. diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index 3b23c334eff..33b30b31c70 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -42,13 +42,11 @@ const ROOT_SETTING = new Setting('codeQL'); // Enable experimental features /** - * This setting is deliberately not in package.json so that it does + * Any settings below deliberately not in package.json so that they do * not appear in the settings ui in vscode itself. If users want to - * enable experimental features, they can add - * "codeQl.experimentalFeatures" directly in their vscode settings - * json file. + * enable experimental features, they can add them directly in their + * vscode settings json file. */ -export const EXPERIMENTAL_FEATURES_SETTING = new Setting('experimentalFeatures', ROOT_SETTING); /* Advanced setting: used to enable bqrs parsing in the cli instead of in the webview. */ export const EXPERIMENTAL_BQRS_SETTING = new Setting('experimentalBqrsParsing', ROOT_SETTING); diff --git a/extensions/ql-vscode/src/extension.ts b/extensions/ql-vscode/src/extension.ts index a19ce6eb211..2ede21bb739 100644 --- a/extensions/ql-vscode/src/extension.ts +++ b/extensions/ql-vscode/src/extension.ts @@ -3,7 +3,7 @@ import { LanguageClient } from 'vscode-languageclient'; import { testExplorerExtensionId, TestHub } from 'vscode-test-adapter-api'; import * as archiveFilesystemProvider from './archive-filesystem-provider'; import { CodeQLCliServer } from './cli'; -import { DistributionConfigListener, QueryHistoryConfigListener, QueryServerConfigListener, EXPERIMENTAL_FEATURES_SETTING } from './config'; +import { DistributionConfigListener, QueryHistoryConfigListener, QueryServerConfigListener } from './config'; import { DatabaseManager } from './databases'; import { DatabaseUI } from './databases-ui'; import { TemplateQueryDefinitionProvider, TemplateQueryReferenceProvider } from './definitions'; @@ -339,16 +339,16 @@ async function activateWithInstalledDistribution(ctx: ExtensionContext, distribu ctx.subscriptions.push(client.start()); - if (EXPERIMENTAL_FEATURES_SETTING.getValue()) { - languages.registerDefinitionProvider( - { scheme: archiveFilesystemProvider.zipArchiveScheme }, - new TemplateQueryDefinitionProvider(cliServer, qs, dbm) - ); - languages.registerReferenceProvider( - { scheme: archiveFilesystemProvider.zipArchiveScheme }, - new TemplateQueryReferenceProvider(cliServer, qs, dbm) - ); - } + // Jump-to-definition and find-references + languages.registerDefinitionProvider( + { scheme: archiveFilesystemProvider.zipArchiveScheme }, + new TemplateQueryDefinitionProvider(cliServer, qs, dbm) + ); + languages.registerReferenceProvider( + { scheme: archiveFilesystemProvider.zipArchiveScheme }, + new TemplateQueryReferenceProvider(cliServer, qs, dbm) + ); + } function getContextStoragePath(ctx: ExtensionContext) { From a98e3bc9ae938563a9e8c8a033c73aac1d872737 Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Fri, 15 May 2020 12:41:44 -0400 Subject: [PATCH 2/2] Fix docs, comments. --- extensions/ql-vscode/CHANGELOG.md | 4 ++-- extensions/ql-vscode/src/config.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 68d4751f321..e1ea4ebd56e 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,8 +2,8 @@ ## 1.2.0 -- Add CodeQL-query-powered handlers for 'Go to Definition' and 'Go To - References' on source archive files. +- Enable 'Go to Definition' and 'Go to References' on source archive + files in CodeQL databases. This is handled by a CodeQL query. ## 1.1.5 diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index 33b30b31c70..ebe31088279 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -42,10 +42,10 @@ const ROOT_SETTING = new Setting('codeQL'); // Enable experimental features /** - * Any settings below deliberately not in package.json so that they do - * not appear in the settings ui in vscode itself. If users want to - * enable experimental features, they can add them directly in their - * vscode settings json file. + * Any settings below are deliberately not in package.json so that + * they do not appear in the settings ui in vscode itself. If users + * want to enable experimental features, they can add them directly in + * their vscode settings json file. */ /* Advanced setting: used to enable bqrs parsing in the cli instead of in the webview. */