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

Typo fixes for src/vs/workbench/parts

上级 3bf9b6e4
...@@ -294,7 +294,7 @@ export class DebugEditorModelManager implements wbext.IWorkbenchContribution { ...@@ -294,7 +294,7 @@ export class DebugEditorModelManager implements wbext.IWorkbenchContribution {
stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
}; };
// We need a seperate decoration for glyph margin, since we do not want it on each line of a multi line statement. // We need a separate decoration for glyph margin, since we do not want it on each line of a multi line statement.
private static TOP_STACK_FRAME_MARGIN: editorcommon.IModelDecorationOptions = { private static TOP_STACK_FRAME_MARGIN: editorcommon.IModelDecorationOptions = {
glyphMarginClassName: 'debug-top-stack-frame-glyph', glyphMarginClassName: 'debug-top-stack-frame-glyph',
stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges stickiness: editorcommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
......
...@@ -47,8 +47,8 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget { ...@@ -47,8 +47,8 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
const pos = range.getStartPosition(); const pos = range.getStartPosition();
const wordAtPosition = this.editor.getModel().getWordAtPosition(pos); const wordAtPosition = this.editor.getModel().getWordAtPosition(pos);
const hoveringOver = wordAtPosition ? wordAtPosition.word : null; const hoveringOver = wordAtPosition ? wordAtPosition.word : null;
const focussedStackFrame = this.debugService.getViewModel().getFocusedStackFrame(); const focusedStackFrame = this.debugService.getViewModel().getFocusedStackFrame();
if (!hoveringOver || !focussedStackFrame || (this.isVisible && hoveringOver === this.lastHoveringOver)) { if (!hoveringOver || !focusedStackFrame || (this.isVisible && hoveringOver === this.lastHoveringOver)) {
return; return;
} }
...@@ -60,7 +60,7 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget { ...@@ -60,7 +60,7 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
namesToFind[0] = namesToFind[0].substring(namesToFind[0].lastIndexOf(' ') + 1); namesToFind[0] = namesToFind[0].substring(namesToFind[0].lastIndexOf(' ') + 1);
const variables: debug.IExpression[] = []; const variables: debug.IExpression[] = [];
focussedStackFrame.getScopes(this.debugService).done(scopes => { focusedStackFrame.getScopes(this.debugService).done(scopes => {
// flatten out scopes lists // flatten out scopes lists
return scopes.reduce((accum, scopes) => { return accum.concat(scopes); }, []) return scopes.reduce((accum, scopes) => { return accum.concat(scopes); }, [])
......
...@@ -555,7 +555,7 @@ export class Model extends ee.EventEmitter implements debug.IModel { ...@@ -555,7 +555,7 @@ export class Model extends ee.EventEmitter implements debug.IModel {
this.threads[data.threadId].callStack = data.callStack.map( this.threads[data.threadId].callStack = data.callStack.map(
(rsf, level) => { (rsf, level) => {
if (!rsf) { if (!rsf) {
return new StackFrame(data.threadId, 0, debug.Source.fromUri(uri.parse('unknown')), nls.localize('unkownStack', "Unknown stack location"), undefined, undefined); return new StackFrame(data.threadId, 0, debug.Source.fromUri(uri.parse('unknown')), nls.localize('unknownStack', "Unknown stack location"), undefined, undefined);
} }
return new StackFrame(data.threadId, rsf.id, rsf.source ? debug.Source.fromRawSource(rsf.source) : debug.Source.fromUri(uri.parse('unknown')), rsf.name, rsf.line, rsf.column); return new StackFrame(data.threadId, rsf.id, rsf.source ? debug.Source.fromRawSource(rsf.source) : debug.Source.fromUri(uri.parse('unknown')), rsf.name, rsf.line, rsf.column);
......
...@@ -65,7 +65,7 @@ declare module DebugProtocol { ...@@ -65,7 +65,7 @@ declare module DebugProtocol {
reason: string; reason: string;
/** The thread which was stopped. */ /** The thread which was stopped. */
threadId?: number; threadId?: number;
/** Additonal information. E.g. if reason is 'exception', text contains the exception name. */ /** Additional information. E.g. if reason is 'exception', text contains the exception name. */
text?: string; text?: string;
}; };
} }
......
...@@ -83,7 +83,7 @@ export class EditorAccessor implements emmet.Editor { ...@@ -83,7 +83,7 @@ export class EditorAccessor implements emmet.Editor {
} }
} }
// shift colum by +1 since they are 1 based // shift column by +1 since they are 1 based
let range = new Range(startPosition.lineNumber, startPosition.column + 1, endPosition.lineNumber, endPosition.column + 1); let range = new Range(startPosition.lineNumber, startPosition.column + 1, endPosition.lineNumber, endPosition.column + 1);
let deletePreviousChars = 0; let deletePreviousChars = 0;
......
...@@ -25,7 +25,7 @@ declare module 'emmet' { ...@@ -25,7 +25,7 @@ declare module 'emmet' {
/** /**
* Creates selection from <code>start</code> to <code>end</code> character * Creates selection from <code>start</code> to <code>end</code> character
* indexes. If <code>end</code> is ommited, this method should place caret * indexes. If <code>end</code> is omitted, this method should place caret
* and <code>start</code> index * and <code>start</code> index
* @param {Number} start * @param {Number} start
* @param {Number} [end] * @param {Number} [end]
...@@ -133,4 +133,4 @@ declare module 'emmet' { ...@@ -133,4 +133,4 @@ declare module 'emmet' {
*/ */
export function run(action: string, editor: Editor): boolean; export function run(action: string, editor: Editor): boolean;
} }
\ No newline at end of file
...@@ -703,7 +703,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin ...@@ -703,7 +703,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin
} }
if (!this.preferredEncoding && this.contentEncoding === encoding) { if (!this.preferredEncoding && this.contentEncoding === encoding) {
return false; // also return if we dont have a preferred encoding but the content encoding is already the same return false; // also return if we don't have a preferred encoding but the content encoding is already the same
} }
return true; return true;
......
...@@ -288,7 +288,7 @@ export abstract class BaseRenameAction extends BaseFileAction { ...@@ -288,7 +288,7 @@ export abstract class BaseRenameAction extends BaseFileAction {
name = getWellFormedFileName(name); name = getWellFormedFileName(name);
let existingName = getWellFormedFileName(this.element.name); let existingName = getWellFormedFileName(this.element.name);
// Return early if name is invalid or didnt change // Return early if name is invalid or didn't change
if (name === existingName || this.validateFileName(this.element.parent, name)) { if (name === existingName || this.validateFileName(this.element.parent, name)) {
return Promise.as(null); return Promise.as(null);
} }
......
...@@ -87,7 +87,7 @@ export class FileTracker implements IWorkbenchContribution { ...@@ -87,7 +87,7 @@ export class FileTracker implements IWorkbenchContribution {
this.emitInputStateChangeEvent(e.getAfter().resource); this.emitInputStateChangeEvent(e.getAfter().resource);
if (!this.contextService.isAutoSaveEnabled()) { if (!this.contextService.isAutoSaveEnabled()) {
this.updateActivityBadge(); // no indication needed when auto save is turned off and we didnt show dirty this.updateActivityBadge(); // no indication needed when auto save is turned off and we didn't show dirty
} }
} }
...@@ -182,7 +182,7 @@ export class FileTracker implements IWorkbenchContribution { ...@@ -182,7 +182,7 @@ export class FileTracker implements IWorkbenchContribution {
this.handleMovedFileInVisibleEditors(before ? before.resource : null, after ? after.resource : null, after ? after.mime : null); this.handleMovedFileInVisibleEditors(before ? before.resource : null, after ? after.resource : null, after ? after.mime : null);
} }
// Dispose all known inputs pased on resource // Dispose all known inputs passed on resource
let oldFile = e.getBefore(); let oldFile = e.getBefore();
if ((e.gotMoved() || e.gotDeleted())) { if ((e.gotMoved() || e.gotDeleted())) {
this.disposeAll(oldFile.resource, this.quickOpenService.getEditorHistory()); this.disposeAll(oldFile.resource, this.quickOpenService.getEditorHistory());
......
...@@ -75,7 +75,7 @@ let openViewletKb: IKeybindings = { ...@@ -75,7 +75,7 @@ let openViewletKb: IKeybindings = {
// Register file editors // Register file editors
(<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor( (<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor(
new FileEditorDescriptor( new FileEditorDescriptor(
TextFileEditor.ID, // explicit dependency because we dont want these editors lazy loaded TextFileEditor.ID, // explicit dependency because we don't want these editors lazy loaded
nls.localize('textFileEditor', "Text File Editor"), nls.localize('textFileEditor', "Text File Editor"),
'vs/workbench/parts/files/browser/editors/textFileEditor', 'vs/workbench/parts/files/browser/editors/textFileEditor',
'TextFileEditor', 'TextFileEditor',
...@@ -95,7 +95,7 @@ let openViewletKb: IKeybindings = { ...@@ -95,7 +95,7 @@ let openViewletKb: IKeybindings = {
(<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor( (<IEditorRegistry>Registry.as(EditorExtensions.Editors)).registerEditor(
new FileEditorDescriptor( new FileEditorDescriptor(
BinaryFileEditor.ID, // explicit dependency because we dont want these editors lazy loaded BinaryFileEditor.ID, // explicit dependency because we don't want these editors lazy loaded
nls.localize('binaryFileEditor', "Binary File Editor"), nls.localize('binaryFileEditor', "Binary File Editor"),
'vs/workbench/parts/files/browser/editors/binaryFileEditor', 'vs/workbench/parts/files/browser/editors/binaryFileEditor',
'BinaryFileEditor', 'BinaryFileEditor',
......
...@@ -150,7 +150,7 @@ export class ExplorerView extends CollapsibleViewletView { ...@@ -150,7 +150,7 @@ export class ExplorerView extends CollapsibleViewletView {
// During workbench startup, the editor area might restore more than one editor from a previous // During workbench startup, the editor area might restore more than one editor from a previous
// session. When this happens there might be editor input changing events for side editors that // session. When this happens there might be editor input changing events for side editors that
// dont have focus. In these cases we do not adjust explorer selection for non-focussed editors // don't have focus. In these cases we do not adjust explorer selection for non-focused editors
// because we only want to react for the editor that has focus. // because we only want to react for the editor that has focus.
if (!this.partService.isCreated() && e.editorOptions && e.editorOptions.preserveFocus) { if (!this.partService.isCreated() && e.editorOptions && e.editorOptions.preserveFocus) {
return; return;
...@@ -198,10 +198,10 @@ export class ExplorerView extends CollapsibleViewletView { ...@@ -198,10 +198,10 @@ export class ExplorerView extends CollapsibleViewletView {
public focus(): void { public focus(): void {
super.focus(); super.focus();
// Open the focussed element in the editor if there is currently no file opened // Open the focused element in the editor if there is currently no file opened
let input = this.editorService.getActiveEditorInput(); let input = this.editorService.getActiveEditorInput();
if (!input || !(input instanceof FileEditorInput)) { if (!input || !(input instanceof FileEditorInput)) {
this.openFocussedElement(); this.openFocusedElement();
} }
} }
...@@ -247,13 +247,13 @@ export class ExplorerView extends CollapsibleViewletView { ...@@ -247,13 +247,13 @@ export class ExplorerView extends CollapsibleViewletView {
// Otherwise restore last used file: By Explorer selection // Otherwise restore last used file: By Explorer selection
return refreshPromise.then(() => { return refreshPromise.then(() => {
this.openFocussedElement(); this.openFocusedElement();
}); });
} }
}); });
} }
private openFocussedElement(): boolean { private openFocusedElement(): boolean {
let stat: FileStat = this.explorerViewer.getFocus(); let stat: FileStat = this.explorerViewer.getFocus();
if (stat && !stat.isDirectory) { if (stat && !stat.isDirectory) {
let editorInput = this.instantiationService.createInstance(FileEditorInput, stat.resource, stat.mime, void 0); let editorInput = this.instantiationService.createInstance(FileEditorInput, stat.resource, stat.mime, void 0);
......
...@@ -84,7 +84,7 @@ export class FileDataSource implements Tree.IDataSource { ...@@ -84,7 +84,7 @@ export class FileDataSource implements Tree.IDataSource {
// Convert to view model // Convert to view model
let modelDirStat = FileStat.create(dirStat); let modelDirStat = FileStat.create(dirStat);
// Add childs to folder // Add children to folder
for (let i = 0; i < modelDirStat.children.length; i++) { for (let i = 0; i < modelDirStat.children.length; i++) {
stat.addChild(modelDirStat.children[i]); stat.addChild(modelDirStat.children[i]);
} }
......
...@@ -150,7 +150,7 @@ export class WorkingFilesView extends AdaptiveCollapsibleViewletView { ...@@ -150,7 +150,7 @@ export class WorkingFilesView extends AdaptiveCollapsibleViewletView {
private onTextFileDirty(e: LocalFileChangeEvent): void { private onTextFileDirty(e: LocalFileChangeEvent): void {
if (!this.contextService.isAutoSaveEnabled()) { if (!this.contextService.isAutoSaveEnabled()) {
this.updateDirtyIndicator(); // no indication needed when auto save is turned off and we didnt show dirty this.updateDirtyIndicator(); // no indication needed when auto save is turned off and we didn't show dirty
} }
} }
......
...@@ -134,7 +134,7 @@ export class WorkingFilesActionProvider extends ContributableActionProvider { ...@@ -134,7 +134,7 @@ export class WorkingFilesActionProvider extends ContributableActionProvider {
return element instanceof WorkingFileEntry || super.hasActions(tree, element); return element instanceof WorkingFileEntry || super.hasActions(tree, element);
} }
// we dont call into super here because we put only one primary action to the left (Remove/Dirty Indicator) // we don't call into super here because we put only one primary action to the left (Remove/Dirty Indicator)
public getActions(tree: tree.ITree, element: WorkingFileEntry): TPromise<actions.IAction[]> { public getActions(tree: tree.ITree, element: WorkingFileEntry): TPromise<actions.IAction[]> {
let actions: actions.IAction[] = []; let actions: actions.IAction[] = [];
......
...@@ -87,7 +87,7 @@ export class WorkingFilesModel implements filesCommon.IWorkingFilesModel { ...@@ -87,7 +87,7 @@ export class WorkingFilesModel implements filesCommon.IWorkingFilesModel {
private onTextFileDirty(e: filesCommon.LocalFileChangeEvent): void { private onTextFileDirty(e: filesCommon.LocalFileChangeEvent): void {
if (!this.contextService.isAutoSaveEnabled()) { if (!this.contextService.isAutoSaveEnabled()) {
this.updateDirtyState(e.getAfter().resource, true); // no indication needed when auto save is turned off and we didnt show dirty this.updateDirtyState(e.getAfter().resource, true); // no indication needed when auto save is turned off and we didn't show dirty
} else { } else {
this.addEntry(e.getAfter().resource); this.addEntry(e.getAfter().resource);
} }
......
...@@ -294,7 +294,7 @@ export interface ITextFileService extends IDisposable { ...@@ -294,7 +294,7 @@ export interface ITextFileService extends IDisposable {
isDirty(resource?: URI): boolean; isDirty(resource?: URI): boolean;
/** /**
* Returs all resources that are currently dirty matching the provided resource or all dirty resources. * Returns all resources that are currently dirty matching the provided resource or all dirty resources.
* *
* @param resource the resource to check for being dirty. If it is not specified, will check for * @param resource the resource to check for being dirty. If it is not specified, will check for
* all dirty resources. * all dirty resources.
...@@ -342,7 +342,7 @@ export interface ITextFileService extends IDisposable { ...@@ -342,7 +342,7 @@ export interface ITextFileService extends IDisposable {
revertAll(resources?: URI[], force?: boolean): TPromise<ITextFileOperationResult>; revertAll(resources?: URI[], force?: boolean): TPromise<ITextFileOperationResult>;
/** /**
* Brings up the confirm dialog to either save, dont save or cancel. * Brings up the confirm dialog to either save, don't save or cancel.
* *
* @param resource the resource of the file to ask for confirmation. * @param resource the resource of the file to ask for confirmation.
*/ */
......
...@@ -161,7 +161,7 @@ export class FileTracker implements IWorkbenchContribution { ...@@ -161,7 +161,7 @@ export class FileTracker implements IWorkbenchContribution {
private onTextFileDirty(e: LocalFileChangeEvent): void { private onTextFileDirty(e: LocalFileChangeEvent): void {
if (!this.contextService.isAutoSaveEnabled() && !this.isDocumentedEdited) { if (!this.contextService.isAutoSaveEnabled() && !this.isDocumentedEdited) {
this.updateDocumentEdited(); // no indication needed when auto save is turned off and we didnt show dirty this.updateDocumentEdited(); // no indication needed when auto save is turned off and we didn't show dirty
} }
} }
......
...@@ -233,7 +233,7 @@ export class TextFileService extends BrowserTextFileService { ...@@ -233,7 +233,7 @@ export class TextFileService extends BrowserTextFileService {
if (untitled) { if (untitled) {
let targetPath: string; let targetPath: string;
// Untitled with associated file path dont need to prompt // Untitled with associated file path don't need to prompt
if (this.untitledEditorService.hasAssociatedFilePath(untitled.getResource())) { if (this.untitledEditorService.hasAssociatedFilePath(untitled.getResource())) {
targetPath = untitled.getResource().fsPath; targetPath = untitled.getResource().fsPath;
} }
......
...@@ -406,7 +406,7 @@ export abstract class BaseUndoAction extends GitAction { ...@@ -406,7 +406,7 @@ export abstract class BaseUndoAction extends GitAction {
}); });
}); });
}).then(null, (errors: any[]): Promise => { }).then(null, (errors: any[]): Promise => {
console.error('One or more errors occured', errors); console.error('One or more errors occurred', errors);
return Promise.wrapError(errors[0]); return Promise.wrapError(errors[0]);
}); });
} }
......
...@@ -69,7 +69,7 @@ export function intersectChangeAndSelection(change:editorcommon.IChange, selecti ...@@ -69,7 +69,7 @@ export function intersectChangeAndSelection(change:editorcommon.IChange, selecti
} }
/** /**
* Returns all selected changes (there can be mulitple selections due to mulitple cursors). * Returns all selected changes (there can be multiple selections due to multiple cursors).
* If a change is partially selected, the selected part of the change will be returned. * If a change is partially selected, the selected part of the change will be returned.
*/ */
export function getSelectedChanges(changes:editorcommon.IChange[], selections:editorcommon.IEditorSelection[]):editorcommon.IChange[] { export function getSelectedChanges(changes:editorcommon.IChange[], selections:editorcommon.IEditorSelection[]):editorcommon.IChange[] {
......
...@@ -87,7 +87,7 @@ suite('Git - Stage ranges', () => { ...@@ -87,7 +87,7 @@ suite('Git - Stage ranges', () => {
changesEqual(result, expected); changesEqual(result, expected);
}); });
test('Get selected changes test - mulitple changes selected with one selection', () => { test('Get selected changes test - multiple changes selected with one selection', () => {
var selections: IEditorSelection[] = []; var selections: IEditorSelection[] = [];
selections.push(Selection.createSelection(2, 7, 7, 1)); selections.push(Selection.createSelection(2, 7, 7, 1));
var changes: IChange[] = []; var changes: IChange[] = [];
...@@ -119,7 +119,7 @@ suite('Git - Stage ranges', () => { ...@@ -119,7 +119,7 @@ suite('Git - Stage ranges', () => {
changesEqual(result, expected); changesEqual(result, expected);
}); });
test('Get selected changes test - mulitple changes partially selected with multiple selections', () => { test('Get selected changes test - multiple changes partially selected with multiple selections', () => {
var selections: IEditorSelection[] = []; var selections: IEditorSelection[] = [];
selections.push(Selection.createSelection(3, 1, 9, 5), Selection.createSelection(115, 2, 129, 1)); selections.push(Selection.createSelection(3, 1, 9, 5), Selection.createSelection(115, 2, 129, 1));
var changes: IChange[] = []; var changes: IChange[] = [];
...@@ -130,7 +130,7 @@ suite('Git - Stage ranges', () => { ...@@ -130,7 +130,7 @@ suite('Git - Stage ranges', () => {
changesEqual(result, expected); changesEqual(result, expected);
}); });
test('Get selected changes test - mulitple changes selected with multiple selections. Multiple changes not selected', () => { test('Get selected changes test - multiple changes selected with multiple selections. Multiple changes not selected', () => {
var selections: IEditorSelection[] = []; var selections: IEditorSelection[] = [];
selections.push(Selection.createSelection(33, 11, 79, 15), Selection.createSelection(155, 21, 189, 11)); selections.push(Selection.createSelection(33, 11, 79, 15), Selection.createSelection(155, 21, 189, 11));
var changes: IChange[] = []; var changes: IChange[] = [];
......
...@@ -11,7 +11,7 @@ import * as Platform from 'vs/base/common/platform'; ...@@ -11,7 +11,7 @@ import * as Platform from 'vs/base/common/platform';
import { SystemVariables } from 'vs/workbench/parts/lib/node/systemVariables'; import { SystemVariables } from 'vs/workbench/parts/lib/node/systemVariables';
suite('SystemVariables tests', () => { suite('SystemVariables tests', () => {
test('SytemVariables: subsitute one', () => { test('SystemVariables: substitute one', () => {
let systemVariables: SystemVariables = new SystemVariables(null, null, URI.parse('file:///VSCode/workspaceLocation')); let systemVariables: SystemVariables = new SystemVariables(null, null, URI.parse('file:///VSCode/workspaceLocation'));
if (Platform.isWindows) { if (Platform.isWindows) {
assert.strictEqual(systemVariables.resolve('abc ${workspaceRoot} xyz'), 'abc \\VSCode\\workspaceLocation xyz'); assert.strictEqual(systemVariables.resolve('abc ${workspaceRoot} xyz'), 'abc \\VSCode\\workspaceLocation xyz');
...@@ -20,7 +20,7 @@ suite('SystemVariables tests', () => { ...@@ -20,7 +20,7 @@ suite('SystemVariables tests', () => {
} }
}); });
test('SytemVariables: subsitute many', () => { test('SystemVariables: substitute many', () => {
let systemVariables: SystemVariables = new SystemVariables(null, null, URI.parse('file:///VSCode/workspaceLocation')); let systemVariables: SystemVariables = new SystemVariables(null, null, URI.parse('file:///VSCode/workspaceLocation'));
if (Platform.isWindows) { if (Platform.isWindows) {
assert.strictEqual(systemVariables.resolve('${workspaceRoot} - ${workspaceRoot}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation'); assert.strictEqual(systemVariables.resolve('${workspaceRoot} - ${workspaceRoot}'), '\\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation');
......
...@@ -63,7 +63,7 @@ export class GlobalShowOutputAction extends Action { ...@@ -63,7 +63,7 @@ export class GlobalShowOutputAction extends Action {
channelToOpen = channels[0].getChannel(); channelToOpen = channels[0].getChannel();
} }
// Fallback to any contributed channel otherwise if we dont have history // Fallback to any contributed channel otherwise if we don't have history
else { else {
channelToOpen = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels()[0]; channelToOpen = (<IOutputChannelRegistry>Registry.as(Extensions.OutputChannels)).getChannels()[0];
} }
...@@ -191,7 +191,7 @@ export class SwitchOutputActionItem extends SelectActionItem { ...@@ -191,7 +191,7 @@ export class SwitchOutputActionItem extends SelectActionItem {
super(null, action, SwitchOutputActionItem.getChannels(outputService, input), SwitchOutputActionItem.getChannels(outputService, input).indexOf(input.getChannel())); super(null, action, SwitchOutputActionItem.getChannels(outputService, input), SwitchOutputActionItem.getChannels(outputService, input).indexOf(input.getChannel()));
this.input = input; this.input = input;
this.outputService.onOutputChannel.add(this.onOutputChannel, this); this.outputService.onOutputChannel.add(this.onOutputChannel, this);
} }
......
...@@ -29,7 +29,7 @@ export class OpenAnythingHandler extends QuickOpenHandler { ...@@ -29,7 +29,7 @@ export class OpenAnythingHandler extends QuickOpenHandler {
private static SYMBOL_SEARCH_INITIAL_TIMEOUT = 500; // Ignore symbol search after a timeout to not block search results private static SYMBOL_SEARCH_INITIAL_TIMEOUT = 500; // Ignore symbol search after a timeout to not block search results
private static SYMBOL_SEARCH_SUBSEQUENT_TIMEOUT = 100; private static SYMBOL_SEARCH_SUBSEQUENT_TIMEOUT = 100;
private static SEARCH_DELAY = 100; // This delay acommodates for the user typing a word and then stops typing to start searching private static SEARCH_DELAY = 100; // This delay accommodates for the user typing a word and then stops typing to start searching
private openSymbolHandler: _OpenSymbolHandler; private openSymbolHandler: _OpenSymbolHandler;
private openFileHandler: OpenFileHandler; private openFileHandler: OpenFileHandler;
......
...@@ -84,7 +84,7 @@ export class FileEntry extends EditorQuickOpenEntry { ...@@ -84,7 +84,7 @@ export class FileEntry extends EditorQuickOpenEntry {
export class OpenFileHandler extends QuickOpenHandler { export class OpenFileHandler extends QuickOpenHandler {
private static SEARCH_DELAY = 500; // This delay acommodates for the user typing a word and then stops typing to start searching private static SEARCH_DELAY = 500; // This delay accommodates for the user typing a word and then stops typing to start searching
private queryBuilder: QueryBuilder; private queryBuilder: QueryBuilder;
private delayer: ThrottledDelayer; private delayer: ThrottledDelayer;
......
...@@ -90,7 +90,7 @@ class SymbolEntry extends EditorQuickOpenEntry { ...@@ -90,7 +90,7 @@ class SymbolEntry extends EditorQuickOpenEntry {
export class OpenSymbolHandler extends QuickOpenHandler { export class OpenSymbolHandler extends QuickOpenHandler {
private static SUPPORTED_OPEN_TYPES = ['class', 'interface', 'enum', 'function', 'method']; private static SUPPORTED_OPEN_TYPES = ['class', 'interface', 'enum', 'function', 'method'];
private static SEARCH_DELAY = 500; // This delay acommodates for the user typing a word and then stops typing to start searching private static SEARCH_DELAY = 500; // This delay accommodates for the user typing a word and then stops typing to start searching
private delayer: ThrottledDelayer; private delayer: ThrottledDelayer;
private isStandalone: boolean; private isStandalone: boolean;
......
...@@ -929,7 +929,7 @@ export class SearchViewlet extends Viewlet { ...@@ -929,7 +929,7 @@ export class SearchViewlet extends Viewlet {
this.viewModel.toggleHighlights(visible); this.viewModel.toggleHighlights(visible);
} }
// Open focussed element from results in case the editor area is otherwise empty // Open focused element from results in case the editor area is otherwise empty
if (visible && !this.editorService.getActiveEditorInput()) { if (visible && !this.editorService.getActiveEditorInput()) {
let focus = this.tree.getFocus(); let focus = this.tree.getFocus();
if (focus) { if (focus) {
......
...@@ -204,12 +204,12 @@ export class StartStopProblemCollector extends AbstractProblemCollector implemen ...@@ -204,12 +204,12 @@ export class StartStopProblemCollector extends AbstractProblemCollector implemen
this.currentResource = resource; this.currentResource = resource;
this.currentResourceAsString = resourceAsString; this.currentResourceAsString = resourceAsString;
} }
let markerDatas = this.markers[owner]; let markerData = this.markers[owner];
if (!markerDatas) { if (!markerData) {
markerDatas = []; markerData = [];
this.markers[owner] = markerDatas; this.markers[owner] = markerData;
} }
markerDatas.push(markerMatch.marker); markerData.push(markerMatch.marker);
} else { } else {
this.reportedResourcesWithMarkers[owner][resourceAsString] = resource; this.reportedResourcesWithMarkers[owner][resourceAsString] = resource;
} }
...@@ -316,12 +316,12 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement ...@@ -316,12 +316,12 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement
this.currentResource = resource; this.currentResource = resource;
this.currentResourceAsString = resourceAsString; this.currentResourceAsString = resourceAsString;
} }
let markerDatas = this.markers[owner]; let markerData = this.markers[owner];
if (!markerDatas) { if (!markerData) {
markerDatas = []; markerData = [];
this.markers[owner] = markerDatas; this.markers[owner] = markerData;
} }
markerDatas.push(markerMatch.marker); markerData.push(markerMatch.marker);
} else { } else {
this.removeResourceToClean(owner, resourceAsString); this.removeResourceToClean(owner, resourceAsString);
} }
......
...@@ -1025,7 +1025,7 @@ if (Env.enableTasks) { ...@@ -1025,7 +1025,7 @@ if (Env.enableTasks) {
'isShellCommand': { 'isShellCommand': {
'type': 'boolean', 'type': 'boolean',
'default': true, 'default': true,
'description': nls.localize('JsonSchema.shell', 'Specifies whether the command is a shell command or an external programm. Defaults to false if omitted.') 'description': nls.localize('JsonSchema.shell', 'Specifies whether the command is a shell command or an external program. Defaults to false if omitted.')
}, },
'args': { 'args': {
'type': 'array', 'type': 'array',
...@@ -1053,7 +1053,7 @@ if (Env.enableTasks) { ...@@ -1053,7 +1053,7 @@ if (Env.enableTasks) {
}, },
'showOutput': { 'showOutput': {
'$ref': '#/definitions/showOutputType', '$ref': '#/definitions/showOutputType',
'description': nls.localize('JsonSchema.showOuput', 'Controls whether the output of the running task is shown or not. If omitted \'always\' is used.') 'description': nls.localize('JsonSchema.showOutput', 'Controls whether the output of the running task is shown or not. If omitted \'always\' is used.')
}, },
'isWatching': { 'isWatching': {
'type': 'boolean', 'type': 'boolean',
...@@ -1111,7 +1111,7 @@ if (Env.enableTasks) { ...@@ -1111,7 +1111,7 @@ if (Env.enableTasks) {
}, },
'showOutput': { 'showOutput': {
'$ref': '#/definitions/showOutputType', '$ref': '#/definitions/showOutputType',
'description': nls.localize('JsonSchema.tasks.showOuput', 'Controls whether the output of the running task is shown or not. If omitted the globally defined value is used.') 'description': nls.localize('JsonSchema.tasks.showOutput', 'Controls whether the output of the running task is shown or not. If omitted the globally defined value is used.')
}, },
'echoCommand': { 'echoCommand': {
'type': 'boolean', 'type': 'boolean',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册