diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index 2df05cca0d3a6..69d9050d4a43f 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -26,7 +26,7 @@ This project incorporates components from the projects listed below. The origina 19. Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R) 20. Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site) 21. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar) -22. jeff-hykin/cpp-textmate-grammar version 1.4.5 (https://github.com/jeff-hykin/cpp-textmate-grammar) +22. jeff-hykin/cpp-textmate-grammar version 1.8.8 (https://github.com/jeff-hykin/cpp-textmate-grammar) 23. js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify) 24. Jxck/assert version 1.0.0 (https://github.com/Jxck/assert) 25. language-docker (https://github.com/moby/moby) @@ -35,14 +35,14 @@ This project incorporates components from the projects listed below. The origina 28. language-php version 0.44.1 (https://github.com/atom/language-php) 29. language-rust version 0.4.12 (https://github.com/zargony/atom-language-rust) 30. MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython) -31. marked version 0.5.0 (https://github.com/markedjs/marked) +31. marked version 0.6.2 (https://github.com/markedjs/marked) 32. mdn-data version 1.1.12 (https://github.com/mdn/data) 33. Microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/Microsoft/TypeScript-TmLanguage) 34. Microsoft/vscode-JSON.tmLanguage (https://github.com/Microsoft/vscode-JSON.tmLanguage) 35. Microsoft/vscode-mssql version 1.4.0 (https://github.com/Microsoft/vscode-mssql) 36. mmims/language-batchfile version 0.7.5 (https://github.com/mmims/language-batchfile) 37. octicons version 8.3.0 (https://github.com/primer/octicons) -38. octref/language-css (https://github.com/octref/language-css) +38. octref/language-css version 0.42.11 (https://github.com/octref/language-css) 39. PowerShell/EditorSyntax (https://github.com/powershell/editorsyntax) 40. promise-polyfill version 8.0.0 (https://github.com/taylorhakes/promise-polyfill) 41. seti-ui version 0.1.0 (https://github.com/jesseweed/seti-ui) @@ -64,7 +64,7 @@ This project incorporates components from the projects listed below. The origina 57. TypeScript-TmLanguage version 1.0.0 (https://github.com/Microsoft/TypeScript-TmLanguage) 58. Unicode version 12.0.0 (http://www.unicode.org/) 59. vscode-logfile-highlighter version 2.4.1 (https://github.com/emilast/vscode-logfile-highlighter) -60. vscode-octicons-font version 1.0.0 (https://github.com/Microsoft/vscode-octicons-font) +60. vscode-octicons-font version 1.1.0 (https://github.com/Microsoft/vscode-octicons-font) 61. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift) 62. Web Background Synchronization (https://github.com/WICG/BackgroundSync) diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 74aa5e694a169..7c90bfb52c9eb 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -10,7 +10,7 @@ "main": "./out/htmlServerMain", "dependencies": { "vscode-css-languageservice": "^4.0.2-next.3", - "vscode-html-languageservice": "^3.0.0-next.6", + "vscode-html-languageservice": "^3.0.0-next.7", "vscode-languageserver": "^5.3.0-next.2", "vscode-languageserver-types": "^3.14.0", "vscode-nls": "^4.0.0", diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 76766c7948b45..6bdbac4e1a206 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -237,10 +237,10 @@ vscode-css-languageservice@^4.0.2-next.3: vscode-languageserver-types "^3.14.0" vscode-nls "^4.0.0" -vscode-html-languageservice@^3.0.0-next.6: - version "3.0.0-next.6" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.0.0-next.6.tgz#4a33567abfc3ccacc4258f4f2c1743eb064b490b" - integrity sha512-h5JDiJtqPvRlWlN59Ue/clLCL6/vtAVYHQql9uLLZ+zwuX6kbF/7sCCM6hAswuYushx5kniNzwq47A23V1nlUA== +vscode-html-languageservice@^3.0.0-next.7: + version "3.0.0-next.7" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.0.0-next.7.tgz#6590cb0a6fa5bb257afca03669bbf6ad8adb58c6" + integrity sha512-s9dVSMVKGlrAymj6WByoEheZMen82yHqiXh7F8cz9KCqDHJ3LRpcJMKrIdOFQJ6qTcFW9I7VqO77VSB9d1RZyQ== dependencies: vscode-languageserver-types "^3.14.0" vscode-nls "^4.0.0" diff --git a/extensions/json-language-features/server/package.json b/extensions/json-language-features/server/package.json index fc2323a773e35..1f73cea2295d3 100644 --- a/extensions/json-language-features/server/package.json +++ b/extensions/json-language-features/server/package.json @@ -14,7 +14,7 @@ "dependencies": { "jsonc-parser": "^2.0.3", "request-light": "^0.2.4", - "vscode-json-languageservice": "^3.3.0-next.6", + "vscode-json-languageservice": "^3.3.0-next.7", "vscode-languageserver": "^5.3.0-next.2", "vscode-nls": "^4.0.0", "vscode-uri": "^1.0.6" diff --git a/extensions/json-language-features/server/yarn.lock b/extensions/json-language-features/server/yarn.lock index bb8489b6d8601..3f0383a8c4f19 100644 --- a/extensions/json-language-features/server/yarn.lock +++ b/extensions/json-language-features/server/yarn.lock @@ -73,10 +73,10 @@ request-light@^0.2.4: https-proxy-agent "^2.2.1" vscode-nls "^4.0.0" -vscode-json-languageservice@^3.3.0-next.6: - version "3.3.0-next.6" - resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.0-next.6.tgz#711f121b44ba443a89f3fb01a01c611f2547079f" - integrity sha512-i1tyLiodWc7y6lR9C4cat+OUSptj8Duk1Ybm1FaMzhNfOTFttSiwrBw1otNb+QwI65VEj7EAEBQHRLeQOWznMw== +vscode-json-languageservice@^3.3.0-next.7: + version "3.3.0-next.7" + resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.3.0-next.7.tgz#3ad4bf31f37fa110676b2c0db69b5f4810bdd4b9" + integrity sha512-uKXnzoZrqNOPRa+FmUdoCpNU5KCLhy7yDGCAzzfn0mocsEllPcspjHcBDu9HJCfT165UkhulZ2gl5vVX5NzBVA== dependencies: jsonc-parser "^2.0.3" vscode-languageserver-types "^3.14.0" diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json index c343b4fd90abc..67a05c028ea68 100644 --- a/extensions/shellscript/package.json +++ b/extensions/shellscript/package.json @@ -14,7 +14,7 @@ "aliases": ["Shell Script", "shellscript", "bash", "sh", "zsh", "ksh"], "extensions": [".sh", ".bash", ".bashrc", ".bash_aliases", ".bash_profile", ".bash_login", ".ebuild", ".install", ".profile", ".bash_logout", ".zsh", ".zshrc", ".zprofile", ".zlogin", ".zlogout", ".zshenv", ".zsh-theme", ".ksh"], "filenames": ["PKGBUILD"], - "firstLine": "^#!.*\\b(bash|zsh|sh|tcsh|ksh|ash).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-", + "firstLine": "^#!.*\\b(bash|zsh|sh|tcsh|ksh|ash|qsh).*|^#\\s*-\\*-[^*]*mode:\\s*shell-script[^*]*-\\*-", "configuration": "./language-configuration.json", "mimetypes": ["text/x-shellscript"] }], diff --git a/extensions/theme-defaults/themes/dark_defaults.json b/extensions/theme-defaults/themes/dark_defaults.json index 276a71d0fdb33..00c2ac8c36b0b 100644 --- a/extensions/theme-defaults/themes/dark_defaults.json +++ b/extensions/theme-defaults/themes/dark_defaults.json @@ -15,6 +15,8 @@ "settings.textInputBackground": "#292929", "settings.numberInputBackground": "#292929", "menu.background": "#252526", - "menu.foreground": "#CCCCCC" + "menu.foreground": "#CCCCCC", + "statusBarItem.remoteForeground": "#FFF", + "statusBarItem.remoteBackground": "#16825D" } } \ No newline at end of file diff --git a/extensions/theme-defaults/themes/light_defaults.json b/extensions/theme-defaults/themes/light_defaults.json index 91c5fb1d93a80..e28c9b8ed0b2f 100644 --- a/extensions/theme-defaults/themes/light_defaults.json +++ b/extensions/theme-defaults/themes/light_defaults.json @@ -14,6 +14,8 @@ "list.hoverBackground": "#E8E8E8", "input.placeholderForeground": "#767676", "settings.textInputBorder": "#CECECE", - "settings.numberInputBorder": "#CECECE" + "settings.numberInputBorder": "#CECECE", + "statusBarItem.remoteForeground": "#FFF", + "statusBarItem.remoteBackground": "#16825D" } } \ No newline at end of file diff --git a/package.json b/package.json index d1df9bda1fa7a..0b033e15b0f88 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.34.0", - "distro": "9385c45c44e7ae495efe9564f253bd68cb5aedde", + "distro": "b9fb31b7caa6d9f506aa458342ab71183bc90b52", "author": { "name": "Microsoft Corporation" }, diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts index dc8c82f4db32b..14757bf211781 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -789,12 +789,18 @@ class Trait { return; } + this._set(nodes, false, browserEvent); + } + + private _set(nodes: ITreeNode[], silent: boolean, browserEvent?: UIEvent): void { this.nodes = [...nodes]; this.elements = undefined; this._nodeSet = undefined; - const that = this; - this._onDidChange.fire({ get elements() { return that.get(); }, browserEvent }); + if (!silent) { + const that = this; + this._onDidChange.fire({ get elements() { return that.get(); }, browserEvent }); + } } get(): T[] { @@ -827,6 +833,7 @@ class Trait { insertedNodes.forEach(node => dfs(node, insertedNodesVisitor)); const nodes: ITreeNode[] = []; + let silent = true; for (const node of this.nodes) { const id = this.identityProvider.getId(node.element).toString(); @@ -839,11 +846,13 @@ class Trait { if (insertedNode) { nodes.push(insertedNode); + } else { + silent = false; } } } - this.set(nodes); + this._set(nodes, silent); } private createNodeSet(): Set> { diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 2185299d26a78..76a7fedbf4361 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -8970,7 +8970,7 @@ declare module 'vscode' { /** * The uri of the document the thread has been created on. */ - readonly resource: Uri; + readonly uri: Uri; /** * The range the comment thread is located within the document. The thread icon will be shown @@ -9003,25 +9003,29 @@ declare module 'vscode' { */ acceptInputCommand?: Command; + /** - * Optional additonal commands. + * Dispose this comment thread. * - * `additionalCommands` are the secondary actions rendered on Comment Widget. + * Once disposed, this comment thread will be removed from visible editors and Comment Panel when approriate. */ - additionalCommands?: Command[]; + dispose(): void; + } + + /** + * Author information of a [comment](#Comment) + */ + export interface CommentAuthorInformation { /** - * The command to be executed when users try to delete the comment thread. Currently, this is only called - * when the user collapses a comment thread that has no comments in it. + * The display name of the author of the comment */ - deleteCommand?: Command; + name: string; /** - * Dispose this comment thread. - * - * Once disposed, this comment thread will be removed from visible editors and Comment Panel when approriate. + * The optional icon path for the author */ - dispose(): void; + iconPath?: Uri; } /** @@ -9074,11 +9078,6 @@ declare module 'vscode' { * The command to be executed when users try to save the edits to the comment */ editCommand?: Command; - - /** - * The command to be executed when users try to delete the comment - */ - deleteCommand?: Command; } /** @@ -9193,7 +9192,7 @@ declare module 'vscode' { * @param range The range the comment thread is located within the document. * @param comments The ordered comments of the thread. */ - createCommentThread(id: string, resource: Uri, range: Range, comments: Comment[]): CommentThread; + createCommentThread(id: string, uri: Uri, range: Range, comments: Comment[]): CommentThread; /** * Dispose this comment controller. diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 27758cdb3075c..0324fb4fc836e 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -792,6 +792,11 @@ declare module 'vscode' { */ isDraft?: boolean; + /** + * The command to be executed when users try to delete the comment + */ + deleteCommand?: Command; + /** * Proposed Comment Reaction */ @@ -905,6 +910,26 @@ declare module 'vscode' { toggleReaction?(document: TextDocument, comment: Comment, reaction: CommentReaction): Promise; } + export interface CommentThread { + /** + * The uri of the document the thread has been created on. + */ + readonly resource: Uri; + + /** + * Optional additonal commands. + * + * `additionalCommands` are the secondary actions rendered on Comment Widget. + */ + additionalCommands?: Command[]; + + /** + * The command to be executed when users try to delete the comment thread. Currently, this is only called + * when the user collapses a comment thread that has no comments in it. + */ + deleteCommand?: Command; + } + export interface CommentController { /** diff --git a/src/vs/workbench/api/common/extHostComments.ts b/src/vs/workbench/api/common/extHostComments.ts index d4c5f74621d1e..a36f7409934f2 100644 --- a/src/vs/workbench/api/common/extHostComments.ts +++ b/src/vs/workbench/api/common/extHostComments.ts @@ -385,7 +385,11 @@ export class ExtHostCommentThread implements vscode.CommentThread { } get resource(): vscode.Uri { - return this._resource; + return this._uri; + } + + get uri(): vscode.Uri { + return this._uri; } private _onDidUpdateCommentThread = new Emitter(); @@ -476,7 +480,7 @@ export class ExtHostCommentThread implements vscode.CommentThread { private readonly _commandsConverter: CommandsConverter, private _commentController: ExtHostCommentController, private _id: string, - private _resource: vscode.Uri, + private _uri: vscode.Uri, private _range: vscode.Range, private _comments: vscode.Comment[] ) { @@ -484,7 +488,7 @@ export class ExtHostCommentThread implements vscode.CommentThread { this._commentController.handle, this.handle, this._id, - this._resource, + this._uri, extHostTypeConverter.Range.from(this._range) ); @@ -513,7 +517,7 @@ export class ExtHostCommentThread implements vscode.CommentThread { this._commentController.handle, this.handle, this._id, - this._resource, + this._uri, commentThreadRange, label, comments, @@ -717,6 +721,7 @@ function convertFromCommentThread(commentThread: modes.CommentThread): vscode.Co return { id: commentThread.threadId!, threadId: commentThread.threadId!, + uri: URI.parse(commentThread.resource!), resource: URI.parse(commentThread.resource!), range: extHostTypeConverter.Range.to(commentThread.range), comments: commentThread.comments ? commentThread.comments.map(convertFromComment) : [], diff --git a/src/vs/workbench/common/theme.ts b/src/vs/workbench/common/theme.ts index e93018b137850..957b3b244ad4c 100644 --- a/src/vs/workbench/common/theme.ts +++ b/src/vs/workbench/common/theme.ts @@ -309,19 +309,6 @@ export const STATUS_BAR_PROMINENT_ITEM_HOVER_BACKGROUND = registerColor('statusB hc: Color.black.transparent(0.3), }, nls.localize('statusBarProminentItemHoverBackground', "Status bar prominent items background color when hovering. Prominent items stand out from other status bar entries to indicate importance. Change mode `Toggle Tab Key Moves Focus` from command palette to see an example. The status bar is shown in the bottom of the window.")); -export const STATUS_BAR_HOST_NAME_BACKGROUND = registerColor('statusBarItem.remoteBackground', { - dark: '#16825D', - light: '#16825D', - hc: '#FFFFFF00' -}, nls.localize('statusBarItemHostBackground', "Background color for the remote indicator on the status bar.")); - -export const STATUS_BAR_HOST_NAME_FOREGROUND = registerColor('statusBarItem.remoteForeground', { - dark: '#FFFFFF', - light: '#FFFFFF', - hc: '#FFFFFF' -}, nls.localize('statusBarItemHostForeground', "Foreground color for the remote indicator on the status bar.")); - - // < --- Activity Bar --- > export const ACTIVITY_BAR_BACKGROUND = registerColor('activityBar.background', { @@ -366,6 +353,21 @@ export const ACTIVITY_BAR_BADGE_FOREGROUND = registerColor('activityBarBadge.for hc: Color.white }, nls.localize('activityBarBadgeForeground', "Activity notification badge foreground color. The activity bar is showing on the far left or right and allows to switch between views of the side bar.")); + +// < --- Remote --- > + +export const STATUS_BAR_HOST_NAME_BACKGROUND = registerColor('statusBarItem.remoteBackground', { + dark: ACTIVITY_BAR_BADGE_BACKGROUND, + light: ACTIVITY_BAR_BADGE_BACKGROUND, + hc: ACTIVITY_BAR_BADGE_BACKGROUND +}, nls.localize('statusBarItemHostBackground', "Background color for the remote indicator on the status bar.")); + +export const STATUS_BAR_HOST_NAME_FOREGROUND = registerColor('statusBarItem.remoteForeground', { + dark: ACTIVITY_BAR_BADGE_FOREGROUND, + light: ACTIVITY_BAR_BADGE_FOREGROUND, + hc: ACTIVITY_BAR_BADGE_FOREGROUND +}, nls.localize('statusBarItemHostForeground', "Foreground color for the remote indicator on the status bar.")); + export const EXTENSION_BADGE_REMOTE_BACKGROUND = registerColor('extensionBadge.remoteBackground', { dark: ACTIVITY_BAR_BADGE_BACKGROUND, light: ACTIVITY_BAR_BADGE_BACKGROUND, diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts index cef986724cb26..35af370ca9e5f 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts @@ -173,7 +173,7 @@ class OpenExtensionAction extends Action { } } -export class ExtensionsTree extends WorkbenchAsyncDataTree { +export class ExtensionsTree extends WorkbenchAsyncDataTree { constructor( input: IExtensionData, @@ -212,7 +212,9 @@ export class ExtensionsTree extends WorkbenchAsyncDataTree this.setInput(input); this.disposables.push(this.onDidChangeSelection(event => { - extensionsWorkdbenchService.open(event.elements[0], event.browserEvent instanceof MouseEvent && (event.browserEvent.ctrlKey || event.browserEvent.metaKey || event.browserEvent.altKey)); + if (event.browserEvent && event.browserEvent instanceof KeyboardEvent) { + extensionsWorkdbenchService.open(event.elements[0].extension, false); + } })); } } \ No newline at end of file diff --git a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts index fac02aab41c6b..7ce3a1e021181 100644 --- a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts +++ b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts @@ -1066,6 +1066,7 @@ export class SettingsEditor2 extends BaseEditor { } this.tocTree.setFocus([]); + this.viewState.filterToCategory = undefined; this.tocTreeModel.currentSearchModel = this.searchResultModel; this.onSearchModeToggled(); @@ -1207,6 +1208,7 @@ export class SettingsEditor2 extends BaseEditor { } this.tocTree.setFocus([]); + this.viewState.filterToCategory = undefined; this.tocTree.expandAll(); this.renderTree(undefined, true); diff --git a/src/vs/workbench/contrib/search/browser/search.contribution.ts b/src/vs/workbench/contrib/search/browser/search.contribution.ts index 3be9163280794..f675087eeb448 100644 --- a/src/vs/workbench/contrib/search/browser/search.contribution.ts +++ b/src/vs/workbench/contrib/search/browser/search.contribution.ts @@ -478,6 +478,14 @@ Registry.as(ViewletExtensions.Viewlets).registerViewlet(new Vie 1 )); +Registry.as(PanelExtensions.Panels).registerPanel(new PanelDescriptor( + SearchPanel, + PANEL_ID, + nls.localize('name', "Search"), + 'search', + 10 +)); + class RegisterSearchViewContribution implements IWorkbenchContribution { constructor(