@codingame/monaco-vscode-debug-service-override 2.0.3 → 2.1.0

package/vscode/src/vs/workbench/contrib/debug/browser/welcomeView.js

@@ -11,7 +11,7 @@ import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPan
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -32,7 +32,10 @@ let WelcomeView = class WelcomeView extends ViewPane {
         const lastSetLanguage = storageSevice.get(debugStartLanguageKey, 1 );
         this.debugStartLanguageContext.set(lastSetLanguage);
         const setContextKey = () => {
-            const editorControl = this.editorService.activeTextEditorControl;
+            let editorControl = this.editorService.activeTextEditorControl;
+            if (isDiffEditor(editorControl)) {
+                editorControl = editorControl.getModifiedEditor();
+            }
             if (isCodeEditor(editorControl)) {
                 const model = editorControl.getModel();
                 const language = model ? model.getLanguageId() : undefined;
@@ -49,7 +52,10 @@ let WelcomeView = class WelcomeView extends ViewPane {
         this._register(disposables);
         this._register(editorService.onDidActiveEditorChange(() => {
             disposables.clear();
-            const editorControl = this.editorService.activeTextEditorControl;
+            let editorControl = this.editorService.activeTextEditorControl;
+            if (isDiffEditor(editorControl)) {
+                editorControl = editorControl.getModifiedEditor();
+            }
             if (isCodeEditor(editorControl)) {
                 disposables.add(editorControl.onDidChangeModelLanguage(setContextKey));
             }

package/vscode/src/vs/workbench/contrib/debug/common/debugStorage.js

@@ -1,11 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
@@ -54,7 +54,7 @@ let DebugStorage = class DebugStorage extends Disposable {
         let result;
         try {
             result = ( JSON.parse(this.storageService.get(DEBUG_BREAKPOINTS_KEY, 1 , '[]')).map((breakpoint) => {
-                return ( new Breakpoint(( URI.parse(breakpoint.uri.external || breakpoint.source.uri.external)), breakpoint.lineNumber, breakpoint.column, breakpoint.enabled, breakpoint.condition, breakpoint.hitCondition, breakpoint.logMessage, breakpoint.adapterData, this.textFileService, this.uriIdentityService, this.logService, breakpoint.id));
+                return ( new Breakpoint(( URI.parse(breakpoint.uri.external || breakpoint.source.uri.external)), breakpoint.lineNumber, breakpoint.column, breakpoint.enabled, breakpoint.condition, breakpoint.hitCondition, breakpoint.logMessage, breakpoint.adapterData, this.textFileService, this.uriIdentityService, this.logService, breakpoint.id, breakpoint.triggeredBy));
             }));
         }
         catch (e) { }

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js

@@ -1,204 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, addDisposableListener, EventType, clearNode, addStandardDisposableListener, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
-import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
-import { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { createMatches } from 'vscode/vscode/vs/base/common/filters';
-import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functional';
-import { DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Expression, Variable, ExpressionContainer } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
-import { ReplEvaluationResult } from '../common/replModel.js';
-
-const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
-const booleanRegex = /^(true|false)$/i;
-const stringRegex = /^(['"]).*\1$/;
-const $ = $$1;
-function renderViewTree(container) {
-    const treeContainer = $('.');
-    treeContainer.classList.add('debug-view-content');
-    container.appendChild(treeContainer);
-    return treeContainer;
-}
-function renderExpressionValue(expressionOrValue, container, options) {
-    let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
-    container.className = 'value';
-    if (value === null || ((expressionOrValue instanceof Expression || expressionOrValue instanceof Variable || expressionOrValue instanceof ReplEvaluationResult) && !expressionOrValue.available)) {
-        container.classList.add('unavailable');
-        if (value !== Expression.DEFAULT_VALUE) {
-            container.classList.add('error');
-        }
-    }
-    else {
-        if ((expressionOrValue instanceof ExpressionContainer) && options.showChanged && expressionOrValue.valueChanged && value !== Expression.DEFAULT_VALUE) {
-            container.className = 'value changed';
-            expressionOrValue.valueChanged = false;
-        }
-        if (options.colorize && typeof expressionOrValue !== 'string') {
-            if (expressionOrValue.type === 'number' || expressionOrValue.type === 'boolean' || expressionOrValue.type === 'string') {
-                container.classList.add(expressionOrValue.type);
-            }
-            else if (!isNaN(+value)) {
-                container.classList.add('number');
-            }
-            else if (booleanRegex.test(value)) {
-                container.classList.add('boolean');
-            }
-            else if (stringRegex.test(value)) {
-                container.classList.add('string');
-            }
-        }
-    }
-    if (options.maxValueLength && value && value.length > options.maxValueLength) {
-        value = value.substring(0, options.maxValueLength) + '...';
-    }
-    if (!value) {
-        value = '';
-    }
-    if (options.linkDetector) {
-        container.textContent = '';
-        const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
-        container.appendChild(options.linkDetector.linkify(value, false, session ? session.root : undefined, true));
-    }
-    else {
-        container.textContent = value;
-    }
-    if (options.showHover) {
-        container.title = value || '';
-    }
-}
-function renderVariable(variable, data, showChanged, highlights, linkDetector) {
-    if (variable.available) {
-        let text = variable.name;
-        if (variable.value && typeof variable.name === 'string') {
-            text += ':';
-        }
-        data.label.set(text, highlights, variable.type ? variable.type : variable.name);
-        data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
-        data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
-    }
-    else if (variable.value && typeof variable.name === 'string' && variable.name) {
-        data.label.set(':');
-    }
-    data.expression.classList.toggle('lazy', !!variable.presentationHint?.lazy);
-    renderExpressionValue(variable, data.value, {
-        showChanged,
-        maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-        showHover: true,
-        colorize: true,
-        linkDetector
-    });
-}
-let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
-    constructor(debugService, contextViewService) {
-        this.debugService = debugService;
-        this.contextViewService = contextViewService;
-    }
-    renderTemplate(container) {
-        const expression = append(container, $('.expression'));
-        const name = append(expression, $('span.name'));
-        const lazyButton = append(expression, $('span.lazy-button'));
-        lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        lazyButton.title = ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/baseDebugView',
-            'debug.lazyButton.tooltip',
-            "Click to expand"
-        ));
-        const value = append(expression, $('span.value'));
-        const label = ( new HighlightedLabel(name));
-        const inputBoxContainer = append(expression, $('.inputBoxContainer'));
-        const templateDisposable = ( new DisposableStore());
-        let actionBar;
-        if (this.renderActionBar) {
-            append(expression, $('.span.actionbar-spacer'));
-            actionBar = templateDisposable.add(( new ActionBar(expression)));
-        }
-        const template = { expression, name, value, label, inputBoxContainer, actionBar, elementDisposable: [], templateDisposable, lazyButton, currentElement: undefined };
-        templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
-            if (template.currentElement) {
-                this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
-            }
-        }));
-        return template;
-    }
-    renderExpressionElement(element, node, data) {
-        data.currentElement = element;
-        this.renderExpression(node.element, data, createMatches(node.filterData));
-        if (data.actionBar) {
-            this.renderActionBar(data.actionBar, element, data);
-        }
-        const selectedExpression = this.debugService.getViewModel().getSelectedExpression();
-        if (element === selectedExpression?.expression || (element instanceof Variable && element.errorMessage)) {
-            const options = this.getInputBoxOptions(element, !!selectedExpression?.settingWatch);
-            if (options) {
-                data.elementDisposable.push(this.renderInputBox(data.name, data.value, data.inputBoxContainer, options));
-            }
-        }
-    }
-    renderInputBox(nameElement, valueElement, inputBoxContainer, options) {
-        nameElement.style.display = 'none';
-        valueElement.style.display = 'none';
-        inputBoxContainer.style.display = 'initial';
-        clearNode(inputBoxContainer);
-        const inputBox = ( new InputBox(
-            inputBoxContainer,
-            this.contextViewService,
-            { ...options, inputBoxStyles: defaultInputBoxStyles }
-        ));
-        inputBox.value = options.initialValue;
-        inputBox.focus();
-        inputBox.select();
-        const done = createSingleCallFunction((success, finishEditing) => {
-            nameElement.style.display = '';
-            valueElement.style.display = '';
-            inputBoxContainer.style.display = 'none';
-            const value = inputBox.value;
-            dispose(toDispose);
-            if (finishEditing) {
-                this.debugService.getViewModel().setSelectedExpression(undefined, false);
-                options.onFinish(value, success);
-            }
-        });
-        const toDispose = [
-            inputBox,
-            addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
-                const isEscape = e.equals(9 );
-                const isEnter = e.equals(3 );
-                if (isEscape || isEnter) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    done(isEnter, true);
-                }
-            }),
-            addDisposableListener(inputBox.inputElement, EventType.BLUR, () => {
-                done(true, true);
-            }),
-            addDisposableListener(inputBox.inputElement, EventType.CLICK, e => {
-                e.preventDefault();
-                e.stopPropagation();
-            })
-        ];
-        return toDisposable(() => {
-            done(false, false);
-        });
-    }
-    disposeElement(node, index, templateData) {
-        dispose(templateData.elementDisposable);
-        templateData.elementDisposable = [];
-    }
-    disposeTemplate(templateData) {
-        dispose(templateData.elementDisposable);
-        templateData.templateDisposable.dispose();
-    }
-};
-AbstractExpressionsRenderer = ( __decorate([
-    ( __param(0, IDebugService)),
-    ( __param(1, IContextViewService))
-], AbstractExpressionsRenderer));
-
-export { AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree };

package/vscode/src/vs/workbench/contrib/debug/common/replModel.js

@@ -1,287 +0,0 @@
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import Severity from 'vscode/vscode/vs/base/common/severity';
-import { isObject, isString } from 'vscode/vscode/vs/base/common/types';
-import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { ExpressionContainer } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
-
-const MAX_REPL_LENGTH = 10000;
-let topReplElementCounter = 0;
-const getUniqueId = () => `topReplElement:${topReplElementCounter++}`;
-class ReplOutputElement {
-    constructor(session, id, value, severity, sourceData, expression) {
-        this.session = session;
-        this.id = id;
-        this.value = value;
-        this.severity = severity;
-        this.sourceData = sourceData;
-        this.expression = expression;
-        this._count = 1;
-        this._onDidChangeCount = ( new Emitter());
-    }
-    toString(includeSource = false) {
-        let valueRespectCount = this.value;
-        for (let i = 1; i < this.count; i++) {
-            valueRespectCount += (valueRespectCount.endsWith('\n') ? '' : '\n') + this.value;
-        }
-        const sourceStr = (this.sourceData && includeSource) ? ` ${this.sourceData.source.name}` : '';
-        return valueRespectCount + sourceStr;
-    }
-    getId() {
-        return this.id;
-    }
-    getChildren() {
-        return this.expression?.getChildren() || Promise.resolve([]);
-    }
-    set count(value) {
-        this._count = value;
-        this._onDidChangeCount.fire();
-    }
-    get count() {
-        return this._count;
-    }
-    get onDidChangeCount() {
-        return this._onDidChangeCount.event;
-    }
-    get hasChildren() {
-        return !!this.expression?.hasChildren;
-    }
-}
-class ReplVariableElement {
-    constructor(expression, severity, sourceData) {
-        this.expression = expression;
-        this.severity = severity;
-        this.sourceData = sourceData;
-        this.id = generateUuid();
-        this.hasChildren = expression.hasChildren;
-    }
-    getChildren() {
-        return this.expression.getChildren();
-    }
-    toString() {
-        return ( this.expression.toString());
-    }
-    getId() {
-        return this.id;
-    }
-}
-class RawObjectReplElement {
-    static { this.MAX_CHILDREN = 1000; }
-    constructor(id, name, valueObj, sourceData, annotation) {
-        this.id = id;
-        this.name = name;
-        this.valueObj = valueObj;
-        this.sourceData = sourceData;
-        this.annotation = annotation;
-    }
-    getId() {
-        return this.id;
-    }
-    get value() {
-        if (this.valueObj === null) {
-            return 'null';
-        }
-        else if (Array.isArray(this.valueObj)) {
-            return `Array[${this.valueObj.length}]`;
-        }
-        else if (isObject(this.valueObj)) {
-            return 'Object';
-        }
-        else if (isString(this.valueObj)) {
-            return `"${this.valueObj}"`;
-        }
-        return String(this.valueObj) || '';
-    }
-    get hasChildren() {
-        return (Array.isArray(this.valueObj) && this.valueObj.length > 0) || (isObject(this.valueObj) && Object.getOwnPropertyNames(this.valueObj).length > 0);
-    }
-    evaluateLazy() {
-        throw new Error('Method not implemented.');
-    }
-    getChildren() {
-        let result = [];
-        if (Array.isArray(this.valueObj)) {
-            result = ( this.valueObj.slice(0, RawObjectReplElement.MAX_CHILDREN)
-                .map((v, index) => ( new RawObjectReplElement(`${this.id}:${index}`, String(index), v))));
-        }
-        else if (isObject(this.valueObj)) {
-            result = ( Object.getOwnPropertyNames(this.valueObj).slice(0, RawObjectReplElement.MAX_CHILDREN)
-                .map((key, index) => ( new RawObjectReplElement(`${this.id}:${index}`, key, this.valueObj[key]))));
-        }
-        return Promise.resolve(result);
-    }
-    toString() {
-        return `${this.name}\n${this.value}`;
-    }
-}
-class ReplEvaluationInput {
-    constructor(value) {
-        this.value = value;
-        this.id = generateUuid();
-    }
-    toString() {
-        return this.value;
-    }
-    getId() {
-        return this.id;
-    }
-}
-class ReplEvaluationResult extends ExpressionContainer {
-    get available() {
-        return this._available;
-    }
-    constructor(originalExpression) {
-        super(undefined, undefined, 0, generateUuid());
-        this.originalExpression = originalExpression;
-        this._available = true;
-    }
-    async evaluateExpression(expression, session, stackFrame, context) {
-        const result = await super.evaluateExpression(expression, session, stackFrame, context);
-        this._available = result;
-        return result;
-    }
-    toString() {
-        return `${this.value}`;
-    }
-}
-class ReplGroup {
-    static { this.COUNTER = 0; }
-    constructor(name, autoExpand, sourceData) {
-        this.name = name;
-        this.autoExpand = autoExpand;
-        this.sourceData = sourceData;
-        this.children = [];
-        this.ended = false;
-        this.id = `replGroup:${ReplGroup.COUNTER++}`;
-    }
-    get hasChildren() {
-        return true;
-    }
-    getId() {
-        return this.id;
-    }
-    toString(includeSource = false) {
-        const sourceStr = (includeSource && this.sourceData) ? ` ${this.sourceData.source.name}` : '';
-        return this.name + sourceStr;
-    }
-    addChild(child) {
-        const lastElement = this.children.length ? this.children[this.children.length - 1] : undefined;
-        if (lastElement instanceof ReplGroup && !lastElement.hasEnded) {
-            lastElement.addChild(child);
-        }
-        else {
-            this.children.push(child);
-        }
-    }
-    getChildren() {
-        return this.children;
-    }
-    end() {
-        const lastElement = this.children.length ? this.children[this.children.length - 1] : undefined;
-        if (lastElement instanceof ReplGroup && !lastElement.hasEnded) {
-            lastElement.end();
-        }
-        else {
-            this.ended = true;
-        }
-    }
-    get hasEnded() {
-        return this.ended;
-    }
-}
-function areSourcesEqual(first, second) {
-    if (!first && !second) {
-        return true;
-    }
-    if (first && second) {
-        return first.column === second.column && first.lineNumber === second.lineNumber && ( first.source.uri.toString()) === ( second.source.uri.toString());
-    }
-    return false;
-}
-class ReplModel {
-    constructor(configurationService) {
-        this.configurationService = configurationService;
-        this.replElements = [];
-        this._onDidChangeElements = ( new Emitter());
-        this.onDidChangeElements = this._onDidChangeElements.event;
-    }
-    getReplElements() {
-        return this.replElements;
-    }
-    async addReplExpression(session, stackFrame, name) {
-        this.addReplElement(( new ReplEvaluationInput(name)));
-        const result = ( new ReplEvaluationResult(name));
-        await result.evaluateExpression(name, session, stackFrame, 'repl');
-        this.addReplElement(result);
-    }
-    appendToRepl(session, { output, expression, sev, source }) {
-        const clearAnsiSequence = '\u001b[2J';
-        const clearAnsiIndex = output.lastIndexOf(clearAnsiSequence);
-        if (clearAnsiIndex !== -1) {
-            this.removeReplExpressions();
-            this.appendToRepl(session, { output: ( localizeWithPath(
-                'vs/workbench/contrib/debug/common/replModel',
-                'consoleCleared',
-                "Console was cleared"
-            )), sev: Severity.Ignore });
-            output = output.substring(clearAnsiIndex + clearAnsiSequence.length);
-        }
-        if (expression) {
-            this.addReplElement(output
-                ? ( new ReplOutputElement(session, getUniqueId(), output, sev, source, expression))
-                : ( new ReplVariableElement(expression, sev, source)));
-            return;
-        }
-        const previousElement = this.replElements.length ? this.replElements[this.replElements.length - 1] : undefined;
-        if (previousElement instanceof ReplOutputElement && previousElement.severity === sev) {
-            const config = this.configurationService.getValue('debug');
-            if (previousElement.value === output && areSourcesEqual(previousElement.sourceData, source) && config.console.collapseIdenticalLines) {
-                previousElement.count++;
-                return;
-            }
-            if (!previousElement.value.endsWith('\n') && !previousElement.value.endsWith('\r\n') && previousElement.count === 1) {
-                this.replElements[this.replElements.length - 1] = ( new ReplOutputElement(session, getUniqueId(), previousElement.value + output, sev, source));
-                this._onDidChangeElements.fire();
-                return;
-            }
-        }
-        const element = ( new ReplOutputElement(session, getUniqueId(), output, sev, source));
-        this.addReplElement(element);
-    }
-    startGroup(name, autoExpand, sourceData) {
-        const group = ( new ReplGroup(name, autoExpand, sourceData));
-        this.addReplElement(group);
-    }
-    endGroup() {
-        const lastElement = this.replElements[this.replElements.length - 1];
-        if (lastElement instanceof ReplGroup) {
-            lastElement.end();
-        }
-    }
-    addReplElement(newElement) {
-        const lastElement = this.replElements.length ? this.replElements[this.replElements.length - 1] : undefined;
-        if (lastElement instanceof ReplGroup && !lastElement.hasEnded) {
-            lastElement.addChild(newElement);
-        }
-        else {
-            this.replElements.push(newElement);
-            if (this.replElements.length > MAX_REPL_LENGTH) {
-                this.replElements.splice(0, this.replElements.length - MAX_REPL_LENGTH);
-            }
-        }
-        this._onDidChangeElements.fire();
-    }
-    removeReplExpressions() {
-        if (this.replElements.length > 0) {
-            this.replElements = [];
-            this._onDidChangeElements.fire();
-        }
-    }
-    clone() {
-        const newRepl = ( new ReplModel(this.configurationService));
-        newRepl.replElements = this.replElements.slice();
-        return newRepl;
-    }
-}
-
-export { RawObjectReplElement, ReplEvaluationInput, ReplEvaluationResult, ReplGroup, ReplModel, ReplOutputElement, ReplVariableElement };