daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typo (#65740) 

fix typo for Editor Find, terminalSupport.ts, terminals.ts, extHostDebugService.ts
pull/65822/head
bissonex 2018-12-28 15:13:31 -05:00 committed by Peng Lyu
parent 71af336bfb
commit 36ac195d16
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/editor/common/config/editorOptions.ts
View File

@ -1843,7 +1843,7 @@ export class EditorOptionsValidator {
};
}
private static _santizeFindOpts(opts: IEditorFindOptions | undefined, defaults: InternalEditorFindOptions): InternalEditorFindOptions {
private static _sanitizeFindOpts(opts: IEditorFindOptions | undefined, defaults: InternalEditorFindOptions): InternalEditorFindOptions {
if (typeof opts !== 'object') {
return defaults;
}
@ -1866,7 +1866,7 @@ export class EditorOptionsValidator {
};
}
private static _santizeHoverOpts(_opts: boolean | IEditorHoverOptions | undefined, defaults: InternalEditorHoverOptions): InternalEditorHoverOptions {
private static _sanitizeHoverOpts(_opts: boolean | IEditorHoverOptions | undefined, defaults: InternalEditorHoverOptions): InternalEditorHoverOptions {
let opts: IEditorHoverOptions;
if (typeof _opts === 'boolean') {
opts = {
@ -2027,10 +2027,10 @@ export class EditorOptionsValidator {
if (typeof opts.acceptSuggestionOnEnter === 'boolean') {
opts.acceptSuggestionOnEnter = opts.acceptSuggestionOnEnter ? 'on' : 'off';
}
const find = this._santizeFindOpts(opts.find, defaults.find);
const find = this._sanitizeFindOpts(opts.find, defaults.find);
return {
selectionClipboard: _boolean(opts.selectionClipboard, defaults.selectionClipboard),
hover: this._santizeHoverOpts(opts.hover, defaults.hover),
hover: this._sanitizeHoverOpts(opts.hover, defaults.hover),
links: _boolean(opts.links, defaults.links),
contextmenu: _boolean(opts.contextmenu, defaults.contextmenu),
quickSuggestions: quickSuggestions,

4
src/vs/workbench/api/electron-browser/mainThreadDocuments.ts
View File

@ -180,7 +180,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
let promise: Promise<boolean>;
switch (uri.scheme) {
case Schemas.untitled:
promise = this._handleUnititledScheme(uri);
promise = this._handleUntitledScheme(uri);
break;
case Schemas.file:
default:
@ -213,7 +213,7 @@ export class MainThreadDocuments implements MainThreadDocumentsShape {
});
}
private _handleUnititledScheme(uri: URI): Promise<boolean> {
private _handleUntitledScheme(uri: URI): Promise<boolean> {
let asFileUri = uri.with({ scheme: Schemas.file });
return this._fileService.resolveFile(asFileUri).then(stats => {
// don't create a new file ontop of an existing file

4
src/vs/workbench/api/node/extHostDebugService.ts
View File

@ -20,7 +20,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionService';
import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
import { ITerminalSettings, IDebuggerContribution, IConfig, IDebugAdapter, IDebugAdapterServer, IDebugAdapterExecutable, IAdapterDescriptor } from 'vs/workbench/parts/debug/common/debug';
import { getTerminalLauncher, hasChildprocesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
import { getTerminalLauncher, hasChildProcesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
import { AbstractVariableResolverService } from 'vs/workbench/services/configurationResolver/node/variableResolver';
import { ExtHostConfiguration } from './extHostConfiguration';
@ -330,7 +330,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
return new Promise(resolve => {
if (this._integratedTerminalInstance) {
this._integratedTerminalInstance.processId.then(pid => {
resolve(hasChildprocesses(pid));
resolve(hasChildProcesses(pid));
}, err => {
resolve(true);
});

4
src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts
View File

@ -8,7 +8,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
import { ITerminalService, ITerminalInstance } from 'vs/workbench/parts/terminal/common/terminal';
import { ITerminalService as IExternalTerminalService } from 'vs/workbench/parts/execution/common/execution';
import { ITerminalLauncher, ITerminalSettings } from 'vs/workbench/parts/debug/common/debug';
import { hasChildprocesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
import { hasChildProcesses, prepareCommand } from 'vs/workbench/parts/debug/node/terminals';
export class TerminalLauncher implements ITerminalLauncher {
@ -37,7 +37,7 @@ export class TerminalLauncher implements ITerminalLauncher {
}
let t = this.integratedTerminalInstance;
if ((t && hasChildprocesses(t.processId)) || !t) {
if ((t && hasChildProcesses(t.processId)) || !t) {
t = this.terminalService.createTerminal({ name: args.title || nls.localize('debug.terminal.title', "debuggee") });
this.integratedTerminalInstance = t;
}

2
src/vs/workbench/parts/debug/node/terminals.ts
View File

@ -257,7 +257,7 @@ function quote(args: string[]): string {
}
export function hasChildprocesses(processId: number): boolean {
export function hasChildProcesses(processId: number): boolean {
if (processId) {
try {
// if shell has at least one child process, assume that shell is busy