Merge branch 'master' of https://github.com/microsoft/vscode

src/vs/base/browser/ui/list/rowCache.ts

@@ -60,7 +60,7 @@ export class RowCache<T> implements IDisposable {
 	 * scrolling).
 	 */
 	release(row: IRow): void {
-		if (!row.domNode) {
+		if (!row) {
 			return;
 		}
 

src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts

@@ -236,7 +236,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		this.toUnhook.push(this.editor.onKeyDown((e: IKeyboardEvent) => this.onEditorKeyDown(e)));
 		this.toUnhook.push(this.editor.onKeyUp((e: IKeyboardEvent) => this.onEditorKeyUp(e)));
 
-		this.toUnhook.push(this.editor.onDidChangeCursorSelection((e) => this.resetHandler())); // https://github.com/Microsoft/vscode/issues/7827
+		this.toUnhook.push(this.editor.onDidChangeCursorSelection((e) => this.onDidChangeCursorSelection(e)));
 		this.toUnhook.push(this.editor.onDidChangeModel((e) => this.resetHandler()));
 		this.toUnhook.push(this.editor.onDidChangeModelContent(() => this.resetHandler()));
 		this.toUnhook.push(this.editor.onDidScrollChange((e) => {
@@ -246,6 +246,12 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
 		}));
 	}
 
+	private onDidChangeCursorSelection(e: editorCommon.ICursorSelectionChangedEvent): void {
+		if (e.selection && e.selection.startColumn !== e.selection.endColumn) {
+			this.resetHandler(); // immediately stop this feature if the user starts to select (https://github.com/Microsoft/vscode/issues/7827)
+		}
+	}
+
 	private onEditorMouseMove(mouseEvent: IEditorMouseEvent, withKey?: IKeyboardEvent): void {
 		this.lastMouseMoveEvent = mouseEvent;
 

src/vs/workbench/browser/parts/editor/media/editorPicker.css

@@ -5,5 +5,8 @@
 
 .monaco-workbench .quick-open-widget .quick-open-tree .quick-open-entry.editor-preview {
 	font-style: italic;
-	padding-left: 1px; /* we need to push the label a bit to accomodate for the italic style */
+}
+
+.monaco-workbench.mac .quick-open-widget .quick-open-tree .quick-open-entry.editor-preview {
+	font-weight: 300; /* makes the italic font appear the same as normal */
 }
\ No newline at end of file

src/vs/workbench/browser/parts/editor/media/titlecontrol.css

@@ -12,6 +12,11 @@
 	font-style: italic;
 }
 
+.monaco-workbench.mac > .part.editor > .content > .one-editor-container > .title .title-label,
+.monaco-workbench.mac > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab .tab-label {
+	font-weight: 300; /* makes the italic font appear the same as normal */
+}
+
 .monaco-workbench > .part.editor > .content > .one-editor-container > .title.pinned .title-label,
 .monaco-workbench > .part.editor > .content > .one-editor-container > .title .tabs-container > .tab.pinned .tab-label {
 	font-style: normal;

src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts

@@ -190,7 +190,7 @@ export class SideBySideEditorControl implements ISideBySideEditorControl, IVerti
 	private onExtensionsReady(): void {
 
 		// Up to date title areas
-		POSITIONS.forEach(position => this.titleAreaControl[position].refresh());
+		POSITIONS.forEach(position => this.titleAreaControl[position].update());
 	}
 
 	private onStacksChanged(e: IStacksModelChangeEvent): void {

src/vs/workbench/browser/workbench.ts

@@ -19,6 +19,7 @@ import timer = require('vs/base/common/timer');
 import errors = require('vs/base/common/errors');
 import {Registry} from 'vs/platform/platform';
 import {Identifiers} from 'vs/workbench/common/constants';
+import {isWindows, isLinux} from 'vs/base/common/platform';
 import {IOptions} from 'vs/workbench/common/options';
 import {IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions} from 'vs/workbench/common/contributions';
 import {IEditorRegistry, Extensions as EditorExtensions, BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
@@ -699,7 +700,7 @@ export class Workbench implements IPartService {
 
 		// Create Workbench DIV Off-DOM
 		this.workbenchContainer = $('.monaco-workbench-container');
-		this.workbench = $().div({ 'class': 'monaco-workbench', id: Identifiers.WORKBENCH_CONTAINER }).appendTo(this.workbenchContainer);
+		this.workbench = $().div({ 'class': 'monaco-workbench ' + (isWindows ? 'windows' : isLinux ? 'linux' : 'mac'), id: Identifiers.WORKBENCH_CONTAINER }).appendTo(this.workbenchContainer);
 	}
 
 	private renderWorkbench(): void {

src/vs/workbench/parts/debug/browser/media/debug.contribution.css

@@ -186,6 +186,10 @@
 	font-style: italic;
 }
 
+.monaco-workbench.mac .monaco-tree-row .expression .unavailable {
+	font-weight: 300; /* makes the italic font appear the same as normal */
+}
+
 .monaco-workbench .monaco-tree-row:not(.selected) .expression .error {
 	color: #E51400;
 }

src/vs/workbench/parts/debug/browser/media/debugViewlet.css

@@ -197,6 +197,11 @@
 	overflow: hidden;
 }
 
+.monaco-workbench.mac .debug-viewlet .debug-call-stack .load-more,
+.monaco-workbench.mac .debug-viewlet .debug-call-stack .error {
+	font-weight: 300; /* makes the italic font appear the same as normal */
+}
+
 /* Variables & Expression view */
 
 .debug-viewlet .scope {

src/vs/workbench/parts/files/browser/media/explorerviewlet.css

@@ -111,11 +111,10 @@
 
 .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row .open-editor.preview {
 	font-style: italic;
-	padding-left: 1px; /* we need to push the label a bit to accomodate for the italic style */
 }
 
-.explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row > .content > .open-editor.preview {
-	margin-left: 0px; /* accomodate for 1px padding */
+.monaco-workbench.mac .explorer-viewlet .explorer-open-editors .monaco-tree .monaco-tree-row .open-editor.preview {
+	font-weight: 300; /* makes the italic font appear the same as normal */
 }
 
 /* Theming */

src/vs/workbench/parts/git/browser/media/git.contribution.css

@@ -224,4 +224,8 @@
 
 .monaco-shell .git-statusbar-group > .git-statusbar-branch-item.headless {
 	font-style: italic;
+}
+
+.monaco-shell .monaco-workbench.mac .git-statusbar-group > .git-statusbar-branch-item.headless {
+	font-weight: 300; /* makes the italic font appear the same as normal */
 }
\ No newline at end of file

src/vs/workbench/parts/search/browser/media/searchviewlet.css

@@ -209,6 +209,11 @@ hc-black .search-viewlet .action-replace,
 	font-style: italic;
 }
 
+.monaco-workbench.mac .search-viewlet .label,
+.monaco-workbench.mac .search-viewlet .linematch.changedOrRemoved {
+	font-weight: 300; /* makes the italic font appear the same as normal */
+}
+
 .search-viewlet .monaco-count-badge {
 	margin-right: 12px;
 }