From 16d682b6e519bfa55d9da904992fbd08e6fff83a Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Mon, 18 Dec 2017 11:29:45 +0000 Subject: [PATCH] [clangd] in VSCode client, filter extensions properly and only accept file: URIs Summary: The filtering wasn't previously working as intended - the string list is interpreted as a list of editor modes, not file extensions. (It happens to mostly work as "c" and "cpp" are the names of modes, but we're missing objective-c) The file: restriction is new - clangd needs to be able to convert URI<->path in order to determine how to build. Reviewers: hokein Subscribers: klimek, ilya-biryukov, cfe-commits Differential Revision: https://reviews.llvm.org/D41343 llvm-svn: 320972 --- .../clangd/clients/clangd-vscode/src/extension.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts index 47c13a18f964..65f3d4551c31 100644 --- a/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts +++ b/clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts @@ -22,11 +22,11 @@ export function activate(context: vscode.ExtensionContext) { const serverOptions: vscodelc.ServerOptions = { command: clangdPath, args: clangdArgs }; - const cppFileExtensions: string[] = ['cpp', 'c', 'cc', 'cxx', 'c++', 'm', 'mm', 'h', 'hh', 'hpp', 'hxx', 'inc']; - const cppFileExtensionsPattern = cppFileExtensions.join(); + const filePattern: string = '**/*.{' + + ['cpp', 'c', 'cc', 'cxx', 'c++', 'm', 'mm', 'h', 'hh', 'hpp', 'hxx', 'inc'].join() + '}'; const clientOptions: vscodelc.LanguageClientOptions = { // Register the server for C/C++ files - documentSelector: cppFileExtensions, + documentSelector: [{scheme: 'file', pattern: filePattern}], uriConverters: { // FIXME: by default the URI sent over the protocol will be percent encoded (see rfc3986#section-2.1) // the "workaround" below disables temporarily the encoding until decoding @@ -35,7 +35,7 @@ export function activate(context: vscode.ExtensionContext) { protocol2Code: (uri: string) : vscode.Uri => vscode.Uri.parse(uri) }, synchronize: !syncFileEvents ? undefined : { - fileEvents: vscode.workspace.createFileSystemWatcher('**/*.{' + cppFileExtensionsPattern + '}') + fileEvents: vscode.workspace.createFileSystemWatcher(filePattern) } };