@theia/plugin-ext 1.55.0-next.4 → 1.55.0

package/src/plugin/file-system-event-service-ext-impl.ts

@@ -48,7 +48,7 @@ type Event<T> = vscode.Event<T>;
 type IExtensionDescription = Plugin;
 type IWaitUntil = WaitUntilEvent;
 
-class FileSystemWatcher implements vscode.FileSystemWatcher {
+export class FileSystemWatcher implements vscode.FileSystemWatcher {
 
     private readonly _onDidCreate = new Emitter<vscode.Uri>();
     private readonly _onDidChange = new Emitter<vscode.Uri>();
@@ -68,7 +68,8 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
         return Boolean(this._config & 0b100);
     }
 
-    constructor(dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean) {
+    constructor(dispatcher: Event<FileSystemEvents>, globPattern: string | IRelativePattern,
+        ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean, excludes?: string[]) {
 
         this._config = 0;
         if (ignoreCreateEvents) {
@@ -82,12 +83,13 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
         }
 
         const parsedPattern = parse(globPattern);
+        const excludePatterns = excludes?.map(exclude => parse(exclude)) || [];
 
         const subscription = dispatcher(events => {
             if (!ignoreCreateEvents) {
                 for (const created of events.created) {
                     const uri = URI.revive(created);
-                    if (parsedPattern(uri.fsPath)) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
                         this._onDidCreate.fire(uri);
                     }
                 }
@@ -95,7 +97,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
             if (!ignoreChangeEvents) {
                 for (const changed of events.changed) {
                     const uri = URI.revive(changed);
-                    if (parsedPattern(uri.fsPath)) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
                         this._onDidChange.fire(uri);
                     }
                 }
@@ -103,7 +105,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
             if (!ignoreDeleteEvents) {
                 for (const deleted of events.deleted) {
                     const uri = URI.revive(deleted);
-                    if (parsedPattern(uri.fsPath)) {
+                    if (parsedPattern(uri.fsPath) && !excludePatterns.some(p => p(uri.fsPath))) {
                         this._onDidDelete.fire(uri);
                     }
                 }
@@ -113,7 +115,7 @@ class FileSystemWatcher implements vscode.FileSystemWatcher {
         this._disposable = Disposable.from(this._onDidCreate, this._onDidChange, this._onDidDelete, subscription);
     }
 
-    dispose() {
+    dispose(): void {
         this._disposable.dispose();
     }
 
@@ -160,8 +162,9 @@ export class ExtHostFileSystemEventService implements ExtHostFileSystemEventServ
 
     // --- file events
 
-    createFileSystemWatcher(globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean): vscode.FileSystemWatcher {
-        return new FileSystemWatcher(this._onFileSystemEvent.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents);
+    createFileSystemWatcher(globPattern: string | IRelativePattern, ignoreCreateEvents?: boolean,
+        ignoreChangeEvents?: boolean, ignoreDeleteEvents?: boolean, excludes?: string[]): vscode.FileSystemWatcher {
+        return new FileSystemWatcher(this._onFileSystemEvent.event, globPattern, ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents, excludes);
     }
 
     $onFileEvent(events: FileSystemEvents) {

package/src/plugin/file-system-ext-impl.ts

@@ -40,8 +40,9 @@ import { State, StateMachine, LinkComputer, Edge } from '../common/link-computer
 import { commonPrefixLength } from '@theia/core/lib/common/strings';
 import { CharCode } from '@theia/core/lib/common/char-code';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
-import { Emitter } from '@theia/core/shared/vscode-languageserver-protocol';
 import { MarkdownString } from '../common/plugin-api-rpc-model';
+import { Emitter } from '@theia/core/lib/common';
+import { createAPIObject } from './plugin-context';
 
 type IDisposable = vscode.Disposable;
 
@@ -137,8 +138,11 @@ export class FsLinkProvider {
 }
 
 class ConsumerFileSystem implements vscode.FileSystem {
+    apiObject: vscode.FileSystem;
 
-    constructor(private _proxy: FileSystemMain, private _capabilities: Map<string, number>) { }
+    constructor(private _proxy: FileSystemMain, private _capabilities: Map<string, number>) {
+        this.apiObject = createAPIObject(this);
+    }
 
     stat(uri: vscode.Uri): Promise<vscode.FileStat> {
         return this._proxy.$stat(uri).catch(ConsumerFileSystem._handleError);
@@ -210,7 +214,7 @@ export class FileSystemExtImpl implements FileSystemExt {
 
     private _handlePool: number = 0;
 
-    readonly fileSystem: vscode.FileSystem;
+    readonly fileSystem: ConsumerFileSystem;
 
     constructor(rpc: RPCProtocol) {
         this._proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.FILE_SYSTEM_MAIN);

package/src/plugin/file-system-watcher.spec.ts

@@ -0,0 +1,125 @@
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as assert from 'assert';
+import { FileSystemWatcher } from './file-system-event-service-ext-impl';
+import { DisposableCollection, Emitter } from '@theia/core';
+import { FileSystemEvents } from '../common';
+import { URI } from './types-impl';
+
+const eventSource = new Emitter<FileSystemEvents>();
+let disposables = new DisposableCollection();
+
+function checkIgnore(ignoreCreate: number, ignoreChange: number, ignoreDelete: number): void {
+    const watcher = new FileSystemWatcher(eventSource.event, '**/*.js', !ignoreCreate, !ignoreChange, !ignoreDelete);
+    disposables.push(watcher);
+    const matching = URI.file('/foo/bar/zoz.js');
+
+    const changed: URI[] = [];
+    const created: URI[] = [];
+    const deleted: URI[] = [];
+    watcher.onDidChange(e => {
+        changed.push(e);
+    });
+
+    watcher.onDidCreate(e => {
+        created.push(e);
+    });
+
+    watcher.onDidDelete(e => {
+        deleted.push(e);
+    });
+
+    eventSource.fire({ changed: [matching], created: [matching], deleted: [matching] });
+
+    assert.equal(created.length, ignoreCreate);
+    assert.equal(deleted.length, ignoreDelete);
+    assert.equal(changed.length, ignoreChange);
+
+}
+
+describe('File Watcher Test', () => {
+    afterEach(() => {
+        disposables.dispose();
+        disposables = new DisposableCollection();
+    });
+
+    it('Should match files', () => {
+        const watcher = new FileSystemWatcher(eventSource.event, '**/*.js');
+        disposables.push(watcher);
+        const matching = URI.file('/foo/bar/zoz.js');
+        const notMatching = URI.file('/foo/bar/zoz.ts');
+        const changed: URI[] = [];
+        const created: URI[] = [];
+        const deleted: URI[] = [];
+        watcher.onDidChange(e => {
+            changed.push(e);
+        });
+
+        watcher.onDidCreate(e => {
+            created.push(e);
+        });
+
+        watcher.onDidDelete(e => {
+            deleted.push(e);
+        });
+
+        const URIs = [matching, notMatching];
+        eventSource.fire({ changed: URIs, created: URIs, deleted: URIs });
+        assert.equal(matching.toString(), changed[0]?.toString());
+        assert.equal(matching.toString(), created[0]?.toString());
+        assert.equal(matching.toString(), deleted[0]?.toString());
+    });
+
+    it('Should ignore created', () => {
+        checkIgnore(0, 1, 1);
+    });
+
+    it('Should ignore changed', () => {
+        checkIgnore(1, 0, 1);
+    });
+
+    it('Should ignore deleted', () => {
+        checkIgnore(1, 1, 0);
+    });
+
+    it('Should exclude files', () => {
+        const watcher = new FileSystemWatcher(eventSource.event, '**/*.js', false, false, false, ['**/bar/**']);
+        disposables.push(watcher);
+        const notMatching = URI.file('/foo/bar/zoz.js');
+        const matching = URI.file('/foo/gux/zoz.js');
+        const changed: URI[] = [];
+        const created: URI[] = [];
+        const deleted: URI[] = [];
+        watcher.onDidChange(e => {
+            changed.push(e);
+        });
+
+        watcher.onDidCreate(e => {
+            created.push(e);
+        });
+
+        watcher.onDidDelete(e => {
+            deleted.push(e);
+        });
+
+        const URIs = [matching, notMatching];
+        eventSource.fire({ changed: URIs, created: URIs, deleted: URIs });
+        assert.equal(matching.toString(), changed[0]?.toString());
+        assert.equal(matching.toString(), created[0]?.toString());
+        assert.equal(matching.toString(), deleted[0]?.toString());
+    });
+});

package/src/plugin/notebook/notebooks.ts

@@ -22,14 +22,14 @@ import { CancellationToken, Disposable, DisposableCollection, Emitter, Event, UR
 import { URI as TheiaURI } from '../types-impl';
 import * as theia from '@theia/plugin';
 import {
-    CommandRegistryExt, NotebookCellStatusBarListDto, NotebookDataDto,
+    NotebookCellStatusBarListDto, NotebookDataDto,
     NotebookDocumentsAndEditorsDelta, NotebookDocumentShowOptions, NotebookDocumentsMain, NotebookEditorAddData, NotebookEditorsMain, NotebooksExt, NotebooksMain, Plugin,
     PLUGIN_RPC_CONTEXT
 } from '../../common';
 import { Cache } from '../../common/cache';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { UriComponents } from '../../common/uri-components';
-import { CommandsConverter } from '../command-registry';
+import { CommandRegistryImpl, CommandsConverter } from '../command-registry';
 import * as typeConverters from '../type-converters';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { Cell, NotebookDocument } from './notebook-document';
@@ -74,10 +74,11 @@ export class NotebooksExtImpl implements NotebooksExt {
 
     constructor(
         rpc: RPCProtocol,
-        commands: CommandRegistryExt,
+        commands: CommandRegistryImpl,
         private textDocumentsAndEditors: EditorsAndDocumentsExtImpl,
         private textDocuments: DocumentsExtImpl,
     ) {
+        this.commandsConverter = commands.converter;
         this.notebookProxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTEBOOKS_MAIN);
         this.notebookDocumentsProxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTEBOOK_DOCUMENTS_MAIN);
         this.notebookEditors = rpc.getProxy(PLUGIN_RPC_CONTEXT.NOTEBOOK_EDITORS_MAIN);
@@ -329,6 +330,7 @@ export class NotebooksExtImpl implements NotebooksExt {
         if (delta.newActiveEditor === null) {
             // clear active notebook as current active editor is non-notebook editor
             this.activeNotebookEditor = undefined;
+            this.onDidChangeActiveNotebookEditorEmitter.fire(undefined);
         } else if (delta.newActiveEditor) {
             const activeEditor = this.editors.get(delta.newActiveEditor);
             if (!activeEditor) {
@@ -340,8 +342,6 @@ export class NotebooksExtImpl implements NotebooksExt {
                     newActiveEditor: null
                 });
             }
-        }
-        if (delta.newActiveEditor !== undefined) {
             this.onDidChangeActiveNotebookEditorEmitter.fire(this.activeNotebookEditor?.apiEditor);
         }
     }

package/src/plugin/plugin-context.ts

@@ -278,6 +278,22 @@ import { NotebookDocumentsExtImpl } from './notebook/notebook-documents';
 import { NotebookEditorsExtImpl } from './notebook/notebook-editors';
 import { TestingExtImpl } from './tests';
 import { UriExtImpl } from './uri-ext';
+import { isObject } from '@theia/core';
+
+export function createAPIObject<T extends Object>(rawObject: T): T {
+    return new Proxy(rawObject, {
+        get(target, p, receiver) {
+            const isOwnProperty = !!Object.getOwnPropertyDescriptor(target, p);
+            const val = Reflect.get(target, p);
+            if (!isOwnProperty && typeof val === 'function') {
+                // bind functions that are inherited from the prototype to the object itself.
+                // This should handle the case of events.
+                return val.bind(target);
+            }
+            return val;
+        },
+    }) as T;
+}
 
 export function createAPIFactory(
     rpc: RPCProtocol,
@@ -496,7 +512,8 @@ export function createAPIFactory(
                 return quickOpenExt.showQuickPick(plugin, items, options, token);
             },
             createQuickPick<T extends theia.QuickPickItem>(): theia.QuickPick<T> {
-                return quickOpenExt.createQuickPick(plugin);
+
+                return createAPIObject(quickOpenExt.createQuickPick(plugin));
             },
             showWorkspaceFolderPick(options?: theia.WorkspaceFolderPickOptions): PromiseLike<theia.WorkspaceFolder | undefined> {
                 return workspaceExt.pickWorkspaceFolder(options);
@@ -535,9 +552,12 @@ export function createAPIFactory(
                     priority = priorityOrAlignment;
                 }
 
+                // TODO: here
                 return statusBarMessageRegistryExt.createStatusBarItem(alignment, priority, id);
             },
             createOutputChannel(name: string, options?: { log: true }): any {
+
+                // TODO: here
                 return !options
                     ? outputChannelRegistryExt.createOutputChannel(name, pluginToPluginInfo(plugin))
                     : outputChannelRegistryExt.createOutputChannel(name, pluginToPluginInfo(plugin), options);
@@ -546,7 +566,7 @@ export function createAPIFactory(
                 title: string,
                 showOptions: theia.ViewColumn | theia.WebviewPanelShowOptions,
                 options: theia.WebviewPanelOptions & theia.WebviewOptions = {}): theia.WebviewPanel {
-                return webviewExt.createWebview(viewType, title, showOptions, options, plugin);
+                return createAPIObject(webviewExt.createWebview(viewType, title, showOptions, options, plugin));
             },
             registerWebviewPanelSerializer(viewType: string, serializer: theia.WebviewPanelSerializer): theia.Disposable {
                 return webviewExt.registerWebviewPanelSerializer(viewType, serializer, plugin);
@@ -574,19 +594,19 @@ export function createAPIFactory(
             createTerminal(nameOrOptions: theia.TerminalOptions | theia.ExtensionTerminalOptions | theia.ExtensionTerminalOptions | (string | undefined),
                 shellPath?: string,
                 shellArgs?: string[] | string): theia.Terminal {
-                return terminalExt.createTerminal(plugin, nameOrOptions, shellPath, shellArgs);
+                return createAPIObject(terminalExt.createTerminal(plugin, nameOrOptions, shellPath, shellArgs));
             },
             onDidChangeTerminalState,
             onDidCloseTerminal,
             onDidOpenTerminal,
             createTextEditorDecorationType(options: theia.DecorationRenderOptions): theia.TextEditorDecorationType {
-                return editors.createTextEditorDecorationType(options);
+                return createAPIObject(editors.createTextEditorDecorationType(options));
             },
             registerTreeDataProvider<T>(viewId: string, treeDataProvider: theia.TreeDataProvider<T>): Disposable {
                 return treeViewsExt.registerTreeDataProvider(plugin, viewId, treeDataProvider);
             },
             createTreeView<T>(viewId: string, options: theia.TreeViewOptions<T>): theia.TreeView<T> {
-                return treeViewsExt.createTreeView(plugin, viewId, options);
+                return createAPIObject(treeViewsExt.createTreeView(plugin, viewId, options));
             },
             withScmProgress<R>(task: (progress: theia.Progress<number>) => Thenable<R>) {
                 const options: ProgressOptions = { location: ProgressLocation.SourceControl };
@@ -605,7 +625,7 @@ export function createAPIFactory(
                 return uriExt.registerUriHandler(handler, pluginToPluginInfo(plugin));
             },
             createInputBox(): theia.InputBox {
-                return quickOpenExt.createInputBox(plugin);
+                return createAPIObject(quickOpenExt.createInputBox(plugin));
             },
             registerTerminalLinkProvider(provider: theia.TerminalLinkProvider): theia.Disposable {
                 return terminalExt.registerTerminalLinkProvider(provider);
@@ -650,10 +670,26 @@ export function createAPIFactory(
             onDidStartTerminalShellExecution: Event.None
         };
 
+        function createFileSystemWatcher(pattern: RelativePattern, options?: theia.FileSystemWatcherOptions): theia.FileSystemWatcher;
+        function createFileSystemWatcher(pattern: theia.GlobPattern, ignoreCreateEvents?: boolean, ignoreChangeEvents?:
+            boolean, ignoreDeleteEvents?: boolean): theia.FileSystemWatcher;
+        function createFileSystemWatcher(pattern: RelativePattern | theia.GlobPattern,
+            ignoreCreateOrOptions?: theia.FileSystemWatcherOptions | boolean, ignoreChangeEventsBoolean?: boolean, ignoreDeleteEventsBoolean?: boolean): theia.FileSystemWatcher {
+            if (isObject<theia.FileSystemWatcherOptions>(ignoreCreateOrOptions)) {
+                const { ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents, excludes } = (ignoreCreateOrOptions as theia.FileSystemWatcherOptions);
+                return createAPIObject(
+                    extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern),
+                        ignoreCreateEvents, ignoreChangeEvents, ignoreDeleteEvents, excludes));
+            } else {
+                return createAPIObject(
+                    extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern),
+                        ignoreCreateOrOptions as boolean, ignoreChangeEventsBoolean, ignoreDeleteEventsBoolean));
+            }
+        }
         const workspace: typeof theia.workspace = {
 
             get fs(): theia.FileSystem {
-                return fileSystemExt.fileSystem;
+                return fileSystemExt.fileSystem.apiObject;
             },
 
             get rootPath(): string | undefined {
@@ -755,8 +791,7 @@ export function createAPIFactory(
                 // Notebook extension will create a document in openNotebookDocument() or create openNotebookDocument()
                 return notebooksExt.getNotebookDocument(uri).apiNotebook;
             },
-            createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): theia.FileSystemWatcher =>
-                extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern), ignoreCreate, ignoreChange, ignoreDelete),
+            createFileSystemWatcher,
             findFiles(include: theia.GlobPattern, exclude?: theia.GlobPattern | null, maxResults?: number, token?: CancellationToken): PromiseLike<URI[]> {
                 return workspaceExt.findFiles(include, exclude, maxResults, token);
             },
@@ -849,7 +884,7 @@ export function createAPIFactory(
                 return telemetryExt.onDidChangeTelemetryEnabled;
             },
             createTelemetryLogger(sender: theia.TelemetrySender, options?: theia.TelemetryLoggerOptions): theia.TelemetryLogger {
-                return telemetryExt.createTelemetryLogger(sender, options);
+                return createAPIObject(telemetryExt.createTelemetryLogger(sender, options));
             },
             get remoteName(): string | undefined { return envExt.remoteName; },
             get machineId(): string { return envExt.machineId; },
@@ -924,7 +959,7 @@ export function createAPIFactory(
                 return <any>languagesExt.getDiagnostics(resource);
             },
             createDiagnosticCollection(name?: string): theia.DiagnosticCollection {
-                return languagesExt.createDiagnosticCollection(name);
+                return createAPIObject(languagesExt.createDiagnosticCollection(name));
             },
             setLanguageConfiguration(language: string, configuration: theia.LanguageConfiguration): theia.Disposable {
                 return languagesExt.setLanguageConfiguration(language, configuration);
@@ -1061,7 +1096,7 @@ export function createAPIFactory(
 
         const tests: typeof theia.tests = {
             createTestController(id, label: string) {
-                return testingExt.createTestController(id, label);
+                return createAPIObject(testingExt.createTestController(id, label));
             }
         };
         /* End of Tests API */
@@ -1173,6 +1208,7 @@ export function createAPIFactory(
             },
 
             get taskExecutions(): ReadonlyArray<theia.TaskExecution> {
+                // TODO: here
                 return tasksExt.taskExecutions;
             },
             onDidStartTask(listener, thisArg?, disposables?) {
@@ -1193,19 +1229,19 @@ export function createAPIFactory(
             get inputBox(): theia.SourceControlInputBox {
                 const inputBox = scmExt.getLastInputBox(plugin);
                 if (inputBox) {
-                    return inputBox;
+                    return inputBox.apiObject;
                 } else {
                     throw new Error('Input box not found!');
                 }
             },
             createSourceControl(id: string, label: string, rootUri?: URI): theia.SourceControl {
-                return scmExt.createSourceControl(plugin, id, label, rootUri);
+                return createAPIObject(scmExt.createSourceControl(plugin, id, label, rootUri));
             }
         };
 
         const comments: typeof theia.comments = {
             createCommentController(id: string, label: string): theia.CommentController {
-                return commentsExt.createCommentController(plugin, id, label);
+                return createAPIObject(commentsExt.createCommentController(plugin, id, label));
             }
         };
 
@@ -1268,6 +1304,10 @@ export function createAPIFactory(
             registerMappedEditsProvider(documentSelector: theia.DocumentSelector, provider: theia.MappedEditsProvider): Disposable {
                 return Disposable.NULL;
             },
+            /** @stubbed MappedEditsProvider */
+            registerMappedEditsProvider2(provider: theia.MappedEditsProvider2) {
+                return Disposable.NULL;
+            },
             /** @stubbed ChatRequestHandler */
             createChatParticipant(id: string, handler: theia.ChatRequestHandler): theia.ChatParticipant {
                 return {

package/src/plugin/scm.ts

@@ -39,6 +39,7 @@ import { URI, ThemeIcon } from './types-impl';
 import { ScmCommandArg } from '../common/plugin-api-rpc';
 import { sep } from '@theia/core/lib/common/paths';
 import { PluginIconPath } from './plugin-icon-path';
+import { createAPIObject } from './plugin-context';
 type ProviderHandle = number;
 type GroupHandle = number;
 type ResourceStateHandle = number;
@@ -290,6 +291,7 @@ interface ValidateInput {
 export class ScmInputBoxImpl implements theia.SourceControlInputBox {
 
     private _value: string = '';
+    apiObject: theia.SourceControlInputBox;
 
     get value(): string {
         return this._value;
@@ -354,7 +356,7 @@ export class ScmInputBoxImpl implements theia.SourceControlInputBox {
     }
 
     constructor(private plugin: Plugin, private proxy: ScmMain, private sourceControlHandle: number) {
-        // noop
+        this.apiObject = createAPIObject(this);
     }
 
     onInputBoxValueChange(value: string): void {
@@ -543,8 +545,7 @@ class SourceControlImpl implements theia.SourceControl {
         return this._rootUri;
     }
 
-    private _inputBox: ScmInputBoxImpl;
-    get inputBox(): ScmInputBoxImpl { return this._inputBox; }
+    readonly inputBox: ScmInputBoxImpl;
 
     private _count: number | undefined = undefined;
 
@@ -642,7 +643,7 @@ class SourceControlImpl implements theia.SourceControl {
         private _label: string,
         private _rootUri?: theia.Uri
     ) {
-        this._inputBox = new ScmInputBoxImpl(plugin, this.proxy, this.handle);
+        this.inputBox = new ScmInputBoxImpl(plugin, this.proxy, this.handle);
         this.proxy.$registerSourceControl(this.handle, _id, _label, _rootUri);
     }
 

package/src/plugin/window-state.ts

@@ -55,7 +55,13 @@ export class WindowStateExtImpl implements WindowStateExt {
         this.windowStateChangedEmitter.fire(this.windowStateCached);
     }
 
-    openUri(uri: URI): Promise<boolean> {
+    async openUri(uriOrString: URI | string): Promise<boolean> {
+        let uri: URI;
+        if (typeof uriOrString === 'string') {
+            uri = URI.parse(uriOrString);
+        } else {
+            uri = uriOrString;
+        }
         if (!uri.scheme.trim().length) {
             throw new Error('Invalid scheme - cannot be empty');
         }