Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove enableEnhancedTyping and type overriding infrastructure.

Browse source
This commit is contained in:
Gregoire Geis 2020-02-03 20:24:50 +01:00
parent 58c007674b
commit b70ad7e5f3
4 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editors/code/package.json
View file

@ -167,11 +167,6 @@
"default": {},
"description": "Fine grained feature flags to disable annoying features"
},
"rust-analyzer.enableEnhancedTyping": {
"type": "boolean",
"default": false,
"description": "Enables enhanced typing. NOTE: If using a VIM extension, you should set this to false"
},
"rust-analyzer.raLspServerPath": {
"type": [
"string"

10
editors/code/src/commands/on_enter.ts
View file

@ -26,17 +26,9 @@ async function handleKeypress(ctx: Ctx) {
return true;
}
export function onEnterOverride(ctx: Ctx): Cmd {
return async (event: { text: string }) => {
if (event.text === '\n') {
handleKeypress(ctx);
}
};
}
export function onEnter(ctx: Ctx): Cmd {
return async () => {
if (handleKeypress(ctx)) return;
if (await handleKeypress(ctx)) return;
await vscode.commands.executeCommand('default:type', { text: '\n' });
};

24
editors/code/src/ctx.ts
View file

@ -50,30 +50,6 @@ export class Ctx {
this.pushCleanup(d);
}
overrideCommand(name: string, factory: (ctx: Ctx) => Cmd) {
const defaultCmd = `default:${name}`;
const override = factory(this);
const original = (...args: unknown[]) =>
vscode.commands.executeCommand(defaultCmd, ...args);
try {
const d = vscode.commands.registerCommand(
name,
async (...args: unknown[]) => {
if (!(await override(...args))) {
return await original(...args);
}
},
);
this.pushCleanup(d);
} catch (_) {
vscode.window.showWarningMessage(
'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',
);
}
}
get subscriptions(): Disposable[] {
return this.extCtx.subscriptions;
}

3
editors/code/src/main.ts
View file

@ -29,9 +29,6 @@ export async function activate(context: vscode.ExtensionContext) {
ctx.registerCommand('applySourceChange', commands.applySourceChange);
ctx.registerCommand('selectAndApplySourceChange', commands.selectAndApplySourceChange);
if (ctx.config.enableEnhancedTyping) {
ctx.overrideCommand('type', commands.onEnterOverride);
}
activateStatusDisplay(ctx);
activateHighlighting(ctx);