Merge branch 'master' into joh/extHostInject

src/main.js

@@ -133,7 +133,7 @@ function onReady() {
 }
 
 /**
- * @typedef {import('minimist').ParsedArgs} ParsedArgs
+ * @typedef	 {{ [arg: string]: any; '--'?: string[]; _: string[]; }} ParsedArgs
  *
  * @param {ParsedArgs} cliArgs
  */
@@ -186,7 +186,7 @@ function getUserDataPath(cliArgs) {
  * @returns {ParsedArgs}
  */
 function parseCLIArgs() {
-	const minimist = require('minimist');
+	const minimist = require('vscode-minimist');
 
 	return minimist(process.argv, {
 		string: [

src/tsconfig.base.json

@@ -20,11 +20,10 @@
 		},
 		"types": [
 			"keytar",
-			"minimist",
 			"mocha",
 			"semver",
 			"sinon",
 			"winreg"
 		]
 	}
-}
\ No newline at end of file
+}

src/vs/base/browser/ui/iconLabel/iconLabel.ts

@@ -12,7 +12,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 export interface IIconLabelCreationOptions {
 	supportHighlights?: boolean;
 	supportDescriptionHighlights?: boolean;
-	donotSupportOcticons?: boolean;
+	supportOcticons?: boolean;
 }
 
 export interface IIconLabelValueOptions {
@@ -100,13 +100,13 @@ export class IconLabel extends Disposable {
 		this.labelDescriptionContainer = this._register(new FastLabelNode(dom.append(this.domNode.element, dom.$('.monaco-icon-label-description-container'))));
 
 		if (options && options.supportHighlights) {
-			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')), !options.donotSupportOcticons);
+			this.labelNode = new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name')), !!options.supportOcticons);
 		} else {
 			this.labelNode = this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('a.label-name'))));
 		}
 
 		if (options && options.supportDescriptionHighlights) {
-			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')), !options.donotSupportOcticons);
+			this.descriptionNodeFactory = () => new HighlightedLabel(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description')), !!options.supportOcticons);
 		} else {
 			this.descriptionNodeFactory = () => this._register(new FastLabelNode(dom.append(this.labelDescriptionContainer.element, dom.$('span.label-description'))));
 		}

src/vs/base/parts/quickopen/browser/quickOpenModel.ts

@@ -352,7 +352,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
 		row1.appendChild(icon);
 
 		// Label
-		const label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true });
+		const label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true, supportOcticons: true });
 
 		// Keybinding
 		const keybindingContainer = document.createElement('span');

src/vs/editor/contrib/suggest/suggestWidget.ts

@@ -115,7 +115,7 @@ class Renderer implements IListRenderer<CompletionItem, ISuggestionTemplateData>
 		const text = append(container, $('.contents'));
 		const main = append(text, $('.main'));
 
-		data.iconLabel = new IconLabel(main, { supportHighlights: true });
+		data.iconLabel = new IconLabel(main, { supportHighlights: true, supportOcticons: true });
 		data.disposables.add(data.iconLabel);
 
 		data.typeLabel = append(main, $('span.type-label'));

src/vs/workbench/browser/actions/listCommands.ts

@@ -749,11 +749,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 		if (focused instanceof List || focused instanceof PagedList) {
 			const list = focused;
 
-			if (list.getSelection().length > 0) {
-				list.setSelection([]);
-			} else if (list.getFocus().length > 0) {
-				list.setFocus([]);
-			}
+			list.setSelection([]);
+			list.setFocus([]);
 		}
 
 		// ObjectTree
@@ -761,22 +758,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 			const list = focused;
 			const fakeKeyboardEvent = new KeyboardEvent('keydown');
 
-			if (list.getSelection().length > 0) {
-				list.setSelection([], fakeKeyboardEvent);
-			} else if (list.getFocus().length > 0) {
-				list.setFocus([], fakeKeyboardEvent);
-			}
+			list.setSelection([], fakeKeyboardEvent);
+			list.setFocus([], fakeKeyboardEvent);
 		}
 
 		// Tree
 		else if (focused) {
 			const tree = focused;
 
-			if (tree.getSelection().length) {
-				tree.clearSelection({ origin: 'keyboard' });
-			} else if (tree.getFocus()) {
-				tree.clearFocus({ origin: 'keyboard' });
-			}
+			tree.clearSelection({ origin: 'keyboard' });
+			tree.clearFocus({ origin: 'keyboard' });
 		}
 	}
 });

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

@@ -821,6 +821,9 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
 
 		// Update container
 		this.updateContainer();
+
+		// Notify group index change we created the entire grid
+		this.notifyGroupIndexChange();
 	}
 
 	private doCreateGridControlWithPreviousState(): boolean {

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

@@ -114,7 +114,7 @@ class ListElementRenderer implements IListRenderer<ListElement, IListElementTemp
 		const row2 = dom.append(rows, $('.quick-input-list-row'));
 
 		// Label
-		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true });
+		data.label = new IconLabel(row1, { supportHighlights: true, supportDescriptionHighlights: true, supportOcticons: true });
 
 		// Detail
 		const detailContainer = dom.append(row2, $('.quick-input-list-label-meta'));

src/vs/workbench/browser/parts/views/customView.ts

@@ -726,7 +726,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
 
 		const icon = DOM.append(container, DOM.$('.custom-view-tree-node-item-icon'));
 
-		const resourceLabel = this.labels.create(container, { supportHighlights: true, donotSupportOcticons: true });
+		const resourceLabel = this.labels.create(container, { supportHighlights: true });
 		const actionsContainer = DOM.append(resourceLabel.element, DOM.$('.actions'));
 		const actionBar = new ActionBar(actionsContainer, {
 			actionViewItemProvider: this.actionViewItemProvider

src/vs/workbench/contrib/files/browser/views/explorerViewer.ts

@@ -141,7 +141,7 @@ export class FilesRenderer implements ITreeRenderer<ExplorerItem, FuzzyScore, IF
 
 	renderTemplate(container: HTMLElement): IFileTemplateData {
 		const elementDisposable = Disposable.None;
-		const label = this.labels.create(container, { supportHighlights: true, donotSupportOcticons: true });
+		const label = this.labels.create(container, { supportHighlights: true });
 
 		return { elementDisposable, label, container };
 	}

src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts

@@ -196,8 +196,11 @@ suite('EditorGroupsService', () => {
 		const gridOrder = part.getGroups(GroupsOrder.GRID_APPEARANCE);
 		assert.equal(gridOrder.length, 3);
 		assert.equal(gridOrder[0], rootGroup);
+		assert.equal(gridOrder[0].index, 0);
 		assert.equal(gridOrder[1], rightGroup);
+		assert.equal(gridOrder[1].index, 1);
 		assert.equal(gridOrder[2], downGroup);
+		assert.equal(gridOrder[2].index, 2);
 
 		part.moveGroup(downGroup, rightGroup, GroupDirection.DOWN);
 		assert.equal(groupMovedCounter, 1);