nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary

Browse Source
This commit is contained in:
Sahandevs 2021-02-07 21:15:13 +03:30
parent 336909b63a
commit 06c02021a3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/code/src/client.ts
View File

@ -11,7 +11,7 @@ export interface Env {
} }
function renderCommand(cmd: ra.CommandLink) { function renderCommand(cmd: ra.CommandLink) {
return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip!}')`; return `[${cmd.title}](command:${cmd.command}?${encodeURIComponent(JSON.stringify(cmd.arguments))} '${cmd.tooltip}')`;
} }
function renderHoverActions(actions: ra.CommandLinkGroup[]): vscode.MarkdownString { function renderHoverActions(actions: ra.CommandLinkGroup[]): vscode.MarkdownString {

6
editors/code/src/debug.ts
View File

@ -87,11 +87,11 @@ async function getDebugConfiguration(ctx: Ctx, runnable: ra.Runnable): Promise<v
debugOutput.show(true); debugOutput.show(true);
} }
const isMultiFolderWorkspace = vscode.workspace.workspaceFolders!.length > 1; const isMultiFolderWorkspace = vscode.workspace.workspaceFolders.length > 1;
const firstWorkspace = vscode.workspace.workspaceFolders![0]; // folder exists or RA is not active. const firstWorkspace = vscode.workspace.workspaceFolders[0]; // folder exists or RA is not active.
const workspace = !isMultiFolderWorkspace || !runnable.args.workspaceRoot ? const workspace = !isMultiFolderWorkspace || !runnable.args.workspaceRoot ?
firstWorkspace : firstWorkspace :
vscode.workspace.workspaceFolders!.find(w => runnable.args.workspaceRoot?.includes(w.uri.fsPath)) || firstWorkspace; vscode.workspace.workspaceFolders.find(w => runnable.args.workspaceRoot?.includes(w.uri.fsPath)) || firstWorkspace;
const wsFolder = path.normalize(workspace.uri.fsPath); const wsFolder = path.normalize(workspace.uri.fsPath);
const workspaceQualifier = isMultiFolderWorkspace ? `:${workspace.name}` : ''; const workspaceQualifier = isMultiFolderWorkspace ? `:${workspace.name}` : '';

2
editors/code/src/run.ts
View File

@ -145,7 +145,7 @@ export async function createTask(runnable: ra.Runnable, config: Config): Promise
overrideCargo: runnable.args.overrideCargo, overrideCargo: runnable.args.overrideCargo,
}; };
const target = vscode.workspace.workspaceFolders![0]; // safe, see main activate() const target = vscode.workspace.workspaceFolders[0]; // safe, see main activate()
const cargoTask = await tasks.buildCargoTask(target, definition, runnable.label, args, config.cargoRunner, true); const cargoTask = await tasks.buildCargoTask(target, definition, runnable.label, args, config.cargoRunner, true);
cargoTask.presentationOptions.clear = true; cargoTask.presentationOptions.clear = true;

2
editors/code/src/snippets.ts
View File

@ -62,7 +62,7 @@ function parseSnippet(snip: string): [string, [number, number]] | undefined {
const m = snip.match(/\$(0|\{0:([^}]*)\})/); const m = snip.match(/\$(0|\{0:([^}]*)\})/);
if (!m) return undefined; if (!m) return undefined;
const placeholder = m[2] ?? ""; const placeholder = m[2] ?? "";
const range: [number, number] = [m.index!!, placeholder.length]; const range: [number, number] = [m.index, placeholder.length];
const insert = snip.replace(m[0], placeholder); const insert = snip.replace(m[0], placeholder);
return [insert, range]; return [insert, range];
} }