Replace all instances off "Focussed" with "Focused" except ContextKey (microsoft#32904)

cleidigh · bpasero · commit f3bf53f6b816 · 2017-08-22T11:13:07.000+02:00
* Replace focussed with focused

* Replace Focussed with Focused
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
@@ -4580,7 +4580,7 @@ declare namespace Electron {
 		 */
 		isDevToolsOpened(): boolean;
 		/**
-		 * Returns whether the developer tools are focussed.
+		 * Returns whether the developer tools are focused.
 		 */
 		isDevToolsFocused(): boolean;
 		/**
diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts
@@ -684,7 +684,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {
 
 	private cancel(): void {
 		if (document.activeElement instanceof HTMLElement) {
-			(<HTMLElement>document.activeElement).blur(); // remove focus from focussed action
+			(<HTMLElement>document.activeElement).blur(); // remove focus from focused action
 		}
 
 		this.emit(CommonEventType.CANCEL);
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
@@ -1616,8 +1616,8 @@ class FileDialog {
 		}
 
 		// Show Dialog
-		const focussedWindow = this.windowsMainService.getWindowById(options.windowId) || this.windowsMainService.getFocusedWindow();
-		dialog.showOpenDialog(focussedWindow && focussedWindow.win, options.dialogOptions, paths => {
+		const focusedWindow = this.windowsMainService.getWindowById(options.windowId) || this.windowsMainService.getFocusedWindow();
+		dialog.showOpenDialog(focusedWindow && focusedWindow.win, options.dialogOptions, paths => {
 			if (paths && paths.length > 0) {
 
 				// Remember path in storage for next time
diff --git a/src/vs/code/node/windowsFinder.ts b/src/vs/code/node/windowsFinder.ts
@@ -112,9 +112,9 @@ function hasCodeSettings(folder: string, normalizedUserHome?: string, codeSettin
 }
 
 export function getLastActiveWindow<W extends ISimpleWindow>(windows: W[]): W {
-	const lastFocussedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));
+	const lastFocusedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));
 
-	return windows.filter(window => window.lastFocusTime === lastFocussedDate)[0];
+	return windows.filter(window => window.lastFocusTime === lastFocusedDate)[0];
 }
 
 export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)): W {
diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/common/findController.ts
@@ -39,6 +39,7 @@ export interface IFindStartOptions {
 
 export const CONTEXT_FIND_WIDGET_VISIBLE = new RawContextKey<boolean>('findWidgetVisible', false);
 export const CONTEXT_FIND_WIDGET_NOT_VISIBLE: ContextKeyExpr = CONTEXT_FIND_WIDGET_VISIBLE.toNegated();
+// Keep ContextKey use of 'Focussed' to not break when clauses
 export const CONTEXT_FIND_INPUT_FOCUSED = new RawContextKey<boolean>('findInputFocussed', false);
 
 export class CommonFindController extends Disposable implements editorCommon.IEditorContribution {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -76,7 +76,7 @@ function findEditor(model: IModel, codeEditorService: ICodeEditorService): IComm
 		for (const editor of codeEditorService.listCodeEditors()) {
 			if (editor.getModel() === model) {
 				if (editor.isFocused()) {
-					return editor; // favour focussed editor if there are multiple
+					return editor; // favour focused editor if there are multiple
 				}
 
 				candidate = editor;
diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts
@@ -101,7 +101,7 @@ export abstract class TogglePanelAction extends Action {
 		return panel && panel.getId() === this.panelId;
 	}
 
-	protected isPanelFocussed(): boolean {
+	protected isPanelFocused(): boolean {
 		const activePanel = this.panelService.getActivePanel();
 		const activeElement = document.activeElement;
 
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -455,7 +455,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 					}
 				});
 
-				// Grow focussed position if there is more size to spend
+				// Grow focused position if there is more size to spend
 				if (remainingSize > this.minSize) {
 					this.silosSize[this.lastActivePosition] = remainingSize;
 
@@ -486,7 +486,7 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro
 
 	private focusNextNonMinimized(): void {
 
-		// If the current focussed editor is minimized, try to focus the next largest editor
+		// If the current focused editor is minimized, try to focus the next largest editor
 		if (!types.isUndefinedOrNull(this.lastActivePosition) && this.silosMinimized[this.lastActivePosition]) {
 			let candidate: Position = null;
 			let currentSize = this.minSize;
diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts
@@ -231,7 +231,7 @@ export class ToggleViewletAction extends Action {
 
 	public run(): TPromise<any> {
 
-		// Pass focus to viewlet if not open or focussed
+		// Pass focus to viewlet if not open or focused
 		if (this.otherViewletShowing() || !this.sidebarHasFocus()) {
 			return this.viewletService.openViewlet(this.viewletId, true);
 		}
diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
@@ -99,7 +99,7 @@
 }
 
 .monaco-shell .mac select:focus {
-	border: none; /* outline is a square, but border has a radius, so we avoid this glitch when focussed (https://github.com/Microsoft/vscode/issues/26045) */
+	border: none; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/Microsoft/vscode/issues/26045) */
 }
 
 .monaco-shell.hc-black [tabindex="0"]:focus,
