Merge branch 'master' into feature/themes
This commit is contained in:
commit
8edda0e7b1
129 changed files with 5060 additions and 2866 deletions
|
|
@ -21,7 +21,6 @@ export class Config {
|
|||
public rainbowHighlightingOn = false;
|
||||
public enableEnhancedTyping = true;
|
||||
public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
|
||||
public showWorkspaceLoadedNotification = true;
|
||||
public lruCapacity: null | number = null;
|
||||
public displayInlayHints = true;
|
||||
public maxInlayHintLength: null | number = null;
|
||||
|
|
@ -62,12 +61,6 @@ export class Config {
|
|||
) as boolean;
|
||||
}
|
||||
|
||||
if (config.has('showWorkspaceLoadedNotification')) {
|
||||
this.showWorkspaceLoadedNotification = config.get(
|
||||
'showWorkspaceLoadedNotification'
|
||||
) as boolean;
|
||||
}
|
||||
|
||||
if (!this.highlightingOn && Server) {
|
||||
Server.highlighter.removeHighlights();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ export function activate(context: vscode.ExtensionContext) {
|
|||
});
|
||||
} catch (_) {
|
||||
vscode.window.showWarningMessage(
|
||||
'Enhanced typing feature is disabled because of incompatibility with VIM extension'
|
||||
'Enhanced typing feature is disabled because of incompatibility with VIM extension, consider turning off rust-analyzer.enableEnhancedTyping: https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/README.md#settings'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ export class Server {
|
|||
documentSelector: [{ scheme: 'file', language: 'rust' }],
|
||||
initializationOptions: {
|
||||
publishDecorations: true,
|
||||
showWorkspaceLoaded:
|
||||
Server.config.showWorkspaceLoadedNotification,
|
||||
lruCapacity: Server.config.lruCapacity,
|
||||
excludeGlobs: Server.config.excludeGlobs,
|
||||
useClientWatching: Server.config.useClientWatching,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue