@theia/editor 1.34.3 → 1.34.4

package/src/browser/editor-keybinding-contexts.ts

@@ -1,87 +1,87 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { KeybindingContext } from '@theia/core/lib/browser/keybinding';
-import { EditorManager } from './editor-manager';
-import { EditorWidget } from './editor-widget';
-import { DiffUris } from '@theia/core/lib/browser';
-
-export namespace EditorKeybindingContexts {
-
-    /**
-     * ID of a keybinding context that is enabled when the active text editor has the focus.
-     */
-    export const editorTextFocus = 'editorTextFocus';
-
-    /**
-     * ID of a keybinding context that is enabled when the active diff editor has the focus.
-     */
-    export const diffEditorTextFocus = 'diffEditorTextFocus';
-
-    /**
-     * Unique identifier of a keybinding context that is enabled if the active editor has the focus but it does not have any overlaying widgets, such as the content assist widget.
-     */
-    export const strictEditorTextFocus = 'strictEditorTextFocus';
-}
-
-@injectable()
-export class EditorTextFocusContext implements KeybindingContext {
-
-    readonly id: string = EditorKeybindingContexts.editorTextFocus;
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    isEnabled(): boolean {
-        return !!this.getEditor();
-    }
-
-    protected getEditor(): EditorWidget | undefined {
-        const widget = this.editorManager.activeEditor;
-        if (widget && this.canHandle(widget)) {
-            return widget;
-        }
-        return undefined;
-    }
-
-    protected canHandle(widget: EditorWidget): boolean {
-        return widget.editor.isFocused();
-    }
-
-}
-
-@injectable()
-export class DiffEditorTextFocusContext extends EditorTextFocusContext {
-
-    override readonly id: string = EditorKeybindingContexts.diffEditorTextFocus;
-
-    protected override canHandle(widget: EditorWidget): boolean {
-        return super.canHandle(widget) && DiffUris.isDiffUri(widget.editor.uri);
-    }
-
-}
-
-/**
- * Keybinding context that is enabled when the active text editor has the focus **AND** it does not
- * have any widgets (for example, the content assist widget) overlaying the active editor.
- */
-@injectable()
-export class StrictEditorTextFocusContext extends EditorTextFocusContext {
-
-    override readonly id: string = EditorKeybindingContexts.strictEditorTextFocus;
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { KeybindingContext } from '@theia/core/lib/browser/keybinding';
+import { EditorManager } from './editor-manager';
+import { EditorWidget } from './editor-widget';
+import { DiffUris } from '@theia/core/lib/browser';
+
+export namespace EditorKeybindingContexts {
+
+    /**
+     * ID of a keybinding context that is enabled when the active text editor has the focus.
+     */
+    export const editorTextFocus = 'editorTextFocus';
+
+    /**
+     * ID of a keybinding context that is enabled when the active diff editor has the focus.
+     */
+    export const diffEditorTextFocus = 'diffEditorTextFocus';
+
+    /**
+     * Unique identifier of a keybinding context that is enabled if the active editor has the focus but it does not have any overlaying widgets, such as the content assist widget.
+     */
+    export const strictEditorTextFocus = 'strictEditorTextFocus';
+}
+
+@injectable()
+export class EditorTextFocusContext implements KeybindingContext {
+
+    readonly id: string = EditorKeybindingContexts.editorTextFocus;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    isEnabled(): boolean {
+        return !!this.getEditor();
+    }
+
+    protected getEditor(): EditorWidget | undefined {
+        const widget = this.editorManager.activeEditor;
+        if (widget && this.canHandle(widget)) {
+            return widget;
+        }
+        return undefined;
+    }
+
+    protected canHandle(widget: EditorWidget): boolean {
+        return widget.editor.isFocused();
+    }
+
+}
+
+@injectable()
+export class DiffEditorTextFocusContext extends EditorTextFocusContext {
+
+    override readonly id: string = EditorKeybindingContexts.diffEditorTextFocus;
+
+    protected override canHandle(widget: EditorWidget): boolean {
+        return super.canHandle(widget) && DiffUris.isDiffUri(widget.editor.uri);
+    }
+
+}
+
+/**
+ * Keybinding context that is enabled when the active text editor has the focus **AND** it does not
+ * have any widgets (for example, the content assist widget) overlaying the active editor.
+ */
+@injectable()
+export class StrictEditorTextFocusContext extends EditorTextFocusContext {
+
+    override readonly id: string = EditorKeybindingContexts.strictEditorTextFocus;
+
+}

package/src/browser/editor-keybinding.ts

@@ -1,55 +1,55 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
-import { isOSX, isWindows } from '@theia/core/lib/common/os';
-import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
-import { EditorCommands } from './editor-command';
-
-@injectable()
-export class EditorKeybindingContribution implements KeybindingContribution {
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybindings(
-            {
-                command: EditorCommands.GO_BACK.id,
-                keybinding: isOSX ? 'ctrl+-' : isWindows ? 'alt+left' : /* isLinux */ 'ctrl+alt+-'
-            },
-            {
-                command: EditorCommands.GO_FORWARD.id,
-                keybinding: isOSX ? 'ctrl+shift+-' : isWindows ? 'alt+right' : /* isLinux */ 'ctrl+shift+-'
-            },
-            {
-                command: EditorCommands.GO_LAST_EDIT.id,
-                keybinding: 'ctrl+alt+q'
-            },
-            {
-                command: EditorCommands.TOGGLE_WORD_WRAP.id,
-                keybinding: 'alt+z'
-            },
-            {
-                command: EditorCommands.REOPEN_CLOSED_EDITOR.id,
-                keybinding: this.isElectron() ? 'ctrlcmd+shift+t' : 'alt+shift+t'
-            }
-        );
-    }
-
-    private isElectron(): boolean {
-        return environment.electron.is();
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
+import { isOSX, isWindows } from '@theia/core/lib/common/os';
+import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
+import { EditorCommands } from './editor-command';
+
+@injectable()
+export class EditorKeybindingContribution implements KeybindingContribution {
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybindings(
+            {
+                command: EditorCommands.GO_BACK.id,
+                keybinding: isOSX ? 'ctrl+-' : isWindows ? 'alt+left' : /* isLinux */ 'ctrl+alt+-'
+            },
+            {
+                command: EditorCommands.GO_FORWARD.id,
+                keybinding: isOSX ? 'ctrl+shift+-' : isWindows ? 'alt+right' : /* isLinux */ 'ctrl+shift+-'
+            },
+            {
+                command: EditorCommands.GO_LAST_EDIT.id,
+                keybinding: 'ctrl+alt+q'
+            },
+            {
+                command: EditorCommands.TOGGLE_WORD_WRAP.id,
+                keybinding: 'alt+z'
+            },
+            {
+                command: EditorCommands.REOPEN_CLOSED_EDITOR.id,
+                keybinding: this.isElectron() ? 'ctrlcmd+shift+t' : 'alt+shift+t'
+            }
+        );
+    }
+
+    private isElectron(): boolean {
+        return environment.electron.is();
+    }
+
+}