@@ -158,7 +158,7 @@
 }
 
 .monaco-shell .monaco-tree.focused:focus {
-	outline: 0 !important; /* tree indicates focus not via outline but through the focussed item */
+	outline: 0 !important; /* tree indicates focus not via outline but through the focused item */
 }
 
 .monaco-shell [tabindex="0"]:active,
diff --git a/src/vs/workbench/parts/debug/browser/debugContentProvider.ts b/src/vs/workbench/parts/debug/browser/debugContentProvider.ts
@@ -44,7 +44,7 @@ export class DebugContentProvider implements IWorkbenchContribution, ITextModelC
 		}
 
 		if (!process) {
-			// fallback: use focussed process
+			// fallback: use focused process
 			process = this.debugService.getViewModel().focusedProcess;
 		}
 
diff --git a/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts b/src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
@@ -121,11 +121,11 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
 			return result;
 		}
 
-		// only show decorations for the currently focussed thread.
+		// only show decorations for the currently focused thread.
 		const columnUntilEOLRange = new Range(stackFrame.range.startLineNumber, stackFrame.range.startColumn, stackFrame.range.startLineNumber, Constants.MAX_SAFE_SMALL_INTEGER);
 		const range = new Range(stackFrame.range.startLineNumber, stackFrame.range.startColumn, stackFrame.range.startLineNumber, stackFrame.range.startColumn + 1);
 
