@codingame/monaco-vscode-debug-service-override 4.5.1 → 4.5.2

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

@@ -14,20 +14,21 @@ import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.s
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { getWindow } from 'vscode/vscode/vs/base/browser/dom';
 
+const _moduleId = "vs/workbench/contrib/debug/browser/linkDetector";
 const CONTROL_CODES = '\\u0000-\\u0020\\u007f-\\u009f';
-const WEB_LINK_REGEX = ( new RegExp(
+const WEB_LINK_REGEX = ( (new RegExp(
     '(?:[a-zA-Z][a-zA-Z0-9+.-]{2,}:\\/\\/|data:|www\\.)[^\\s' + CONTROL_CODES + '"]{2,}[^\\s' + CONTROL_CODES + '"\')}\\],:;.!?]',
     'ug'
-));
+)));
 const WIN_ABSOLUTE_PATH = /(?:[a-zA-Z]:(?:(?:\\|\/)[\w\.-]*)+)/;
 const WIN_RELATIVE_PATH = /(?:(?:\~|\.)(?:(?:\\|\/)[\w\.-]*)+)/;
-const WIN_PATH = ( new RegExp(`(${WIN_ABSOLUTE_PATH.source}|${WIN_RELATIVE_PATH.source})`));
+const WIN_PATH = ( (new RegExp(`(${WIN_ABSOLUTE_PATH.source}|${WIN_RELATIVE_PATH.source})`)));
 const POSIX_PATH = /((?:\~|\.)?(?:\/[\w\.-]*)+)/;
 const LINE_COLUMN = /(?:\:([\d]+))?(?:\:([\d]+))?/;
-const PATH_LINK_REGEX = ( new RegExp(
+const PATH_LINK_REGEX = ( (new RegExp(
     `${isWindows ? WIN_PATH.source : POSIX_PATH.source}${LINE_COLUMN.source}`,
     'g'
-));
+)));
 const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
 const MAX_LENGTH = 2000;
 let LinkDetector = class LinkDetector {
@@ -49,7 +50,7 @@ let LinkDetector = class LinkDetector {
             if (!lines[lines.length - 1]) {
                 lines.pop();
             }
-            const elements = ( lines.map(line => this.linkify(line, false, workspaceFolder, includeFulltext)));
+            const elements = ( (lines.map(line => this.linkify(line, false, workspaceFolder, includeFulltext))));
             if (elements.length === 1) {
                 return elements[0];
             }
@@ -84,7 +85,7 @@ let LinkDetector = class LinkDetector {
     }
     createWebLink(fulltext, url) {
         const link = this.createLink(url);
-        let uri = ( URI.parse(url));
+        let uri = ( (URI.parse(url)));
         const lineCol = LINE_COLUMN_REGEX.exec(uri.path);
         if (lineCol) {
             uri = uri.with({
@@ -97,7 +98,7 @@ let LinkDetector = class LinkDetector {
                 const fsPath = uri.fsPath;
                 const path = await this.pathService.path;
                 const fileUrl = normalize(((path.sep === posix.sep) && isWindows) ? fsPath.replace(/\\/g, posix.sep) : fsPath);
-                const fileUri = ( URI.parse(fileUrl));
+                const fileUri = ( (URI.parse(fileUrl)));
                 const exists = await this.fileService.exists(fileUri);
                 if (!exists) {
                     return;
@@ -154,40 +155,10 @@ let LinkDetector = class LinkDetector {
     }
     decorateLink(link, uri, fulltext, onClick) {
         link.classList.add('link');
-        const followLink = this.tunnelService.canTunnel(uri) ? ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'followForwardedLink',
-            "follow link using forwarded port"
-        )) : ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'followLink',
-            "follow link"
-        ));
+        const followLink = this.tunnelService.canTunnel(uri) ? ( localizeWithPath(_moduleId, 0, "follow link using forwarded port")) : ( localizeWithPath(_moduleId, 1, "follow link"));
         link.title = fulltext
-            ? (isMacintosh ? ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'fileLinkWithPathMac',
-            "Cmd + click to {0}\n{1}",
-            followLink,
-            fulltext
-        )) : ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'fileLinkWithPath',
-            "Ctrl + click to {0}\n{1}",
-            followLink,
-            fulltext
-        )))
-            : (isMacintosh ? ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'fileLinkMac',
-            "Cmd + click to {0}",
-            followLink
-        )) : ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/linkDetector',
-            'fileLink',
-            "Ctrl + click to {0}",
-            followLink
-        )));
+            ? (isMacintosh ? ( localizeWithPath(_moduleId, 2, "Cmd + click to {0}\n{1}", followLink, fulltext)) : ( localizeWithPath(_moduleId, 3, "Ctrl + click to {0}\n{1}", followLink, fulltext)))
+            : (isMacintosh ? ( localizeWithPath(_moduleId, 4, "Cmd + click to {0}", followLink)) : ( localizeWithPath(_moduleId, 5, "Ctrl + click to {0}", followLink)));
         link.onmousemove = (event) => { link.classList.toggle('pointer', isMacintosh ? event.metaKey : event.ctrlKey); };
         link.onmouseleave = () => link.classList.remove('pointer');
         link.onclick = (event) => {
@@ -203,7 +174,7 @@ let LinkDetector = class LinkDetector {
             onClick(false);
         };
         link.onkeydown = e => {
-            const event = ( new StandardKeyboardEvent(e));
+            const event = ( (new StandardKeyboardEvent(e)));
             if (event.keyCode === 3  || event.keyCode === 10 ) {
                 event.preventDefault();
                 event.stopPropagation();
@@ -249,14 +220,14 @@ let LinkDetector = class LinkDetector {
         return result;
     }
 };
-LinkDetector = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IFileService)),
-    ( __param(2, IOpenerService)),
-    ( __param(3, IPathService)),
-    ( __param(4, ITunnelService)),
-    ( __param(5, IWorkbenchEnvironmentService)),
-    ( __param(6, IConfigurationService))
-], LinkDetector));
+LinkDetector = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, IFileService))),
+    ( (__param(2, IOpenerService))),
+    ( (__param(3, IPathService))),
+    ( (__param(4, ITunnelService))),
+    ( (__param(5, IWorkbenchEnvironmentService))),
+    ( (__param(6, IConfigurationService)))
+], LinkDetector)));
 
 export { LinkDetector };

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

