maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd:vscode] Resolve symlinks for file paths from clangd. 

Summary:
For features like go-to-definition, clangd can point clients to symlink paths
(e.g. in bazel execroot) which might not be desired if the symlink points to a
file in the workspace. Clangd might not be able to build the file, and users
might prefer to edit the file on the real path.

This change converts file paths from clangd to real path (e.g. resolving symlinks).
Long term, we might want to the symlink handling logic to clangd where clangd
can better decide whether symlinks should be resolved according to e.g. compile
commands.

Reviewers: sammccall

Subscribers: klimek, ilya-biryukov, jkorous-apple, cfe-commits

Differential Revision: https://reviews.llvm.org/D44158

llvm-svn: 327009
This commit is contained in:
Eric Liu 2018-03-08 15:28:42 +00:00
parent 2e0cbe5092
commit 2e1980bde1
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clang-tools-extra/clangd/clients/clangd-vscode/src/extension.ts
View File

@ -1,12 +1,13 @@
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import * as vscodelc from 'vscode-languageclient'; import * as vscodelc from 'vscode-languageclient';
import { realpathSync } from 'fs';
/** /**
* Method to get workspace configuration option * Method to get workspace configuration option
* @param option name of the option (e.g. for clangd.path should be path) * @param option name of the option (e.g. for clangd.path should be path)
* @param defaultValue default value to return if option is not set * @param defaultValue default value to return if option is not set
*/ */
function getConfig<T>(option: string, defaultValue?: any) : T { function getConfig<T>(option: string, defaultValue?: any): T {
const config = vscode.workspace.getConfiguration('clangd'); const config = vscode.workspace.getConfiguration('clangd');
return config.get<T>(option, defaultValue); return config.get<T>(option, defaultValue);
} }
@ -24,18 +25,29 @@ export function activate(context: vscode.ExtensionContext) {
}; };
const traceFile = getConfig<string>('trace'); const traceFile = getConfig<string>('trace');
if (!!traceFile) { if (!!traceFile) {
const trace = {CLANGD_TRACE : traceFile}; const trace = { CLANGD_TRACE: traceFile };
clangd.options = {env : {...process.env, ...trace}}; clangd.options = { env: { ...process.env, ...trace } };
} }
const serverOptions: vscodelc.ServerOptions = clangd; const serverOptions: vscodelc.ServerOptions = clangd;
const filePattern: string = '**/*.{' + const filePattern: string = '**/*.{' +
['cpp', 'c', 'cc', 'cxx', 'c++', 'm', 'mm', 'h', 'hh', 'hpp', 'hxx', 'inc'].join() + '}'; ['cpp', 'c', 'cc', 'cxx', 'c++', 'm', 'mm', 'h', 'hh', 'hpp', 'hxx', 'inc'].join() + '}';
const clientOptions: vscodelc.LanguageClientOptions = { const clientOptions: vscodelc.LanguageClientOptions = {
// Register the server for C/C++ files // Register the server for C/C++ files
documentSelector: [{scheme: 'file', pattern: filePattern}], documentSelector: [{ scheme: 'file', pattern: filePattern }],
synchronize: !syncFileEvents ? undefined : { synchronize: !syncFileEvents ? undefined : {
fileEvents: vscode.workspace.createFileSystemWatcher(filePattern) fileEvents: vscode.workspace.createFileSystemWatcher(filePattern)
},
// Resolve symlinks for all files provided by clangd.
// This is a workaround for a bazel + clangd issue - bazel produces a symlink tree to build in,
// and when navigating to the included file, clangd passes its path inside the symlink tree
// rather than its filesystem path.
// FIXME: remove this once clangd knows enough about bazel to resolve the
// symlinks where needed (or if this causes problems for other workflows).
uriConverters: {
code2Protocol: (value: vscode.Uri) => value.toString(),
protocol2Code: (value: string) =>
vscode.Uri.file(realpathSync(vscode.Uri.parse(value).fsPath))
} }
}; };