-		// compute how to decorate the editor. Different decorations are used if this is a top stack frame, focussed stack frame,
+		// compute how to decorate the editor. Different decorations are used if this is a top stack frame, focused stack frame,
 		// an exception or a stack frame that did not change the line number (we only decorate the columns, not the whole line).
 		const callStack = stackFrame.thread.getCallStack();
 		if (callStack && callStack.length && stackFrame === callStack[0]) {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -251,7 +251,7 @@ export class DebugService implements debug.IDebugService {
 			return TPromise.as(null);
 		}
 
-		// focus first stack frame from top that has source location if no other stack frame is focussed
+		// focus first stack frame from top that has source location if no other stack frame is focused
 		const stackFrameToFocus = first(callStack, sf => sf.source && sf.source.available, undefined);
 		if (!stackFrameToFocus) {
 			return TPromise.as(null);
diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts
@@ -45,7 +45,7 @@ import { getCodeEditor } from 'vs/editor/common/services/codeEditorService';
 import { IEditorViewState, IModel } from 'vs/editor/common/editorCommon';
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
-import { withFocussedFilesExplorer, revealInOSCommand, revealInExplorerCommand, copyPathCommand } from 'vs/workbench/parts/files/browser/fileCommands';
+import { withFocusedFilesExplorer, revealInOSCommand, revealInExplorerCommand, copyPathCommand } from 'vs/workbench/parts/files/browser/fileCommands';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
@@ -996,7 +996,7 @@ export class PasteFileAction extends BaseFileAction {
 export const pasteIntoFocusedFilesExplorerViewItem = (accessor: ServicesAccessor) => {
 	const instantiationService = accessor.get(IInstantiationService);
 
-	withFocussedFilesExplorer(accessor).then(res => {
+	withFocusedFilesExplorer(accessor).then(res => {
 		if (res) {
 			const pasteAction = instantiationService.createInstance(PasteFileAction, res.tree, res.tree.getFocus());
 			if (pasteAction._isEnabled()) {
diff --git a/src/vs/workbench/parts/files/browser/fileCommands.ts b/src/vs/workbench/parts/files/browser/fileCommands.ts
@@ -111,7 +111,7 @@ export const revealInExplorerCommand = (accessor: ServicesAccessor, resource: UR
 };
 
 function openFocusedFilesExplorerViewItem(accessor: ServicesAccessor, sideBySide: boolean): void {
-	withFocussedFilesExplorerViewItem(accessor).then(res => {
+	withFocusedFilesExplorerViewItem(accessor).then(res => {
 		if (res) {
 
 			// Directory: Toggle expansion
@@ -128,8 +128,8 @@ function openFocusedFilesExplorerViewItem(accessor: ServicesAccessor, sideBySide
 	});
 }
 
-function openFocussedOpenedEditorsViewItem(accessor: ServicesAccessor, sideBySide: boolean): void {
-	withFocussedOpenEditorsViewItem(accessor).then(res => {
+function openFocusedOpenedEditorsViewItem(accessor: ServicesAccessor, sideBySide: boolean): void {
+	withFocusedOpenEditorsViewItem(accessor).then(res => {
 		if (res) {
 			const editorService = accessor.get(IWorkbenchEditorService);
 
@@ -139,7 +139,7 @@ function openFocussedOpenedEditorsViewItem(accessor: ServicesAccessor, sideBySid
 }
 
 function runActionOnFocusedFilesExplorerViewItem(accessor: ServicesAccessor, id: string, context?: any): void {
-	withFocussedFilesExplorerViewItem(accessor).then(res => {
+	withFocusedFilesExplorerViewItem(accessor).then(res => {
 		if (res) {
 			res.explorer.getViewletState().actionProvider.runAction(res.tree, res.item, id, context).done(null, errors.onUnexpectedError);
 		}
@@ -157,8 +157,8 @@ function withVisibleExplorer(accessor: ServicesAccessor): TPromise<ExplorerViewl
 	return viewletService.openViewlet(VIEWLET_ID, false) as TPromise<ExplorerViewlet>;
 };
 
-export function withFocussedFilesExplorerViewItem(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree, item: FileStat }> {
-	return withFocussedFilesExplorer(accessor).then(res => {
+export function withFocusedFilesExplorerViewItem(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree, item: FileStat }> {
+	return withFocusedFilesExplorer(accessor).then(res => {
 		if (!res) {
 			return void 0;
 		}
@@ -172,15 +172,15 @@ export function withFocussedFilesExplorerViewItem(accessor: ServicesAccessor): T
 	});
 };
 
-export function withFocussedFilesExplorer(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree }> {
+export function withFocusedFilesExplorer(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree }> {
 	return withVisibleExplorer(accessor).then(explorer => {
 		if (!explorer || !explorer.getExplorerView()) {
 			return void 0; // empty folder or hidden explorer
 		}
 
 		const tree = explorer.getExplorerView().getViewer();
 
-		// Ignore if in highlight mode or not focussed
+		// Ignore if in highlight mode or not focused
 		if (tree.getHighlight() || !tree.isDOMFocused()) {
 			return void 0;
 		}
@@ -189,15 +189,15 @@ export function withFocussedFilesExplorer(accessor: ServicesAccessor): TPromise<
 	});
 };
 
-function withFocussedOpenEditorsViewItem(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree, item: OpenEditor }> {
+function withFocusedOpenEditorsViewItem(accessor: ServicesAccessor): TPromise<{ explorer: ExplorerViewlet, tree: ITree, item: OpenEditor }> {
 	return withVisibleExplorer(accessor).then(explorer => {
 		if (!explorer || !explorer.getOpenEditorsView()) {
 			return void 0; // empty folder or hidden explorer
 		}
 
 		const tree = explorer.getOpenEditorsView().getViewer();
 
-		// Ignore if in highlight mode or not focussed
+		// Ignore if in highlight mode or not focused
 		const focus = tree.getFocus();
 		if (tree.getHighlight() || !tree.isDOMFocused() || !(focus instanceof OpenEditor)) {
 			return void 0;
@@ -208,12 +208,12 @@ function withFocussedOpenEditorsViewItem(accessor: ServicesAccessor): TPromise<{
 };
 
 function withFocusedExplorerItem(accessor: ServicesAccessor): TPromise<FileStat | OpenEditor> {
-	return withFocussedFilesExplorerViewItem(accessor).then(res => {
+	return withFocusedFilesExplorerViewItem(accessor).then(res => {
 		if (res) {
 			return res.item;
 		}
 
-		return withFocussedOpenEditorsViewItem(accessor).then(res => {
+		return withFocusedOpenEditorsViewItem(accessor).then(res => {
 			if (res) {
 				return res.item as FileStat | OpenEditor;
 			}
@@ -253,7 +253,7 @@ export const openFocusedExplorerItemSideBySideCommand = (accessor: ServicesAcces
 		if (item instanceof FileStat) {
 			openFocusedFilesExplorerViewItem(accessor, true);
 		} else {
-			openFocussedOpenedEditorsViewItem(accessor, true);
+			openFocusedOpenedEditorsViewItem(accessor, true);
 		}
 	});
 };
diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts
@@ -18,7 +18,7 @@ import { prepareActions } from 'vs/workbench/browser/actions';
 import { memoize } from 'vs/base/common/decorators';
 import { ITree } from 'vs/base/parts/tree/browser/tree';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
-import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocussedContext, ExplorerFocussedContext, SortOrderConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files';
+import { IFilesConfiguration, ExplorerFolderContext, FilesExplorerFocusedContext, ExplorerFocusedContext, SortOrderConfiguration, SortOrder } from 'vs/workbench/parts/files/common/files';
 import { FileOperation, FileOperationEvent, IResolveFileOptions, FileChangeType, FileChangesEvent, IFileService } from 'vs/platform/files/common/files';
 import { RefreshViewExplorerAction, NewFolderAction, NewFileAction } from 'vs/workbench/parts/files/browser/fileActions';
 import { FileDragAndDrop, FileFilter, FileSorter, FileController, FileRenderer, FileDataSource, FileViewletState, FileAccessibilityProvider } from 'vs/workbench/parts/files/browser/views/explorerViewer';
@@ -73,8 +73,8 @@ export class ExplorerView extends CollapsibleView {
 	private resourceContext: ResourceContextKey;
 	private folderContext: IContextKey<boolean>;
 
-	private filesExplorerFocussedContext: IContextKey<boolean>;
-	private explorerFocussedContext: IContextKey<boolean>;
+	private filesExplorerFocusedContext: IContextKey<boolean>;
+	private explorerFocusedContext: IContextKey<boolean>;
 
 	private fileEventsFilter: ResourceGlobMatcher;
 
@@ -114,8 +114,8 @@ export class ExplorerView extends CollapsibleView {
 		this.resourceContext = instantiationService.createInstance(ResourceContextKey);
 		this.folderContext = ExplorerFolderContext.bindTo(contextKeyService);
 
-		this.filesExplorerFocussedContext = FilesExplorerFocussedContext.bindTo(contextKeyService);
-		this.explorerFocussedContext = ExplorerFocussedContext.bindTo(contextKeyService);
+		this.filesExplorerFocusedContext = FilesExplorerFocusedContext.bindTo(contextKeyService);
+		this.explorerFocusedContext = ExplorerFocusedContext.bindTo(contextKeyService);
 
 		this.fileEventsFilter = instantiationService.createInstance(ResourceGlobMatcher, root => this.getFileEventsExcludes(root), (expression: glob.IExpression) => glob.parse(expression));
 	}
@@ -405,7 +405,7 @@ export class ExplorerView extends CollapsibleView {
 		this.toDispose.push(attachListStyler(this.explorerViewer, this.themeService));
 
 		// Register to list service
-		this.toDispose.push(this.listService.register(this.explorerViewer, [this.explorerFocussedContext, this.filesExplorerFocussedContext]));
+		this.toDispose.push(this.listService.register(this.explorerViewer, [this.explorerFocusedContext, this.filesExplorerFocusedContext]));
 
 		// Update Viewer based on File Change Events
 		this.toDispose.push(this.fileService.onAfterOperation(e => this.onFileOperation(e)));
@@ -927,7 +927,7 @@ export class ExplorerView extends CollapsibleView {
 			}
 		}
 
-		// Clean up last focussed if not set
+		// Clean up last focused if not set
 		if (!this.settings[ExplorerView.MEMENTO_LAST_ACTIVE_FILE_RESOURCE]) {
 			delete this.settings[ExplorerView.MEMENTO_LAST_ACTIVE_FILE_RESOURCE];
 		}
diff --git a/src/vs/workbench/parts/files/browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/browser/views/openEditorsView.ts
@@ -19,7 +19,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup } from 'vs/workbench/common/editor';
 import { SaveAllAction } from 'vs/workbench/parts/files/browser/fileActions';
 import { CollapsibleView, IViewletViewOptions, IViewOptions } from 'vs/workbench/parts/views/browser/views';
-import { IFilesConfiguration, VIEWLET_ID, OpenEditorsFocussedContext, ExplorerFocussedContext } from 'vs/workbench/parts/files/common/files';
+import { IFilesConfiguration, VIEWLET_ID, OpenEditorsFocusedContext, ExplorerFocusedContext } from 'vs/workbench/parts/files/common/files';
 import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { OpenEditor } from 'vs/workbench/parts/files/common/explorerModel';
@@ -54,8 +54,8 @@ export class OpenEditorsView extends CollapsibleView {
 	private groupToRefresh: IEditorGroup;
 	private fullRefreshNeeded: boolean;
 
-	private openEditorsFocussedContext: IContextKey<boolean>;
-	private explorerFocussedContext: IContextKey<boolean>;
+	private openEditorsFocusedContext: IContextKey<boolean>;
+	private explorerFocusedContext: IContextKey<boolean>;
 
 	constructor(options: IViewletViewOptions,
 		@IInstantiationService private instantiationService: IInstantiationService,
@@ -79,8 +79,8 @@ export class OpenEditorsView extends CollapsibleView {
 
 		this.model = editorGroupService.getStacksModel();
 
-		this.openEditorsFocussedContext = OpenEditorsFocussedContext.bindTo(contextKeyService);
-		this.explorerFocussedContext = ExplorerFocussedContext.bindTo(contextKeyService);
+		this.openEditorsFocusedContext = OpenEditorsFocusedContext.bindTo(contextKeyService);
+		this.explorerFocusedContext = ExplorerFocusedContext.bindTo(contextKeyService);
 
 		this.structuralRefreshDelay = 0;
 		this.structuralTreeRefreshScheduler = new RunOnceScheduler(() => this.structuralTreeUpdate(), this.structuralRefreshDelay);
@@ -149,7 +149,7 @@ export class OpenEditorsView extends CollapsibleView {
 		this.toDispose.push(attachListStyler(this.tree, this.themeService));
 
 		// Register to list service
-		this.toDispose.push(this.listService.register(this.tree, [this.explorerFocussedContext, this.openEditorsFocussedContext]));
+		this.toDispose.push(this.listService.register(this.tree, [this.explorerFocusedContext, this.openEditorsFocusedContext]));
 
 		// Open when selecting via keyboard
 		this.toDispose.push(this.tree.addListener('selection', event => {
diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts
@@ -28,10 +28,10 @@ const explorerResourceIsFolderId = 'explorerResourceIsFolder';
 
 export const ExplorerViewletVisibleContext = new RawContextKey<boolean>(explorerViewletVisibleId, true);
 export const ExplorerFolderContext = new RawContextKey<boolean>(explorerResourceIsFolderId, false);
-export const FilesExplorerFocussedContext = new RawContextKey<boolean>(filesExplorerFocusId, false);
+export const FilesExplorerFocusedContext = new RawContextKey<boolean>(filesExplorerFocusId, false);
 export const OpenEditorsVisibleContext = new RawContextKey<boolean>(openEditorsVisibleId, false);
-export const OpenEditorsFocussedContext = new RawContextKey<boolean>(openEditorsFocusId, false);
-export const ExplorerFocussedContext = new RawContextKey<boolean>(explorerViewletFocusId, false);
+export const OpenEditorsFocusedContext = new RawContextKey<boolean>(openEditorsFocusId, false);
+export const ExplorerFocusedContext = new RawContextKey<boolean>(explorerViewletFocusId, false);
 
 export const OpenEditorsVisibleCondition = ContextKeyExpr.has(openEditorsVisibleId);
 export const FilesExplorerFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has(explorerViewletVisibleId), ContextKeyExpr.has(filesExplorerFocusId));
diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts
diff --git a/src/vs/workbench/parts/search/browser/search.contribution.ts b/src/vs/workbench/parts/search/browser/search.contribution.ts
diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
diff --git a/src/vs/workbench/parts/search/browser/searchWidget.ts b/src/vs/workbench/parts/search/browser/searchWidget.ts
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts

Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ export class ActionBar extends EventEmitter implements IActionRunner {`
`684`	`684`
`685`	`685`	`private cancel(): void {`
`686`	`686`	`if (document.activeElement instanceof HTMLElement) {`
`687`		`- (<HTMLElement>document.activeElement).blur(); // remove focus from focussed action`
	`687`	`+ (<HTMLElement>document.activeElement).blur(); // remove focus from focused action`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`this.emit(CommonEventType.CANCEL);`
Original file line number	Diff line number	Diff line change
`@@ -1616,8 +1616,8 @@ class FileDialog {`
`1616`	`1616`	`}`
`1617`	`1617`
`1618`	`1618`	`// Show Dialog`
`1619`		`- const focussedWindow = this.windowsMainService.getWindowById(options.windowId) \|\| this.windowsMainService.getFocusedWindow();`
`1620`		`- dialog.showOpenDialog(focussedWindow && focussedWindow.win, options.dialogOptions, paths => {`
	`1619`	`+ const focusedWindow = this.windowsMainService.getWindowById(options.windowId) \|\| this.windowsMainService.getFocusedWindow();`
	`1620`	`+ dialog.showOpenDialog(focusedWindow && focusedWindow.win, options.dialogOptions, paths => {`
`1621`	`1621`	`if (paths && paths.length > 0) {`
`1622`	`1622`
`1623`	`1623`	`// Remember path in storage for next time`
Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,9 @@ function hasCodeSettings(folder: string, normalizedUserHome?: string, codeSettin`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`export function getLastActiveWindow<W extends ISimpleWindow>(windows: W[]): W {`
`115`		`- const lastFocussedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));`
	`115`	`+ const lastFocusedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime));`
`116`	`116`
`117`		`- return windows.filter(window => window.lastFocusTime === lastFocussedDate)[0];`
	`117`	`+ return windows.filter(window => window.lastFocusTime === lastFocusedDate)[0];`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`export function findWindowOnWorkspace<W extends ISimpleWindow>(windows: W[], workspace: (IWorkspaceIdentifier \| ISingleFolderWorkspaceIdentifier)): W {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function findEditor(model: IModel, codeEditorService: ICodeEditorService): IComm`
`76`	`76`	`for (const editor of codeEditorService.listCodeEditors()) {`
`77`	`77`	`if (editor.getModel() === model) {`
`78`	`78`	`if (editor.isFocused()) {`
`79`		`- return editor; // favour focussed editor if there are multiple`
	`79`	`+ return editor; // favour focused editor if there are multiple`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`candidate = editor;`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ export abstract class TogglePanelAction extends Action {`
`101`	`101`	`return panel && panel.getId() === this.panelId;`
`102`	`102`	`}`
`103`	`103`
`104`		`- protected isPanelFocussed(): boolean {`
	`104`	`+ protected isPanelFocused(): boolean {`
`105`	`105`	`const activePanel = this.panelService.getActivePanel();`
`106`	`106`	`const activeElement = document.activeElement;`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ export class ToggleViewletAction extends Action {`
`231`	`231`
`232`	`232`	`public run(): TPromise<any> {`
`233`	`233`
`234`		`- // Pass focus to viewlet if not open or focussed`
	`234`	`+ // Pass focus to viewlet if not open or focused`
`235`	`235`	`if (this.otherViewletShowing() \|\| !this.sidebarHasFocus()) {`
`236`	`236`	`return this.viewletService.openViewlet(this.viewletId, true);`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`.monaco-shell .mac select:focus {`
`102`		`- border: none; /* outline is a square, but border has a radius, so we avoid this glitch when focussed (https://github.com/Microsoft/vscode/issues/26045) */`
	`102`	`+ border: none; /* outline is a square, but border has a radius, so we avoid this glitch when focused (https://github.com/Microsoft/vscode/issues/26045) */`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`.monaco-shell.hc-black [tabindex="0"]:focus,`
`@@ -158,7 +158,7 @@`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`.monaco-shell .monaco-tree.focused:focus {`
`161`		`- outline: 0 !important; /* tree indicates focus not via outline but through the focussed item */`
	`161`	`+ outline: 0 !important; /* tree indicates focus not via outline but through the focused item */`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`.monaco-shell [tabindex="0"]:active,`