提交 62960334 编写于 作者: F Francois Valdy

Typo fixes for src/vs/workbench/services

上级 3bf9b6e4
......@@ -861,7 +861,7 @@ if (Env.enableTasks) {
},
'location': {
'type': 'integer',
'description': nls.localize('JsonSchema.pattern.location', 'The match group index of the problem\'s location. Valid location patterns are: (line), (line,column) and (startLine,startColumn,endLine,endColumn). If omitted line and colum is assumed.')
'description': nls.localize('JsonSchema.pattern.location', 'The match group index of the problem\'s location. Valid location patterns are: (line), (line,column) and (startLine,startColumn,endLine,endColumn). If omitted line and column is assumed.')
},
'line': {
'type': 'integer',
......
......@@ -50,7 +50,7 @@ export class ProcessRunnerSystem extends EventEmitter implements ITaskSystem {
private childProcess: LineProcess;
private activeTaskIdentifier: string;
constructor(fileConfig:FileConfig.ExternalTaskRunnerConfiguration, variables:SystemVariables, markerService:IMarkerService, modelService: IModelService, telemetryService: ITelemetryService, outputService:IOutputService, outputChannel:string, clearOuput: boolean = true) {
constructor(fileConfig:FileConfig.ExternalTaskRunnerConfiguration, variables:SystemVariables, markerService:IMarkerService, modelService: IModelService, telemetryService: ITelemetryService, outputService:IOutputService, outputChannel:string, clearOutput: boolean = true) {
super();
this.fileConfig = fileConfig;
this.variables = variables;
......@@ -65,7 +65,7 @@ export class ProcessRunnerSystem extends EventEmitter implements ITaskSystem {
this.childProcess = null;
this.activeTaskIdentifier = null;
if (clearOuput) {
if (clearOutput) {
this.clearOutput();
}
this.errorsShown = false;
......
......@@ -63,7 +63,7 @@ export class ConfigurationService extends CommonConfigurationService {
protected resolveStat(resource: uri): TPromise<IStat> {
return new TPromise<IStat>((c, e) => {
extfs.readdir(resource.fsPath, (error, childs) => {
extfs.readdir(resource.fsPath, (error, children) => {
if (error) {
if ((<any>error).code === 'ENOTDIR') {
c({
......@@ -77,7 +77,7 @@ export class ConfigurationService extends CommonConfigurationService {
c({
resource: resource,
isDirectory: true,
children: childs.map((child) => {
children: children.map((child) => {
if (platform.isMacintosh) {
child = strings.normalizeNFC(child); // Mac: uses NFD unicode form on disk, but we want NFC
}
......@@ -109,7 +109,7 @@ export class ConfigurationService extends CommonConfigurationService {
protected loadWorkspaceConfiguration(section?: string): TPromise<{ [relativeWorkspacePath: string]: IConfigFile }> {
// Return early if we dont have a workspace
// Return early if we don't have a workspace
if (!this.contextService.getWorkspace()) {
return Promise.as({});
}
......@@ -123,7 +123,7 @@ export class ConfigurationService extends CommonConfigurationService {
let globalSettings = this.contextService.getOptions().globalSettings;
return {
contents: objects.mixin(
objects.clone(defaults.contents), // target: default values (but dont modify!)
objects.clone(defaults.contents), // target: default values (but don't modify!)
globalSettings.settings, // source: global configured values
true // overwrite
),
......
......@@ -55,7 +55,7 @@ export interface IWorkbenchEditorService extends IEditorService {
isVisible(input: IEditorInput, includeDiff: boolean): boolean;
/**
* Opens an Editor on the given input with the provided options at the given position. If the input paramater
* Opens an Editor on the given input with the provided options at the given position. If the input parameter
* is null, will cause the currently opened editor at the position to close. If sideBySide parameter is provided,
* causes the editor service to decide in what position to open the input.
*/
......@@ -94,7 +94,7 @@ export interface IWorkbenchEditorService extends IEditorService {
closeEditors(othersOnly?: boolean): TPromise<void>;
/**
* Focus the editor at the provided position. If position is not provided, the current active editor is focussed.
* Focus the editor at the provided position. If position is not provided, the current active editor is focused.
*/
focusEditor(editor?: IEditor): TPromise<IEditor>;
focusEditor(position?: Position): TPromise<IEditor>;
......
......@@ -48,7 +48,7 @@ export class FileService implements files.IFileService {
encodingOverride.push({ resource: uri.file(paths.join(this.contextService.getWorkspace().resource.fsPath, '.vscode')), encoding: encoding.UTF8 });
}
let doNotWatch = ['**/.git/objects/**']; // this folder does the heavy duty for git and we dont need to watch it
let doNotWatch = ['**/.git/objects/**']; // this folder does the heavy duty for git and we don't need to watch it
if (platform.isLinux) {
doNotWatch.push('**/node_modules/**'); // Linux does not have a good watching implementation, so we exclude more
}
......
......@@ -540,7 +540,7 @@ export class FileService implements files.IFileService {
path: fsPath
});
// handle emit through delayer to accomodate for bulk changes
// handle emit through delayer to accommodate for bulk changes
this.fileChangesWatchDelayer.trigger(() => {
let buffer = this.undeliveredRawFileChangesEvents;
this.undeliveredRawFileChangesEvents = [];
......@@ -639,7 +639,7 @@ export class StatResolver {
// Load children
this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, (children) => {
children = arrays.coalesce(children); // we dont want those null childs (could be permission denied when reading a child)
children = arrays.coalesce(children); // we don't want those null children (could be permission denied when reading a child)
fileStat.hasChildren = children && children.length > 0;
fileStat.children = children || [];
......@@ -714,7 +714,7 @@ export class StatResolver {
// Continue resolving children based on condition
if (resolveFolderChildren) {
$this.resolveChildren(fileResource.fsPath, absoluteTargetPaths, resolveSingleChildDescendants, (children) => {
children = arrays.coalesce(children); // we dont want those null childs
children = arrays.coalesce(children); // we don't want those null children
childStat.hasChildren = children && children.length > 0;
childStat.children = children || [];
......
......@@ -28,7 +28,7 @@ export function toFileChangesEvent(changes: IRawFileChange[]): FileChangesEvent
}
/**
* Given events that occured, applies some rules to normalize the events
* Given events that occurred, applies some rules to normalize the events
*/
export function normalize(changes: IRawFileChange[]): IRawFileChange[] {
......
......@@ -74,7 +74,7 @@ export class WorkbenchMessageService implements IMessageService {
}
private onQuickOpenShowing(): void {
this.canShowMessages = false; // when quick open is open, dont show messages behind
this.canShowMessages = false; // when quick open is open, don't show messages behind
this.handler.hide(); // hide messages when quick open is visible
}
......
......@@ -95,7 +95,7 @@ export interface IQuickOpenService {
removeEditorHistoryEntry(input: IEditorInput): void;
/**
* A convinient way to bring up quick open as a picker with custom elements. This bypasses the quick open handler
* A convenient way to bring up quick open as a picker with custom elements. This bypasses the quick open handler
* registry and just leverages the quick open widget to select any kind of entries.
*
* Passing in a promise will allow you to resolve the elements in the background while quick open will show a
......
......@@ -86,7 +86,7 @@ export class SearchService implements ISearchService {
// Match
if (progress.resource) {
if (typeof localResults[progress.resource.toString()] === 'undefined') { // dont override local results
if (typeof localResults[progress.resource.toString()] === 'undefined') { // don't override local results
onProgress(progress);
}
}
......@@ -118,7 +118,7 @@ export class SearchService implements ISearchService {
}
}
// Dont support other resource schemes than files for now
// Don't support other resource schemes than files for now
else if (resource.scheme !== 'file') {
return;
}
......
......@@ -28,7 +28,7 @@ export interface IWorkspaceContextService extends IBaseWorkspaceContextService {
updateOptions(key: string, value: any): void;
/**
* Convinient way to check if auto save is enabled or not.
* Convenient way to check if auto save is enabled or not.
*/
isAutoSaveEnabled(): boolean;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册