diff --git a/package.json b/package.json index 70614a6bf86ed363e51c0bc2e38bcfacfba26741..141e2a5190402647d1f645e41ba07cb49ac919c8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.50.0", - "distro": "fd69c0b76c1d86e5ea0c8651f87571091fab2c22", + "distro": "74839100ca6a8d7b83f72f92b9de6937e7959849", "author": { "name": "Microsoft Corporation" }, @@ -71,10 +71,10 @@ "vscode-ripgrep": "^1.9.0", "vscode-sqlite3": "4.0.10", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.32", - "xterm-addon-search": "0.7.0", - "xterm-addon-unicode11": "0.2.0", - "xterm-addon-webgl": "0.9.0-beta.4", + "xterm": "4.10.0-beta.4", + "xterm-addon-search": "0.8.0-beta.3", + "xterm-addon-unicode11": "0.3.0-beta.3", + "xterm-addon-webgl": "0.10.0-beta.1", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, @@ -193,4 +193,4 @@ "windows-mutex": "0.3.0", "windows-process-tree": "0.2.4" } -} \ No newline at end of file +} diff --git a/product.json b/product.json index 4e8daa88fbe0b8a850764de49114dcfb6dba10c4..d4e830aada9396786e91c793179baae2fc914e20 100644 --- a/product.json +++ b/product.json @@ -91,7 +91,7 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.49.7", + "version": "1.49.8", "repo": "https://github.com/Microsoft/vscode-js-debug", "metadata": { "id": "25629058-ddac-4e17-abba-74678e126c5d", diff --git a/remote/package.json b/remote/package.json index 0a7b6f7e0a1d1bfeadfaa0d750410b38f50ed6de..bed90d1e4fdaae2a508fa7236c9b178b1e1e4733 100644 --- a/remote/package.json +++ b/remote/package.json @@ -20,10 +20,10 @@ "vscode-proxy-agent": "^0.5.2", "vscode-ripgrep": "^1.9.0", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.32", - "xterm-addon-search": "0.7.0", - "xterm-addon-unicode11": "0.2.0", - "xterm-addon-webgl": "0.9.0-beta.4", + "xterm": "4.10.0-beta.4", + "xterm-addon-search": "0.8.0-beta.3", + "xterm-addon-unicode11": "0.3.0-beta.3", + "xterm-addon-webgl": "0.10.0-beta.1", "yauzl": "^2.9.2", "yazl": "^2.4.3" }, diff --git a/remote/web/package.json b/remote/web/package.json index 9db946c5bbb677e2071a4540035605a6940fd30f..4b7583d16f4a37f435b03eead5835187f4d33d76 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -7,9 +7,9 @@ "semver-umd": "^5.5.7", "vscode-oniguruma": "1.3.1", "vscode-textmate": "5.2.0", - "xterm": "4.9.0-beta.32", - "xterm-addon-search": "0.7.0", - "xterm-addon-unicode11": "0.2.0", - "xterm-addon-webgl": "0.9.0-beta.4" + "xterm": "4.10.0-beta.4", + "xterm-addon-search": "0.8.0-beta.3", + "xterm-addon-unicode11": "0.3.0-beta.3", + "xterm-addon-webgl": "0.10.0-beta.1" } } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 400d4d629c45f50c27e71bd6bb009ed1315fd110..290b21742a13814aec330f715b723077c886b884 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -27,22 +27,22 @@ vscode-textmate@5.2.0: resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== -xterm-addon-search@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0.tgz#c929d3e5cbb335e82bff72f158ea82936d9cd4ef" - integrity sha512-6060evmJJ+tZcjnx33FXaeEHLpuXEa7l9UzUsYfMlCKbu88AbE+5LJocTKCHYd71cwCwb9pjmv/G1o9Rf9Zbcg== - -xterm-addon-unicode11@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c" - integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q== - -xterm-addon-webgl@0.9.0-beta.4: - version "0.9.0-beta.4" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.9.0-beta.4.tgz#5f5fde50db5c06b116471bcf56ad9930884b36fa" - integrity sha512-GuCvF7Eg1nKLX6zUbJLkt5cqeeccUjf/G6fugCfrkR0EWWC6Ik5mEsEOs5UWm9vvY2kX9t16BdCrgqp8KJegEg== - -xterm@4.9.0-beta.32: - version "4.9.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.32.tgz#d1243d3be211cc06aad3418e696e4eced995c20c" - integrity sha512-jloHNBnj6XRJt+oPkapvrXJZVsYq6se/PEgzErl0iZn9qzSB3jmWE4byumoEjXJR6EgU5ZOmNljeeEDA9jO/jA== +xterm-addon-search@0.8.0-beta.3: + version "0.8.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0-beta.3.tgz#c6c7e36a03706bd43d8bba383511acf9e435aed0" + integrity sha512-EZP97KJIJ4KGQaOPYiiOaRRJst6LOgeEFoQL46WcBl5EWH9pH8qfrv0BHAJ8+6nBV2B9u5M6rzxO1GvLLec19w== + +xterm-addon-unicode11@0.3.0-beta.3: + version "0.3.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.3.tgz#70af2dfb67809258edb62c19e2861f7ce5ccf5cd" + integrity sha512-vaYopnOjn19wCLDCyIWPWLwKR7CvLPxB5YZ3CAxt9qL05o3symxIJJJC0DuCa4GaGKVjNc7EmjRCs5bsJ2O1tw== + +xterm-addon-webgl@0.10.0-beta.1: + version "0.10.0-beta.1" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e" + integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q== + +xterm@4.10.0-beta.4: + version "4.10.0-beta.4" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e" + integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA== diff --git a/remote/yarn.lock b/remote/yarn.lock index c5f19e6bbc928e9bc2f4ae32c06240214dd0c3e3..ade6bb557a4763827e8c48d762ca5abdb659b4e6 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -435,25 +435,25 @@ vscode-windows-registry@1.0.2: resolved "https://registry.yarnpkg.com/vscode-windows-registry/-/vscode-windows-registry-1.0.2.tgz#b863e704a6a69c50b3098a55fbddbe595b0c124a" integrity sha512-/CLLvuOSM2Vme2z6aNyB+4Omd7hDxpf4Thrt8ImxnXeQtxzel2bClJpFQvQqK/s4oaXlkBKS7LqVLeZM+uSVIA== -xterm-addon-search@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0.tgz#c929d3e5cbb335e82bff72f158ea82936d9cd4ef" - integrity sha512-6060evmJJ+tZcjnx33FXaeEHLpuXEa7l9UzUsYfMlCKbu88AbE+5LJocTKCHYd71cwCwb9pjmv/G1o9Rf9Zbcg== - -xterm-addon-unicode11@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c" - integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q== - -xterm-addon-webgl@0.9.0-beta.4: - version "0.9.0-beta.4" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.9.0-beta.4.tgz#5f5fde50db5c06b116471bcf56ad9930884b36fa" - integrity sha512-GuCvF7Eg1nKLX6zUbJLkt5cqeeccUjf/G6fugCfrkR0EWWC6Ik5mEsEOs5UWm9vvY2kX9t16BdCrgqp8KJegEg== - -xterm@4.9.0-beta.32: - version "4.9.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.32.tgz#d1243d3be211cc06aad3418e696e4eced995c20c" - integrity sha512-jloHNBnj6XRJt+oPkapvrXJZVsYq6se/PEgzErl0iZn9qzSB3jmWE4byumoEjXJR6EgU5ZOmNljeeEDA9jO/jA== +xterm-addon-search@0.8.0-beta.3: + version "0.8.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0-beta.3.tgz#c6c7e36a03706bd43d8bba383511acf9e435aed0" + integrity sha512-EZP97KJIJ4KGQaOPYiiOaRRJst6LOgeEFoQL46WcBl5EWH9pH8qfrv0BHAJ8+6nBV2B9u5M6rzxO1GvLLec19w== + +xterm-addon-unicode11@0.3.0-beta.3: + version "0.3.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.3.tgz#70af2dfb67809258edb62c19e2861f7ce5ccf5cd" + integrity sha512-vaYopnOjn19wCLDCyIWPWLwKR7CvLPxB5YZ3CAxt9qL05o3symxIJJJC0DuCa4GaGKVjNc7EmjRCs5bsJ2O1tw== + +xterm-addon-webgl@0.10.0-beta.1: + version "0.10.0-beta.1" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e" + integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q== + +xterm@4.10.0-beta.4: + version "4.10.0-beta.4" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e" + integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA== yauzl@^2.9.2: version "2.10.0" diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts index ffb71d9aec7f158b0e4d1df1a4208d53ebd00b23..99fb573fc5296052b40d21f2ca877889f08f5e71 100644 --- a/src/vs/base/common/objects.ts +++ b/src/vs/base/common/objects.ts @@ -113,18 +113,6 @@ export function mixin(destination: any, source: any, overwrite: boolean = true): return destination; } -/** - * @deprecated ES6 - */ -export function assign(destination: T): T; -export function assign(destination: T, u: U): T & U; -export function assign(destination: T, u: U, v: V): T & U & V; -export function assign(destination: T, u: U, v: V, w: W): T & U & V & W; -export function assign(destination: any, ...sources: any[]): any { - sources.forEach(source => Object.keys(source).forEach(key => destination[key] = source[key])); - return destination; -} - export function equals(one: any, other: any): boolean { if (one === other) { return true; diff --git a/src/vs/base/parts/quickinput/browser/quickInputList.ts b/src/vs/base/parts/quickinput/browser/quickInputList.ts index 7c98a6bd880273ceb14ce404726910a1e6e0831f..3024052c6c7ba21da76b78f5c017e787239f1f98 100644 --- a/src/vs/base/parts/quickinput/browser/quickInputList.ts +++ b/src/vs/base/parts/quickinput/browser/quickInputList.ts @@ -12,7 +12,6 @@ import { IMatch } from 'vs/base/common/filters'; import { matchesFuzzyCodiconAware, parseCodicons } from 'vs/base/common/codicon'; import { compareAnything } from 'vs/base/common/comparers'; import { Emitter, Event } from 'vs/base/common/event'; -import { assign } from 'vs/base/common/objects'; import { KeyCode } from 'vs/base/common/keyCodes'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel'; @@ -73,7 +72,7 @@ class ListElement implements IListElement, IDisposable { fireButtonTriggered!: (event: IQuickPickItemButtonEvent) => void; constructor(init: IListElement) { - assign(this, init); + Object.assign(this, init); } dispose() { diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index 817951f6be532d04bd3c5cd18f875814d0085e51..8a447859fb00f2c2008f8607ece466e3dcfc9a96 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -6,7 +6,6 @@ import { localize } from 'vs/nls'; import * as os from 'os'; import product from 'vs/platform/product/common/product'; -import * as objects from 'vs/base/common/objects'; import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv'; import { ICommonIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue'; import { BrowserWindow, ipcMain, screen, IpcMainEvent, Display, shell } from 'electron'; @@ -442,7 +441,7 @@ export class IssueMainService implements ICommonIssueService { function toLauchUrl(pathToHtml: string, windowConfiguration: T): string { const environment = parseArgs(process.argv, OPTIONS); - const config = objects.assign(environment, windowConfiguration); + const config = Object.assign(environment, windowConfiguration); for (const keyValue of Object.keys(config)) { const key = keyValue as keyof typeof config; if (config[key] === undefined || config[key] === null || config[key] === '') { diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index ecb3c0d89f429cdaaa560bb117d2e0e2c62d85b5..10e23905a66be08467a468781e4e62d46f6eda92 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -2255,5 +2255,17 @@ declare module 'vscode' { } + //#endregion + + //#region https://github.com/microsoft/vscode/issues/105667 + + export interface TreeView { + /** + * An optional human-readable description that will be rendered in the title of the view. + * Setting the title description to null, undefined, or empty string will remove the title description from the view. + */ + description?: string | undefined; + } + //#endregion } diff --git a/src/vs/workbench/api/browser/mainThreadTreeViews.ts b/src/vs/workbench/api/browser/mainThreadTreeViews.ts index 3d62a4a9e89c60f2fa5f7db1c4f28c61d9a5c61f..7d0d71cc4f3e1784d94dbe525954a68986332835 100644 --- a/src/vs/workbench/api/browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/browser/mainThreadTreeViews.ts @@ -86,12 +86,13 @@ export class MainThreadTreeViews extends Disposable implements MainThreadTreeVie } } - $setTitle(treeViewId: string, title: string): void { - this.logService.trace('MainThreadTreeViews#$setTitle', treeViewId, title); + $setTitle(treeViewId: string, title: string, description: string | undefined): void { + this.logService.trace('MainThreadTreeViews#$setTitle', treeViewId, title, description); const viewer = this.getTreeView(treeViewId); if (viewer) { viewer.title = title; + viewer.description = description; } } diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index b6d085fc7ad0809d0ae88db66cf8e9629c36d4c7..c42c42c29b29f5ee730779ca7a40107ec2f332f8 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -288,7 +288,7 @@ export interface MainThreadTreeViewsShape extends IDisposable { $refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem; }): Promise; $reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options: IRevealOptions): Promise; $setMessage(treeViewId: string, message: string): void; - $setTitle(treeViewId: string, title: string): void; + $setTitle(treeViewId: string, title: string, description: string | undefined): void; } export interface MainThreadDownloadServiceShape extends IDisposable { diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts index 8621743e70652d1cd875314a56dc6dc1f1870d66..d2c4104555319537eff4cab94f3879c36ea9838b 100644 --- a/src/vs/workbench/api/common/extHostTreeViews.ts +++ b/src/vs/workbench/api/common/extHostTreeViews.ts @@ -101,6 +101,14 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape { set title(title: string) { treeView.title = title; }, + get description() { + checkProposedApiEnabled(extension); + return treeView.description; + }, + set description(description: string | undefined) { + checkProposedApiEnabled(extension); + treeView.description = description; + }, reveal: (element: T, options?: IRevealOptions): Promise => { return treeView.reveal(element, options); }, @@ -318,7 +326,17 @@ class ExtHostTreeView extends Disposable { set title(title: string) { this._title = title; - this.proxy.$setTitle(this.viewId, title); + this.proxy.$setTitle(this.viewId, title, this._description); + } + + private _description: string | undefined; + get description(): string | undefined { + return this._description; + } + + set description(description: string | undefined) { + this._description = description; + this.proxy.$setTitle(this.viewId, this._title, description); } setExpanded(treeItemHandle: TreeItemHandle, expanded: boolean): void { diff --git a/src/vs/workbench/api/common/extHostWebviewView.ts b/src/vs/workbench/api/common/extHostWebviewView.ts index 5122096832e38540fee106632e8fd50c167f9747..9cbff1880d575978000ff44b46ccef2e6580472f 100644 --- a/src/vs/workbench/api/common/extHostWebviewView.ts +++ b/src/vs/workbench/api/common/extHostWebviewView.ts @@ -93,7 +93,7 @@ class ExtHostWebviewView extends Disposable implements vscode.WebviewView { public get viewType(): string { return this.#viewType; } /* internal */ _setVisible(visible: boolean) { - if (visible === this.#isVisible) { + if (visible === this.#isVisible || this.#isDisposed) { return; } diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 6077addea8313d0868c013ce87962bf0af32f453..ebe6736547c8fc949d77f82fbdfaac2fb06e075d 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -39,6 +39,7 @@ export class TreeViewPane extends ViewPane { this.treeView = treeView; this._register(this.treeView.onDidChangeActions(() => this.updateActions(), this)); this._register(this.treeView.onDidChangeTitle((newTitle) => this.updateTitle(newTitle))); + this._register(this.treeView.onDidChangeDescription((newDescription) => this.updateTitleDescription(newDescription))); this._register(toDisposable(() => this.treeView.setVisibility(false))); this._register(this.onDidChangeBodyVisibility(() => this.updateTreeVisibility())); this._register(this.treeView.onDidChangeWelcomeState(() => this._onDidChangeViewWelcomeState.fire())); diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index e50bd99f31395d260522569d3c9449ad7d33f86c..09ba0837b60ef7b91bc43c25345cdfcdaf8067ae 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -554,6 +554,8 @@ export interface ITreeView extends IDisposable { title: string; + description: string | undefined; + readonly visible: boolean; readonly onDidExpandItem: Event; @@ -568,6 +570,8 @@ export interface ITreeView extends IDisposable { readonly onDidChangeTitle: Event; + readonly onDidChangeDescription: Event; + readonly onDidChangeWelcomeState: Event; refresh(treeItems?: ITreeItem[]): Promise; diff --git a/src/vs/workbench/contrib/comments/browser/commentService.ts b/src/vs/workbench/contrib/comments/browser/commentService.ts index 0312fdba5dfd2f17f3f2b5425509d920ac9fdcbf..db307119e37c54f5a1c0aaf1defbd5752cfb8f49 100644 --- a/src/vs/workbench/contrib/comments/browser/commentService.ts +++ b/src/vs/workbench/contrib/comments/browser/commentService.ts @@ -10,7 +10,6 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { Range, IRange } from 'vs/editor/common/core/range'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { assign } from 'vs/base/common/objects'; import { ICommentThreadChangedEvent } from 'vs/workbench/contrib/comments/common/commentModel'; import { MainThreadCommentController } from 'vs/workbench/api/browser/mainThreadComments'; import { CommentMenus } from 'vs/workbench/contrib/comments/browser/commentMenus'; @@ -166,7 +165,7 @@ export class CommentService extends Disposable implements ICommentService { } updateComments(ownerId: string, event: CommentThreadChangedEvent): void { - const evt: ICommentThreadChangedEvent = assign({}, event, { owner: ownerId }); + const evt: ICommentThreadChangedEvent = Object.assign({}, event, { owner: ownerId }); this._onDidUpdateCommentThreads.fire(evt); } diff --git a/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts b/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts index a69f5495dc41e1bdd6c02574478f6260d0ef6b19..2990fcce10fa2973c7915f6e7c4192d77aeacc70 100644 --- a/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts +++ b/src/vs/workbench/contrib/experiments/test/electron-browser/experimentService.test.ts @@ -22,7 +22,6 @@ import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtil import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; -import { assign } from 'vs/base/common/objects'; import { URI } from 'vs/base/common/uri'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; @@ -46,8 +45,8 @@ let experimentData: { [i: string]: any; } = { const local = aLocalExtension('installedExtension1', { version: '1.0.0' }); function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension { - manifest = assign({ name, publisher: 'pub', version: '1.0.0' }, manifest); - properties = assign({ + manifest = Object.assign({ name, publisher: 'pub', version: '1.0.0' }, manifest); + properties = Object.assign({ type: ExtensionType.User, location: URI.file(`pub.${name}`), identifier: { id: getGalleryExtensionId(manifest.publisher, manifest.name), uuid: undefined }, diff --git a/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts b/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts index 42dba3506e569ed825b944015cd8c61d36ac934a..9a55ddd4e97a1b12f57955bf8c43cd08ccf085af 100644 --- a/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts +++ b/src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts @@ -9,7 +9,6 @@ import * as processes from 'vs/base/node/processes'; import * as nls from 'vs/nls'; import * as pfs from 'vs/base/node/pfs'; import * as env from 'vs/base/common/platform'; -import { assign } from 'vs/base/common/objects'; import { IExternalTerminalService, IExternalTerminalConfiguration, IExternalTerminalSettings } from 'vs/workbench/contrib/externalTerminal/common/externalTerminal'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { getPathFromAmdModule } from 'vs/base/common/amd'; @@ -49,7 +48,7 @@ export class WindowsExternalTerminalService implements IExternalTerminalService ]; // merge environment variables into a copy of the process.env - const env = assign({}, process.env, envVars); + const env = Object.assign({}, process.env, envVars); // delete environment variables that have a null value Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]); @@ -251,7 +250,7 @@ export class LinuxExternalTerminalService implements IExternalTerminalService { termArgs.push(`''${bashCommand}''`); // wrapping argument in two sets of ' because node is so "friendly" that it removes one set... // merge environment variables into a copy of the process.env - const env = assign({}, process.env, envVars); + const env = Object.assign({}, process.env, envVars); // delete environment variables that have a null value Object.keys(env).filter(v => env[v] === null).forEach(key => delete env[key]); diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts index 28ed42f3b1acd8bcd2bca0767f9a074c4c127f22..e13566c70d4d5f78a90d8b6aee30cd1185909aff 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -446,12 +446,20 @@ class CellContentProvider implements ITextModelContentProvider { if (!data) { return null; } - const info = getFirstNotebookInfo(this._notebookService, data.notebook); - if (!info) { + + const documentAlreadyOpened = this._notebookService.listNotebookDocuments().find(document => document.uri.toString() === data.notebook.toString()); + let viewType = documentAlreadyOpened?.viewType; + + if (!viewType) { + const info = getFirstNotebookInfo(this._notebookService, data.notebook); + viewType = info?.id; + } + + if (!viewType) { return null; } - const ref = await this._notebookModelResolverService.resolve(data.notebook, info.id); + const ref = await this._notebookModelResolverService.resolve(data.notebook, viewType); let result: ITextModel | null = null; for (const cell of ref.object.notebook.cells) { diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index b4cfa82062b46acd7b1430b04589c58355be1f00..dd1bdd97048dd8eda52a398007e55a510aa39248 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -7,7 +7,6 @@ import { Action } from 'vs/base/common/actions'; import { distinct } from 'vs/base/common/arrays'; import { onUnexpectedError } from 'vs/base/common/errors'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; -import * as objects from 'vs/base/common/objects'; import * as platform from 'vs/base/common/platform'; import { dirname } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; @@ -614,14 +613,14 @@ MenuRegistry.appendMenuItem(MenuId.MenubarEditMenu, { if (platform.isMacintosh) { // Register this with a more restrictive `when` on mac to avoid conflict with "copy path" - KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ + KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: Constants.ToggleCaseSensitiveCommandId, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(Constants.SearchViewFocusedKey, Constants.FileMatchOrFolderMatchFocusKey.toNegated()), handler: toggleCaseSensitiveCommand }, ToggleCaseSensitiveKeybinding)); } else { - KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ + KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: Constants.ToggleCaseSensitiveCommandId, weight: KeybindingWeight.WorkbenchContrib, when: Constants.SearchViewFocusedKey, @@ -629,14 +628,14 @@ if (platform.isMacintosh) { }, ToggleCaseSensitiveKeybinding)); } -KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ +KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: Constants.ToggleWholeWordCommandId, weight: KeybindingWeight.WorkbenchContrib, when: Constants.SearchViewFocusedKey, handler: toggleWholeWordCommand }, ToggleWholeWordKeybinding)); -KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ +KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: Constants.ToggleRegexCommandId, weight: KeybindingWeight.WorkbenchContrib, when: Constants.SearchViewFocusedKey, diff --git a/src/vs/workbench/contrib/search/common/cacheState.ts b/src/vs/workbench/contrib/search/common/cacheState.ts index ff33a3f44f895d3d9da146d0fa33a0e5951077e6..9e1c4ceb738694bd802f9053a539d5ea30b0ba4b 100644 --- a/src/vs/workbench/contrib/search/common/cacheState.ts +++ b/src/vs/workbench/contrib/search/common/cacheState.ts @@ -5,7 +5,7 @@ import { defaultGenerator } from 'vs/base/common/idGenerator'; import { IFileQuery } from 'vs/workbench/services/search/common/search'; -import { assign, equals } from 'vs/base/common/objects'; +import { equals } from 'vs/base/common/objects'; enum LoadingPhase { Created = 1, @@ -50,8 +50,8 @@ export class FileQueryCacheState { private previousCacheState: FileQueryCacheState | undefined ) { if (this.previousCacheState) { - const current = assign({}, this.query, { cacheKey: null }); - const previous = assign({}, this.previousCacheState.query, { cacheKey: null }); + const current = Object.assign({}, this.query, { cacheKey: null }); + const previous = Object.assign({}, this.previousCacheState.query, { cacheKey: null }); if (!equals(current, previous)) { this.previousCacheState.dispose(); this.previousCacheState = undefined; diff --git a/src/vs/workbench/contrib/search/common/searchModel.ts b/src/vs/workbench/contrib/search/common/searchModel.ts index 8e8dd4acf61bfaa3927bfadc4992a67ad0524761..e6c24ce86894a72ae359392fc53013b5ece075f8 100644 --- a/src/vs/workbench/contrib/search/common/searchModel.ts +++ b/src/vs/workbench/contrib/search/common/searchModel.ts @@ -10,7 +10,6 @@ import { Emitter, Event } from 'vs/base/common/event'; import { getBaseLabel } from 'vs/base/common/labels'; import { Disposable, IDisposable, DisposableStore } from 'vs/base/common/lifecycle'; import { ResourceMap, TernarySearchTree } from 'vs/base/common/map'; -import * as objects from 'vs/base/common/objects'; import { lcut } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; import { Range } from 'vs/editor/common/core/range'; @@ -1102,7 +1101,7 @@ export class SearchModel extends Disposable { this._searchResult.add(this._resultQueue); this._resultQueue = []; - const options: IPatternInfo = objects.assign({}, this._searchQuery.contentPattern); + const options: IPatternInfo = Object.assign({}, this._searchQuery.contentPattern); delete (options as any).pattern; const stats = completed && completed.stats as ITextSearchStats; diff --git a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts index 242b2b17d1eae82aa58644b9deae7968ac35d371..13eb041293d1853c547814e94524bdadb46de63c 100644 --- a/src/vs/workbench/contrib/search/test/common/cacheState.test.ts +++ b/src/vs/workbench/contrib/search/test/common/cacheState.test.ts @@ -5,7 +5,6 @@ import * as assert from 'assert'; import * as errors from 'vs/base/common/errors'; -import * as objects from 'vs/base/common/objects'; import { DeferredPromise } from 'vs/base/test/common/utils'; import { QueryType, IFileQuery } from 'vs/workbench/services/search/common/search'; import { FileQueryCacheState } from 'vs/workbench/contrib/search/common/cacheState'; @@ -186,7 +185,7 @@ suite('FileQueryCacheState', () => { public query(cacheKey: string): IFileQuery { this.cacheKeys.push(cacheKey); - return objects.assign({ cacheKey: cacheKey }, this.baseQuery); + return Object.assign({ cacheKey: cacheKey }, this.baseQuery); } public load(query: IFileQuery): Promise { diff --git a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts index 711a8b6a5d9a4426025e3fb73567fd2b3343ff6c..3d48ff0d51947079d26a47bddf603f8e92c684d8 100644 --- a/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts +++ b/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; -import * as objects from 'vs/base/common/objects'; import { extname } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; import { ServicesAccessor } from 'vs/editor/browser/editorExtensions'; @@ -146,21 +145,21 @@ Registry.as(EditorInputExtensions.EditorInputFactor //#endregion //#region Commands -KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ +KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: ToggleSearchEditorCaseSensitiveCommandId, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(SearchEditorConstants.InSearchEditor, SearchConstants.SearchInputBoxFocusedKey), handler: toggleSearchEditorCaseSensitiveCommand }, ToggleCaseSensitiveKeybinding)); -KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ +KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: ToggleSearchEditorWholeWordCommandId, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(SearchEditorConstants.InSearchEditor, SearchConstants.SearchInputBoxFocusedKey), handler: toggleSearchEditorWholeWordCommand }, ToggleWholeWordKeybinding)); -KeybindingsRegistry.registerCommandAndKeybindingRule(objects.assign({ +KeybindingsRegistry.registerCommandAndKeybindingRule(Object.assign({ id: ToggleSearchEditorRegexCommandId, weight: KeybindingWeight.WorkbenchContrib, when: ContextKeyExpr.and(SearchEditorConstants.InSearchEditor, SearchConstants.SearchInputBoxFocusedKey), diff --git a/src/vs/workbench/contrib/views/browser/treeView.ts b/src/vs/workbench/contrib/views/browser/treeView.ts index 89b629fc0c69eef5a0bd414b1ab8b5510ab41e3b..9f919e9cd1f63bee3946498f64865eba38460050 100644 --- a/src/vs/workbench/contrib/views/browser/treeView.ts +++ b/src/vs/workbench/contrib/views/browser/treeView.ts @@ -100,6 +100,9 @@ export class TreeView extends Disposable implements ITreeView { private readonly _onDidChangeTitle: Emitter = this._register(new Emitter()); readonly onDidChangeTitle: Event = this._onDidChangeTitle.event; + private readonly _onDidChangeDescription: Emitter = this._register(new Emitter()); + readonly onDidChangeDescription: Event = this._onDidChangeDescription.event; + private readonly _onDidCompleteRefresh: Emitter = this._register(new Emitter()); constructor( @@ -220,6 +223,16 @@ export class TreeView extends Disposable implements ITreeView { this._onDidChangeTitle.fire(this._title); } + private _description: string | undefined; + get description(): string | undefined { + return this._description; + } + + set description(description: string | undefined) { + this._description = description; + this._onDidChangeDescription.fire(this._description); + } + get canSelectMany(): boolean { return this._canSelectMany; } diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts index d8184afce2ce85f9f23fd4d59df30d14d0ffd814..f4c5ddd2e256d6a4296d1f5bbe3486de0312a7ff 100644 --- a/src/vs/workbench/contrib/watermark/browser/watermark.ts +++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts @@ -5,7 +5,6 @@ import 'vs/css!./watermark'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; -import { assign } from 'vs/base/common/objects'; import { isMacintosh, OS } from 'vs/base/common/platform'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import * as nls from 'vs/nls'; @@ -44,7 +43,7 @@ const openFolderNonMacOnly: WatermarkEntry = { text: nls.localize('watermark.ope const openFileOrFolderMacOnly: WatermarkEntry = { text: nls.localize('watermark.openFileFolder', "Open File or Folder"), id: OpenFileFolderAction.ID, mac: true }; const openRecent: WatermarkEntry = { text: nls.localize('watermark.openRecent', "Open Recent"), id: 'workbench.action.openRecent' }; const newUntitledFile: WatermarkEntry = { text: nls.localize('watermark.newUntitledFile', "New Untitled File"), id: NEW_UNTITLED_FILE_COMMAND_ID }; -const newUntitledFileMacOnly: WatermarkEntry = assign({ mac: true }, newUntitledFile); +const newUntitledFileMacOnly: WatermarkEntry = Object.assign({ mac: true }, newUntitledFile); const toggleTerminal: WatermarkEntry = { text: nls.localize({ key: 'watermark.toggleTerminal', comment: ['toggle is a verb here'] }, "Toggle Terminal"), id: TERMINAL_COMMAND_ID.TOGGLE }; const findInFiles: WatermarkEntry = { text: nls.localize('watermark.findInFiles', "Find in Files"), id: FindInFilesActionId }; const startDebugging: WatermarkEntry = { text: nls.localize('watermark.startDebugging', "Start Debugging"), id: StartAction.ID }; diff --git a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts index 72c446f70049d4b08a185dcd422e32642d7b8beb..f5a6f27629ee872c9e1882152ae78406eded9edc 100644 --- a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts +++ b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts @@ -106,6 +106,7 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewOv const frameRect = element.getBoundingClientRect(); const containerRect = this.container.parentElement.getBoundingClientRect(); this.container.style.position = 'absolute'; + this.container.style.overflow = 'hidden'; this.container.style.top = `${frameRect.top - containerRect.top}px`; this.container.style.left = `${frameRect.left - containerRect.left}px`; this.container.style.width = `${dimension ? dimension.width : frameRect.width}px`; diff --git a/src/vs/workbench/services/extensions/node/proxyResolver.ts b/src/vs/workbench/services/extensions/node/proxyResolver.ts index 3a9f49c4471461beae6b8370fc61361fec67977a..d2668b9742cc23d6af4ec9e96acbb5f55178d8c7 100644 --- a/src/vs/workbench/services/extensions/node/proxyResolver.ts +++ b/src/vs/workbench/services/extensions/node/proxyResolver.ts @@ -11,7 +11,6 @@ import * as os from 'os'; import * as fs from 'fs'; import * as cp from 'child_process'; -import { assign } from 'vs/base/common/objects'; import { endsWith } from 'vs/base/common/strings'; import { IExtHostWorkspaceProvider } from 'vs/workbench/api/common/extHostWorkspace'; import { ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration'; @@ -314,20 +313,20 @@ function createPatchedModules(configProvider: ExtHostConfigProvider, resolveProx return { http: { - off: assign({}, http, patches(http, resolveProxy, { config: 'off' }, certSetting, true)), - on: assign({}, http, patches(http, resolveProxy, { config: 'on' }, certSetting, true)), - override: assign({}, http, patches(http, resolveProxy, { config: 'override' }, certSetting, true)), - onRequest: assign({}, http, patches(http, resolveProxy, proxySetting, certSetting, true)), - default: assign(http, patches(http, resolveProxy, proxySetting, certSetting, false)) // run last + off: Object.assign({}, http, patches(http, resolveProxy, { config: 'off' }, certSetting, true)), + on: Object.assign({}, http, patches(http, resolveProxy, { config: 'on' }, certSetting, true)), + override: Object.assign({}, http, patches(http, resolveProxy, { config: 'override' }, certSetting, true)), + onRequest: Object.assign({}, http, patches(http, resolveProxy, proxySetting, certSetting, true)), + default: Object.assign(http, patches(http, resolveProxy, proxySetting, certSetting, false)) // run last } as Record, https: { - off: assign({}, https, patches(https, resolveProxy, { config: 'off' }, certSetting, true)), - on: assign({}, https, patches(https, resolveProxy, { config: 'on' }, certSetting, true)), - override: assign({}, https, patches(https, resolveProxy, { config: 'override' }, certSetting, true)), - onRequest: assign({}, https, patches(https, resolveProxy, proxySetting, certSetting, true)), - default: assign(https, patches(https, resolveProxy, proxySetting, certSetting, false)) // run last + off: Object.assign({}, https, patches(https, resolveProxy, { config: 'off' }, certSetting, true)), + on: Object.assign({}, https, patches(https, resolveProxy, { config: 'on' }, certSetting, true)), + override: Object.assign({}, https, patches(https, resolveProxy, { config: 'override' }, certSetting, true)), + onRequest: Object.assign({}, https, patches(https, resolveProxy, proxySetting, certSetting, true)), + default: Object.assign(https, patches(https, resolveProxy, proxySetting, certSetting, false)) // run last } as Record, - tls: assign(tls, tlsPatches(tls)) + tls: Object.assign(tls, tlsPatches(tls)) }; } diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts index 2042e69d3356e7c085fa43116392ca8c9c5e7592..71b7f1b2101b9571d0098f6f0ebdd4e0a19544e0 100644 --- a/src/vs/workbench/services/search/node/fileSearch.ts +++ b/src/vs/workbench/services/search/node/fileSearch.ts @@ -12,7 +12,6 @@ import * as arrays from 'vs/base/common/arrays'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import * as glob from 'vs/base/common/glob'; import * as normalization from 'vs/base/common/normalization'; -import * as objects from 'vs/base/common/objects'; import { isEqualOrParent } from 'vs/base/common/extpath'; import * as platform from 'vs/base/common/platform'; import { StopWatch } from 'vs/base/common/stopwatch'; @@ -83,7 +82,7 @@ export class FileWalker { this.folderExcludePatterns = new Map(); config.folderQueries.forEach(folderQuery => { - const folderExcludeExpression: glob.IExpression = objects.assign({}, folderQuery.excludePattern || {}, this.config.excludePattern || {}); + const folderExcludeExpression: glob.IExpression = Object.assign({}, folderQuery.excludePattern || {}, this.config.excludePattern || {}); // Add excludes for other root folders const fqPath = folderQuery.folder.fsPath; diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts index 600f34513575a001c81714b6cf79f90d09ed1920..1f87855dcd8485141b93287ff339649490183ca1 100644 --- a/src/vs/workbench/services/search/node/rawSearchService.ts +++ b/src/vs/workbench/services/search/node/rawSearchService.ts @@ -11,7 +11,6 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { canceled } from 'vs/base/common/errors'; import { Emitter, Event } from 'vs/base/common/event'; import { compareItemsByFuzzyScore, FuzzyScorerCache, IItemAccessor, prepareQuery } from 'vs/base/common/fuzzyScorer'; -import * as objects from 'vs/base/common/objects'; import { basename, dirname, join, sep } from 'vs/base/common/path'; import { StopWatch } from 'vs/base/common/stopwatch'; import { URI, UriComponents } from 'vs/base/common/uri'; @@ -103,7 +102,7 @@ export class SearchService implements IRawSearchService { if (config.sortByScore) { let sortedSearch = this.trySortedSearchFromCache(config, fileProgressCallback, token); if (!sortedSearch) { - const walkerConfig = config.maxResults ? objects.assign({}, config, { maxResults: null }) : config; + const walkerConfig = config.maxResults ? Object.assign({}, config, { maxResults: null }) : config; const engine = new EngineClass(walkerConfig); sortedSearch = this.doSortedSearch(engine, config, progressCallback, fileProgressCallback, token); } diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts index fdf210f00e69b48c140d4c885d6e51ed66f9ae33..d74392713750d95df456760df7e675ae1bec8a87 100644 --- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts @@ -7,7 +7,6 @@ import * as cp from 'child_process'; import * as path from 'vs/base/common/path'; import * as glob from 'vs/base/common/glob'; import { normalizeNFD } from 'vs/base/common/normalization'; -import * as objects from 'vs/base/common/objects'; import * as extpath from 'vs/base/common/extpath'; import { isMacintosh as isMac } from 'vs/base/common/platform'; import * as strings from 'vs/base/common/strings'; @@ -92,11 +91,11 @@ export function foldersToRgExcludeGlobs(folderQueries: IFolderQuery[], globalExc const globArgs: string[] = []; let siblingClauses: glob.IExpression = {}; folderQueries.forEach(folderQuery => { - const totalExcludePattern = objects.assign({}, folderQuery.excludePattern || {}, globalExclude || {}); + const totalExcludePattern = Object.assign({}, folderQuery.excludePattern || {}, globalExclude || {}); const result = globExprsToRgGlobs(totalExcludePattern, absoluteGlobs ? folderQuery.folder.fsPath : undefined, excludesToSkip); globArgs.push(...result.globArgs); if (result.siblingClauses) { - siblingClauses = objects.assign(siblingClauses, result.siblingClauses); + siblingClauses = Object.assign(siblingClauses, result.siblingClauses); } }); @@ -106,7 +105,7 @@ export function foldersToRgExcludeGlobs(folderQueries: IFolderQuery[], globalExc export function foldersToIncludeGlobs(folderQueries: IFolderQuery[], globalInclude?: glob.IExpression, absoluteGlobs = true): string[] { const globArgs: string[] = []; folderQueries.forEach(folderQuery => { - const totalIncludePattern = objects.assign({}, globalInclude || {}, folderQuery.includePattern || {}); + const totalIncludePattern = Object.assign({}, globalInclude || {}, folderQuery.includePattern || {}); const result = globExprsToRgGlobs(totalIncludePattern, absoluteGlobs ? folderQuery.folder.fsPath : undefined); globArgs.push(...result.globArgs); }); diff --git a/yarn.lock b/yarn.lock index 774e959c57b9efa97195f7d5c880668f00ebfe7b..436caabe1f9e2cd66c7b21e85115e5475ed6e5e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10050,25 +10050,25 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -xterm-addon-search@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.7.0.tgz#c929d3e5cbb335e82bff72f158ea82936d9cd4ef" - integrity sha512-6060evmJJ+tZcjnx33FXaeEHLpuXEa7l9UzUsYfMlCKbu88AbE+5LJocTKCHYd71cwCwb9pjmv/G1o9Rf9Zbcg== - -xterm-addon-unicode11@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.2.0.tgz#9ed0c482b353908bba27778893ca80823382737c" - integrity sha512-rjFDItPc/IDoSiEnoDFwKroNwLD/7t9vYKENjrcKVZg5tgJuuUj8D4rZtP6iVCjSB1LTLYmUs4L/EmCqIyLR/Q== - -xterm-addon-webgl@0.9.0-beta.4: - version "0.9.0-beta.4" - resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.9.0-beta.4.tgz#5f5fde50db5c06b116471bcf56ad9930884b36fa" - integrity sha512-GuCvF7Eg1nKLX6zUbJLkt5cqeeccUjf/G6fugCfrkR0EWWC6Ik5mEsEOs5UWm9vvY2kX9t16BdCrgqp8KJegEg== - -xterm@4.9.0-beta.32: - version "4.9.0-beta.32" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.9.0-beta.32.tgz#d1243d3be211cc06aad3418e696e4eced995c20c" - integrity sha512-jloHNBnj6XRJt+oPkapvrXJZVsYq6se/PEgzErl0iZn9qzSB3jmWE4byumoEjXJR6EgU5ZOmNljeeEDA9jO/jA== +xterm-addon-search@0.8.0-beta.3: + version "0.8.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0-beta.3.tgz#c6c7e36a03706bd43d8bba383511acf9e435aed0" + integrity sha512-EZP97KJIJ4KGQaOPYiiOaRRJst6LOgeEFoQL46WcBl5EWH9pH8qfrv0BHAJ8+6nBV2B9u5M6rzxO1GvLLec19w== + +xterm-addon-unicode11@0.3.0-beta.3: + version "0.3.0-beta.3" + resolved "https://registry.yarnpkg.com/xterm-addon-unicode11/-/xterm-addon-unicode11-0.3.0-beta.3.tgz#70af2dfb67809258edb62c19e2861f7ce5ccf5cd" + integrity sha512-vaYopnOjn19wCLDCyIWPWLwKR7CvLPxB5YZ3CAxt9qL05o3symxIJJJC0DuCa4GaGKVjNc7EmjRCs5bsJ2O1tw== + +xterm-addon-webgl@0.10.0-beta.1: + version "0.10.0-beta.1" + resolved "https://registry.yarnpkg.com/xterm-addon-webgl/-/xterm-addon-webgl-0.10.0-beta.1.tgz#e0bf964945a9aa8fc18318ddbd32e56ec99c219e" + integrity sha512-XNZMrmiyFaz3XiPq+LqF0qn2QHpUEwuk+cG53JwpJHnWo3dd2jxoIgHFQUcrnvHIVPZMbTKySIwLCCC9uQVl7Q== + +xterm@4.10.0-beta.4: + version "4.10.0-beta.4" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.10.0-beta.4.tgz#95efce7a40ec582101ec9777f4ccc6e68e95185e" + integrity sha512-q/yRy2nn4mp1jWZe218TJwlKjXCIr6h28Kw0JMB+lcTeU+MebZ3TrHqlrNVnB+UJfFDOpkw0qfKYfRoV8G/hXA== y18n@^3.2.1: version "3.2.1"