{
+ await super.evaluate('watch');
+ }
+
+ protected setResult(body?: DebugProtocol.EvaluateResponse['body']): void {
+ // overriden to ignore error
+ super.setResult(body);
+ this.options.onDidChange();
+ }
+
+ render(): React.ReactNode {
+ return
+ {this._expression}:
+ {this._value}
+
;
+ }
+
+ async open(): Promise {
+ const input = new SingleTextInputDialog({
+ title: 'Edit Watch Expression',
+ initialValue: this.expression
+ });
+ const newValue = await input.open();
+ if (newValue !== undefined) {
+ this._expression = newValue;
+ await this.evaluate();
+ }
+ }
+
+ get supportCopyValue(): boolean {
+ return !!this.valueRef && document.queryCommandSupported('copy');
+ }
+ copyValue(): void {
+ const selection = document.getSelection();
+ if (this.valueRef && selection) {
+ selection.selectAllChildren(this.valueRef);
+ document.execCommand('copy');
+ }
+ }
+ protected valueRef: HTMLSpanElement | undefined;
+ protected setValueRef = (valueRef: HTMLSpanElement | null) => this.valueRef = valueRef || undefined;
+
+}
diff --git a/packages/debug/src/browser/view/debug-watch-source.ts b/packages/debug/src/browser/view/debug-watch-source.ts
new file mode 100644
index 0000000000000..fd7a67e3ac3bb
--- /dev/null
+++ b/packages/debug/src/browser/view/debug-watch-source.ts
@@ -0,0 +1,47 @@
+/********************************************************************************
+ * Copyright (C) 2019 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, postConstruct } from 'inversify';
+import { TreeSource } from '@theia/core/lib/browser/source-tree';
+import { DebugViewModel } from './debug-view-model';
+import { DebugWatchExpression } from './debug-watch-expression';
+import debounce = require('p-debounce');
+
+@injectable()
+export class DebugWatchSource extends TreeSource {
+
+ @inject(DebugViewModel)
+ protected readonly model: DebugViewModel;
+
+ constructor() {
+ super({
+ placeholder: 'No expressions'
+ });
+ }
+
+ @postConstruct()
+ protected init(): void {
+ this.refresh();
+ this.toDispose.push(this.model.onDidChangeWatchExpressions(() => this.refresh()));
+ }
+
+ protected readonly refresh = debounce(() => this.fireDidChange(), 100);
+
+ async getElements(): Promise> {
+ return this.model.watchExpressions[Symbol.iterator]();
+ }
+
+}
diff --git a/packages/debug/src/browser/view/debug-watch-widget.ts b/packages/debug/src/browser/view/debug-watch-widget.ts
new file mode 100644
index 0000000000000..a36487bb78b0f
--- /dev/null
+++ b/packages/debug/src/browser/view/debug-watch-widget.ts
@@ -0,0 +1,59 @@
+/********************************************************************************
+ * Copyright (C) 2019 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, postConstruct, interfaces, Container } from 'inversify';
+import { MenuPath } from '@theia/core/lib/common';
+import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
+import { DebugWatchSource } from './debug-watch-source';
+import { DebugViewModel } from './debug-view-model';
+
+@injectable()
+export class DebugWatchWidget extends SourceTreeWidget {
+
+ static CONTEXT_MENU: MenuPath = ['debug-watch-context-menu'];
+ static EDIT_MENU = [...DebugWatchWidget.CONTEXT_MENU, 'a_edit'];
+ static REMOVE_MENU = [...DebugWatchWidget.CONTEXT_MENU, 'b_remove'];
+ static createContainer(parent: interfaces.Container): Container {
+ const child = SourceTreeWidget.createContainer(parent, {
+ contextMenuPath: DebugWatchWidget.CONTEXT_MENU,
+ virtualized: false,
+ scrollIfActive: true
+ });
+ child.bind(DebugWatchSource).toSelf();
+ child.unbind(SourceTreeWidget);
+ child.bind(DebugWatchWidget).toSelf();
+ return child;
+ }
+ static createWidget(parent: interfaces.Container): DebugWatchWidget {
+ return DebugWatchWidget.createContainer(parent).get(DebugWatchWidget);
+ }
+
+ @inject(DebugViewModel)
+ readonly viewModel: DebugViewModel;
+
+ @inject(DebugWatchSource)
+ protected readonly variables: DebugWatchSource;
+
+ @postConstruct()
+ protected init(): void {
+ super.init();
+ this.id = 'debug:watch:' + this.viewModel.id;
+ this.title.label = 'Watch';
+ this.toDispose.push(this.variables);
+ this.source = this.variables;
+ }
+
+}
diff --git a/packages/markers/src/browser/problem/problem-contribution.ts b/packages/markers/src/browser/problem/problem-contribution.ts
index 55dbda343ecce..abe963a2ca1da 100644
--- a/packages/markers/src/browser/problem/problem-contribution.ts
+++ b/packages/markers/src/browser/problem/problem-contribution.ts
@@ -40,7 +40,7 @@ export namespace ProblemsCommands {
};
export const COLLAPSE_ALL_TOOLBAR: Command = {
id: 'problems.collapse.all.toolbar',
- iconClass: 'collapse-all'
+ iconClass: 'theia-collapse-all-icon'
};
export const COPY: Command = {
id: 'problems.copy'
diff --git a/packages/navigator/src/browser/navigator-contribution.ts b/packages/navigator/src/browser/navigator-contribution.ts
index 0edfb7cf173fa..0fb9b29df9990 100644
--- a/packages/navigator/src/browser/navigator-contribution.ts
+++ b/packages/navigator/src/browser/navigator-contribution.ts
@@ -48,7 +48,7 @@ export namespace FileNavigatorCommands {
id: 'navigator.collapse.all',
category: 'File',
label: 'Collapse Folders in Explorer',
- iconClass: 'collapse-all'
+ iconClass: 'theia-collapse-all-icon'
};
export const ADD_ROOT_FOLDER: Command = {
id: 'navigator.addRootFolder'
diff --git a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
index 742c1b784ba69..45a8a7dcb3851 100644
--- a/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
+++ b/packages/search-in-workspace/src/browser/search-in-workspace-frontend-contribution.ts
@@ -55,7 +55,7 @@ export namespace SearchInWorkspaceCommands {
id: 'search-in-workspace.collapse-all',
category: SEARCH_CATEGORY,
label: 'Collapse All',
- iconClass: 'collapse-all'
+ iconClass: 'theia-collapse-all-icon'
};
export const CLEAR_ALL: Command = {
id: 'search-in-workspace.clear-all',
diff --git a/packages/search-in-workspace/src/browser/styles/index.css b/packages/search-in-workspace/src/browser/styles/index.css
index 0162a42b5feac..13130d6946f43 100644
--- a/packages/search-in-workspace/src/browser/styles/index.css
+++ b/packages/search-in-workspace/src/browser/styles/index.css
@@ -68,10 +68,6 @@
background: var(--theia-icon-refresh) no-repeat;
}
-.p-TabBar-toolbar .item .collapse-all {
- background: var(--theia-icon-collapse-all) no-repeat;
-}
-
.p-TabBar-toolbar .item .clear-all {
background: var(--theia-icon-clear) no-repeat;
}