Merge from vscode 8ef8aa6b3cb5b96870660fdd3bb8d0755e62fe51 (#5422)

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<void>();
@@ -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) : [],

src/vs/workbench/browser/parts/quickinput/quickInput.css

@@ -47,7 +47,8 @@
 
 .quick-input-header {
 	display: flex;
-	padding: 6px 6px 4px 6px;
+	padding: 6px 6px 0px 6px;
+	margin-bottom: -2px;
 }
 
 .quick-input-and-message {
@@ -98,13 +99,13 @@
 
 .quick-input-action .monaco-text-button {
 	font-size: 85%;
-	padding: 7px 6px 6px 6px;
+	padding: 7px 6px 5.5px 6px;
 	line-height: initial;
 }
 
 .quick-input-message {
 	margin-top: -1px;
-	padding: 6px 5px 2px 5px;
+	padding: 5px 5px 2px 5px;
 }
 
 .quick-input-progress.monaco-progress-container {

src/vs/workbench/browser/parts/quickinput/quickInput.ts

@@ -307,9 +307,11 @@ class QuickInput implements IQuickInput {
 			const styles = this.ui.inputBox.stylesForType(severity);
 			this.ui.message.style.backgroundColor = styles.background ? `${styles.background}` : null;
 			this.ui.message.style.border = styles.border ? `1px solid ${styles.border}` : null;
+			this.ui.message.style.paddingBottom = '4px';
 		} else {
 			this.ui.message.style.backgroundColor = '';
 			this.ui.message.style.border = '';
+			this.ui.message.style.paddingBottom = '';
 		}
 	}
 

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,

src/vs/workbench/contrib/extensions/browser/extensionsViewer.ts

@@ -173,7 +173,7 @@ class OpenExtensionAction extends Action {
 	}
 }
 
-export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, any> {
+export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, IExtensionData> {
 
 	constructor(
 		input: IExtensionData,
@@ -212,7 +212,9 @@ export class ExtensionsTree extends WorkbenchAsyncDataTree<IExtensionData, any>
 		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);
+			}
 		}));
 	}
 }

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);

src/vs/workbench/contrib/search/browser/search.contribution.ts

@@ -476,6 +476,14 @@ Registry.as<ViewletRegistry>(ViewletExtensions.Viewlets).registerViewlet(new Vie
 	1
 ));
 
+Registry.as<PanelRegistry>(PanelExtensions.Panels).registerPanel(new PanelDescriptor(
+	SearchPanel,
+	PANEL_ID,
+	nls.localize('name', "Search"),
+	'search',
+	10
+));
+
 class RegisterSearchViewContribution implements IWorkbenchContribution {
 
 	constructor(