@@ -34,6 +34,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { TreeFindMode } from 'vscode/vscode/vs/base/browser/ui/tree/abstractTree';
 
+const _moduleId = "vs/workbench/contrib/debug/browser/loadedScriptsView";
 const NEW_STYLE_COMPRESS = true;
 const URI_SCHEMA_PATTERN = /^[a-zA-Z][a-zA-Z0-9\+\-\.]+:/;
 class BaseTreeItem {
@@ -41,7 +42,7 @@ class BaseTreeItem {
         this._parent = _parent;
         this._label = _label;
         this.isIncompressible = isIncompressible;
-        this._children = ( new Map());
+        this._children = ( (new Map()));
         this._showedMoreThanOne = false;
     }
     updateLabel(label) {
@@ -62,7 +63,7 @@ class BaseTreeItem {
         if (source.raw && source.raw.sources) {
             for (const src of source.raw.sources) {
                 if (src.name && src.path) {
-                    const s = ( new BaseTreeItem(this, src.name));
+                    const s = ( (new BaseTreeItem(this, src.name)));
                     this._children.set(src.path, s);
                     const ss = session.getSource(src);
                     s.setSource(session, ss);
@@ -133,7 +134,7 @@ class BaseTreeItem {
             return child.getChildren();
         }
         const array = [];
-        for (const child of ( this._children.values())) {
+        for (const child of ( (this._children.values()))) {
             array.push(child);
         }
         return array.sort((a, b) => this.compare(a, b));
@@ -176,7 +177,7 @@ class BaseTreeItem {
     oneChild() {
         if (!this._source && !this._showedMoreThanOne && this.skipOneChild()) {
             if (this._children.size === 1) {
-                return ( this._children.values()).next().value;
+                return ( (this._children.values())).next().value;
             }
             if (this._children.size > 1) {
                 this._showedMoreThanOne = true;
@@ -204,7 +205,7 @@ class RootTreeItem extends BaseTreeItem {
         this._labelService = _labelService;
     }
     add(session) {
-        return this.createIfNeeded(session.getId(), () => ( new SessionTreeItem(this._labelService, this, session, this._pathService, this._contextService)));
+        return this.createIfNeeded(session.getId(), () => ( (new SessionTreeItem(this._labelService, this, session, this._pathService, this._contextService))));
     }
     find(session) {
         return this.getChild(session.getId());
@@ -216,7 +217,7 @@ class SessionTreeItem extends BaseTreeItem {
         super(parent, session.getLabel(), true);
         this._pathService = _pathService;
         this.rootProvider = rootProvider;
-        this._map = ( new Map());
+        this._map = ( (new Map()));
         this._labelService = labelService;
         this._session = session;
     }
@@ -258,7 +259,7 @@ class SessionTreeItem extends BaseTreeItem {
             return;
         }
         if (this._labelService && URI_SCHEMA_PATTERN.test(path)) {
-            path = this._labelService.getUriLabel(( URI.parse(path)));
+            path = this._labelService.getUriLabel(( (URI.parse(path))));
         }
         const match = SessionTreeItem.URL_REGEXP.exec(path);
         if (match && match.length === 3) {
@@ -294,13 +295,13 @@ class SessionTreeItem extends BaseTreeItem {
         path.split(/[\/\\]/).forEach((segment, i) => {
             if (i === 0 && folder) {
                 const f = folder;
-                leaf = leaf.createIfNeeded(folder.name, parent => ( new RootFolderTreeItem(parent, f)));
+                leaf = leaf.createIfNeeded(folder.name, parent => ( (new RootFolderTreeItem(parent, f))));
             }
             else if (i === 0 && url) {
-                leaf = leaf.createIfNeeded(url, parent => ( new BaseTreeItem(parent, url)));
+                leaf = leaf.createIfNeeded(url, parent => ( (new BaseTreeItem(parent, url))));
             }
             else {
-                leaf = leaf.createIfNeeded(segment, parent => ( new BaseTreeItem(parent, segment)));
+                leaf = leaf.createIfNeeded(segment, parent => ( (new BaseTreeItem(parent, segment))));
             }
         });
         leaf.setSource(this._session, source);
@@ -321,12 +322,12 @@ class SessionTreeItem extends BaseTreeItem {
 }
 function asTreeElement(item, viewState) {
     const children = item.getChildren();
-    const collapsed = viewState ? !( viewState.expanded.has(item.getId())) : !(item instanceof SessionTreeItem);
+    const collapsed = viewState ? !( (viewState.expanded.has(item.getId()))) : !(item instanceof SessionTreeItem);
     return {
         element: item,
         collapsed,
         collapsible: item.hasChildren(),
-        children: ( children.map(i => asTreeElement(i, viewState)))
+        children: ( (children.map(i => asTreeElement(i, viewState))))
     };
 }
 let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
@@ -346,11 +347,11 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
         container.classList.add('debug-loaded-scripts');
         container.classList.add('show-file-icons');
         this.treeContainer = renderViewTree(container);
-        this.filter = ( new LoadedScriptsFilter());
-        const root = ( new RootTreeItem(this.pathService, this.contextService, this.labelService));
+        this.filter = ( (new LoadedScriptsFilter()));
+        const root = ( (new RootTreeItem(this.pathService, this.contextService, this.labelService)));
         this.treeLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
         this._register(this.treeLabels);
-        this.tree = this.instantiationService.createInstance(WorkbenchCompressibleObjectTree, 'LoadedScriptsView', this.treeContainer, ( new LoadedScriptsDelegate()), [( new LoadedScriptsRenderer(this.treeLabels))], {
+        this.tree = this.instantiationService.createInstance(WorkbenchCompressibleObjectTree, 'LoadedScriptsView', this.treeContainer, ( (new LoadedScriptsDelegate())), [( (new LoadedScriptsRenderer(this.treeLabels)))], {
             compressionEnabled: NEW_STYLE_COMPRESS,
             collapseByDefault: true,
             hideTwistiesOfChildlessElements: true,
@@ -362,23 +363,23 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
                     return element.getLabel();
                 },
                 getCompressedNodeKeyboardNavigationLabel: (elements) => {
-                    return ( elements.map(e => e.getLabel())).join('/');
+                    return ( (elements.map(e => e.getLabel()))).join('/');
                 }
             },
             filter: this.filter,
-            accessibilityProvider: ( new LoadedSciptsAccessibilityProvider()),
+            accessibilityProvider: ( (new LoadedSciptsAccessibilityProvider())),
             overrideStyles: {
                 listBackground: this.getBackgroundColor()
             }
         });
         const updateView = (viewState) => this.tree.setChildren(null, asTreeElement(root, viewState).children);
         updateView();
-        this.changeScheduler = ( new RunOnceScheduler(() => {
+        this.changeScheduler = ( (new RunOnceScheduler(() => {
             this.treeNeedsRefreshOnVisible = false;
             if (this.tree) {
                 updateView();
             }
-        }, 300));
+        }, 300)));
         this._register(this.changeScheduler);
         this._register(this.tree.onDidOpen(e => {
             if (e.element instanceof BaseTreeItem) {
@@ -467,7 +468,7 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
                 return;
             }
             if (!viewState && pattern) {
-                const expanded = ( new Set());
+                const expanded = ( (new Set()));
                 const visit = (node) => {
                     if (node.element && !node.collapsed) {
                         expanded.add(node.element.getId());
@@ -501,22 +502,22 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
         super.dispose();
     }
 };
-LoadedScriptsView = ( __decorate([
-    ( __param(1, IContextMenuService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IViewDescriptorService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IEditorService)),
-    ( __param(7, IContextKeyService)),
-    ( __param(8, IWorkspaceContextService)),
-    ( __param(9, IDebugService)),
-    ( __param(10, ILabelService)),
-    ( __param(11, IPathService)),
-    ( __param(12, IOpenerService)),
-    ( __param(13, IThemeService)),
-    ( __param(14, ITelemetryService))
-], LoadedScriptsView));
+LoadedScriptsView = ( (__decorate([
+    ( (__param(1, IContextMenuService))),
+    ( (__param(2, IKeybindingService))),
+    ( (__param(3, IInstantiationService))),
+    ( (__param(4, IViewDescriptorService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IEditorService))),
+    ( (__param(7, IContextKeyService))),
+    ( (__param(8, IWorkspaceContextService))),
+    ( (__param(9, IDebugService))),
+    ( (__param(10, ILabelService))),
+    ( (__param(11, IPathService))),
+    ( (__param(12, IOpenerService))),
+    ( (__param(13, IThemeService))),
+    ( (__param(14, ITelemetryService)))
+], LoadedScriptsView)));
 class LoadedScriptsDelegate {
     getHeight(element) {
         return 22;
@@ -544,7 +545,7 @@ class LoadedScriptsRenderer {
     }
     renderCompressedElements(node, index, data, height) {
         const element = node.element.elements[node.element.elements.length - 1];
-        const labels = ( node.element.elements.map(e => e.getLabel()));
+        const labels = ( (node.element.elements.map(e => e.getLabel())));
         this.render(element, labels, data, node.filterData);
     }
     render(element, labels, data, filterData) {
@@ -558,11 +559,7 @@ class LoadedScriptsRenderer {
             options.fileKind = FileKind.ROOT_FOLDER;
         }
         else if (element instanceof SessionTreeItem) {
-            options.title = ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'loadedScriptsSession',
-                "Debug Session"
-            ));
+            options.title = ( localizeWithPath(_moduleId, 0, "Debug Session"));
             options.hideIcon = true;
         }
         else if (element instanceof BaseTreeItem) {
@@ -584,44 +581,25 @@ class LoadedScriptsRenderer {
 }
 class LoadedSciptsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/loadedScriptsView',
-            { comment: ['Debug is a noun in this context, not a verb.'], key: 'loadedScriptsAriaLabel' },
-            "Debug Loaded Scripts"
-        ));
+        return ( localizeWithPath(_moduleId, 1, "Debug Loaded Scripts"));
     }
     getAriaLabel(element) {
         if (element instanceof RootFolderTreeItem) {
             return ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'loadedScriptsRootFolderAriaLabel',
+                _moduleId,
+                2,
                 "Workspace folder {0}, loaded script, debug",
                 element.getLabel()
             ));
         }
         if (element instanceof SessionTreeItem) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'loadedScriptsSessionAriaLabel',
-                "Session {0}, loaded script, debug",
-                element.getLabel()
-            ));
+            return ( localizeWithPath(_moduleId, 3, "Session {0}, loaded script, debug", element.getLabel()));
         }
         if (element.hasChildren()) {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'loadedScriptsFolderAriaLabel',
-                "Folder {0}, loaded script, debug",
-                element.getLabel()
-            ));
+            return ( localizeWithPath(_moduleId, 4, "Folder {0}, loaded script, debug", element.getLabel()));
         }
         else {
-            return ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'loadedScriptsSourceAriaLabel',
-                "{0}, loaded script, debug",
-                element.getLabel()
-            ));
+            return ( localizeWithPath(_moduleId, 5, "{0}, loaded script, debug", element.getLabel()));
         }
     }
 }
@@ -648,18 +626,14 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'loadedScripts.collapse',
             viewId: LOADED_SCRIPTS_VIEW_ID,
-            title: ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/loadedScriptsView',
-                'collapse',
-                "Collapse All"
-            )),
+            title: ( localizeWithPath(_moduleId, 6, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {
                 id: MenuId.ViewTitle,
                 order: 30,
                 group: 'navigation',
-                when: ( ContextKeyExpr.equals('view', LOADED_SCRIPTS_VIEW_ID))
+                when: ( (ContextKeyExpr.equals('view', LOADED_SCRIPTS_VIEW_ID)))
             }
         });
     }