Update to electron 1.6.x

.travis.yml

@@ -26,8 +26,8 @@ before_install:
  - git submodule update --init --recursive
  - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
  - source ./.nvm/nvm.sh
- - nvm install 6.6.0
- - nvm use 6.6.0
+ - nvm install 7.4.0
+ - nvm use 7.4.0
  - npm config set python `which python`
  - npm install -g gulp
  - if [ $TRAVIS_OS_NAME == "linux" ]; then

OSSREADME.json

@@ -68,7 +68,7 @@
 },
 {
  "name": "chromium",
- "version": "53.0.2785.143",
+ "version": "56.0.2924.87",
  "repositoryURL": "http://www.chromium.org/Home",
  "licenseDetail": [
  "BSD License",
@@ -104,14 +104,14 @@
 },
 {
  "name": "libchromiumcontent",
- "version": "53.0.2785.143",
+ "version": "56.0.2924.87",
  "license": "MIT",
  "repositoryURL": "https://github.com/electron/libchromiumcontent",
  "isProd": true
 },
 {
  "name": "nodejs",
- "version": "6.5.0",
+ "version": "7.4.0",
  "repositoryURL": "https://github.com/nodejs/node",
  "isProd": true
 },

appveyor.yml

@@ -3,7 +3,7 @@ environment:
  VSCODE_BUILD_VERBOSE: true
 
 install:
- - ps: Install-Product node 6.6.0 x64
+ - ps: Install-Product node 7.4.0 x64
  - npm install -g npm --silent
  - npm install -g gulp mocha --silent
 

package.json

@@ -1,7 +1,7 @@
 {
  "name": "code-oss-dev",
  "version": "1.12.0",
- "electronVersion": "1.4.6",
+ "electronVersion": "1.6.5",
  "distro": "fbef8e6a73f122b5c8b0034e2c1549e00a1815c3",
  "author": {
  "name": "Microsoft Corporation"
@@ -19,7 +19,7 @@
  "precommit": "node build/gulpfile.hygiene.js"
  },
  "dependencies": {
- "applicationinsights": "0.17.0",
+ "applicationinsights": "0.17.1",
  "chokidar": "bpasero/chokidar#vscode",
  "emmet": "ramya-rao-a/emmet#vscode",
  "fast-plist": "0.1.2",

src/typings/electron.d.ts

@@ -1318,6 +1318,18 @@ declare namespace Electron {
  * Note: This API is available only on Windows.
  */
  setThumbnailToolTip(toolTip: string): boolean;
+ /**
+ * Sets the application id, app icon, relaunch command and relaunch display name
+ * for the given window. appIconIndex should be set to 0 if the app icon
+ * file only has a single icon.
+ */
+ setAppDetails(options: {
+ appId?: string;
+ appIconPath?: string;
+ appIconIndex?: number;
+ relaunchCommand?: string;
+ relaunchDisplayName?: string;
+ }): void;
  /**
  * Same as webContents.showDefinitionForSelection().
  * Note: This API is available only on macOS.
@@ -1784,6 +1796,11 @@ declare namespace Electron {
  * Settings of web page’s features.
  */
  webPreferences?: WebPreferences;
+ /**
+ * Tab group name, allows opening the window as a native tab on macOS 10.12+.
+ * Windows with the same tabbing identifier will be grouped together.
+ */
+ tabbingIdentifier?: string;
  }
 
  type BrowserWindowType = BrowserWindowTypeLinux | BrowserWindowTypeMac | BrowserWindowTypeWindows;

src/vs/base/browser/dom.ts

@@ -746,6 +746,7 @@ export function isHTMLElement(o: any): o is HTMLElement {
 export const EventType = {
  // Mouse
  CLICK: 'click',
+ AUXCLICK: 'auxclick', // >= Chrome 56
  DBLCLICK: 'dblclick',
  MOUSE_UP: 'mouseup',
  MOUSE_DOWN: 'mousedown',

src/vs/base/parts/tree/browser/treeView.ts

@@ -488,6 +488,7 @@ export class TreeView extends HeightMap {
  this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mousedown', (e) => this.onMouseDown(e)));
  this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'mouseup', (e) => this.onMouseUp(e)));
  this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'click', (e) => this.onClick(e)));
+ this.viewListeners.push(DOM.addDisposableListener(this.wrapper, 'auxclick', (e) => this.onClick(e))); // >= Chrome 56
  this.viewListeners.push(DOM.addDisposableListener(this.domNode, 'contextmenu', (e) => this.onContextMenu(e)));
  this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Tap, (e) => this.onTap(e)));
  this.viewListeners.push(DOM.addDisposableListener(this.wrapper, Touch.EventType.Change, (e) => this.onTouchChange(e)));

src/vs/code/electron-main/window.ts

@@ -35,7 +35,6 @@ export interface IWindowCreationOptions {
  state: IWindowState;
  extensionDevelopmentPath?: string;
  isExtensionTestHost?: boolean;
- titleBarStyle?: 'native' | 'custom';
 }
 
 export enum WindowMode {
@@ -190,22 +189,35 @@ export class VSCodeWindow {
  show: !isFullscreenOrMaximized,
  title: product.nameLong,
  webPreferences: {
- 'backgroundThrottling': false // by default if Code is in the background, intervals and timeouts get throttled
+ 'backgroundThrottling': false, // by default if Code is in the background, intervals and timeouts get throttled,
+ disableBlinkFeatures: 'Auxclick' // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
  }
  };
 
  if (platform.isLinux) {
  options.icon = path.join(this.environmentService.appRoot, 'resources/linux/code.png'); // Windows and Mac are better off using the embedded icon(s)
  }
 
+ const windowConfig = this.configurationService.getConfiguration<IWindowSettings>('window');
+
+ let useNativeTabs = false;
+ if (windowConfig && windowConfig.nativeTabs) {
+ options.tabbingIdentifier = product.nameShort; // this opts in to sierra tabs
+ useNativeTabs = true;
+ }
+
  let useCustomTitleStyle = false;
- if (platform.isMacintosh && (!this.options.titleBarStyle || this.options.titleBarStyle === 'custom')) {
+ if (platform.isMacintosh && (!windowConfig || !windowConfig.titleBarStyle || windowConfig.titleBarStyle === 'custom')) {
  const isDev = !this.environmentService.isBuilt || !!config.extensionDevelopmentPath;
  if (!isDev) {
  useCustomTitleStyle = true; // not enabled when developing due to https://github.com/electron/electron/issues/3647
  }
  }
 
+ if (useNativeTabs) {
+ useCustomTitleStyle = false; // native tabs on sierra do not work with custom title style
+ }
+
  if (useCustomTitleStyle) {
  options.titleBarStyle = 'hidden';
  this.hiddenTitleBarStyle = true;
@@ -219,6 +231,15 @@ export class VSCodeWindow {
  this._win.setSheetOffset(22); // offset dialogs by the height of the custom title bar if we have any
  }
 
+ // Set relaunch command
+ if (platform.isWindows && product.win32AppUserModelId && typeof this._win.setAppDetails === 'function') {
+ this._win.setAppDetails({
+ appId: product.win32AppUserModelId,
+ relaunchCommand: `"${process.execPath}" -n`,
+ relaunchDisplayName: product.nameLong
+ });
+ }
+
  if (isFullscreenOrMaximized) {
  this.win.maximize();
 
@@ -769,4 +790,4 @@ export class VSCodeWindow {
 
  this._win = null; // Important to dereference the window object to allow for GC
  }
-}
+}

src/vs/code/electron-main/windows.ts

@@ -851,8 +851,7 @@ export class WindowsManager implements IWindowsMainService {
  vscodeWindow = new VSCodeWindow({
  state,
  extensionDevelopmentPath: configuration.extensionDevelopmentPath,
- isExtensionTestHost: !!configuration.extensionTestsPath,
- titleBarStyle: windowConfig ? windowConfig.titleBarStyle : void 0
+ isExtensionTestHost: !!configuration.extensionTestsPath
  },
  this.logService,
  this.environmentService,

src/vs/platform/windows/common/windows.ts

@@ -101,4 +101,5 @@ export interface IWindowSettings {
  autoDetectHighContrast: boolean;
  menuBarVisibility: MenuBarVisibility;
  newWindowDimensions: 'default' | 'inherit' | 'maximized' | 'fullscreen';
+ nativeTabs: boolean;
 }

src/vs/workbench/browser/media/part.css

@@ -53,7 +53,8 @@
 .monaco-workbench > .part > .title > .title-actions .action-label {
  display: block;
  height: 35px;
- width: 28px;
+ line-height: 35px;
+ min-width: 28px;
  background-size: 16px;
  background-position: center center;
  background-repeat: no-repeat;

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

@@ -34,6 +34,7 @@ export class NoTabsTitleControl extends TitleControl {
 
  // Detect mouse click
  this.toUnbind.push(DOM.addDisposableListener(this.titleContainer, DOM.EventType.CLICK, (e: MouseEvent) => this.onTitleClick(e)));
+ this.toUnbind.push(DOM.addDisposableListener(this.titleContainer, DOM.EventType.AUXCLICK, (e: MouseEvent) => this.onTitleClick(e)));
 
  // Editor Label
  this.editorLabel = this.instantiationService.createInstance(EditorLabel, this.titleContainer, void 0);

src/vs/workbench/electron-browser/main.contribution.ts

@@ -8,6 +8,7 @@
 import { Registry } from 'vs/platform/platform';
 import nls = require('vs/nls');
 import product from 'vs/platform/node/product';
+import * as os from 'os';
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actionRegistry';
@@ -269,6 +270,15 @@ if (isMacintosh) {
  'default': 'custom',
  'description': nls.localize('titleBarStyle', "Adjust the appearance of the window title bar. Changes require a full restart to apply.")
  };
+
+ // macOS Sierra (10.12.x = darwin 16.x) only
+ if (os.release().indexOf('16.') === 0) {
+ properties['window.nativeTabs'] = {
+ 'type': 'boolean',
+ 'default': false,
+ 'description': nls.localize('window.nativeTabs', "Enables macOS Sierra window tabs. Note that changes require a full restart to apply and that native tabs will disable a custom title bar style if configured.")
+ };
+ }
 }
 
 configurationRegistry.registerConfiguration({

src/vs/workbench/electron-browser/workbench.ts

@@ -673,11 +673,16 @@ export class Workbench implements IPartService {
  }
 
  const windowConfig = this.configurationService.getConfiguration<IWindowConfiguration>();
+ if (windowConfig && windowConfig.window) {
+ const useNativeTabs = windowConfig.window.nativeTabs;
+ if (useNativeTabs) {
+ return null; // native tabs on sierra do not work with custom title style
+ }
 
- const style = windowConfig && windowConfig.window && windowConfig.window.titleBarStyle;
-
- if (style === 'custom') {
- return style;
+  const style = windowConfig.window.titleBarStyle;
+ if (style === 'custom') {
+  return style;
+ }
  }
 
  return null;

src/vs/workbench/parts/files/browser/fileActions.contribution.ts

@@ -10,18 +10,15 @@ import { Action, IAction } from 'vs/base/common/actions';
 import { isMacintosh } from 'vs/base/common/platform';
 import { ActionItem, BaseActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Scope, IActionBarRegistry, Extensions as ActionBarExtensions, ActionBarContributor } from 'vs/workbench/browser/actionBarRegistry';
-import { IEditorInputActionContext, IEditorInputAction, EditorInputActionContributor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { GlobalNewUntitledFileAction, SaveFileAsAction, OpenFileAction, ShowOpenedFileInNewWindow, CopyPathAction, GlobalCopyPathAction, RevealInOSAction, GlobalRevealInOSAction, pasteIntoFocusedFilesExplorerViewItem, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, GlobalNewFileAction, GlobalNewFolderAction, RevertFileAction, SaveFilesAction, SaveAllAction, SaveFileAction, MoveFileToTrashAction, TriggerRenameFileAction, PasteFileAction, CopyFileAction, SelectResourceForCompareAction, CompareResourcesAction, NewFolderAction, NewFileAction, OpenToSideAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView } from 'vs/workbench/parts/files/browser/fileActions';
-import { RevertLocalChangesAction, AcceptLocalChangesAction, CONFLICT_RESOLUTION_SCHEME } from 'vs/workbench/parts/files/browser/saveErrorHandler';
+import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/parts/files/browser/saveErrorHandler';
 import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actionRegistry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { FileStat } from 'vs/workbench/parts/files/common/explorerViewModel';
 import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
-import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
-import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { OpenFolderAction, OpenFileFolderAction } from 'vs/workbench/browser/actions/fileActions';
 import { copyFocusedFilesExplorerViewItem, revealInOSFocusedFilesExplorerItem, openFocusedExplorerItemSideBySideCommand, copyPathOfFocusedExplorerItem, copyPathCommand, revealInExplorerCommand, revealInOSCommand, openFolderPickerCommand, openWindowCommand, openFileInNewWindowCommand, deleteFocusedFilesExplorerViewItemCommand, moveFocusedFilesExplorerViewItemToTrashCommand, renameFocusedFilesExplorerViewItemCommand } from 'vs/workbench/parts/files/browser/fileCommands';
 import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands';
@@ -174,38 +171,11 @@ class ExplorerViewersActionContributor extends ActionBarContributor {
  }
 }
 
-class ConflictResolutionActionContributor extends EditorInputActionContributor {
-
- constructor( @IInstantiationService private instantiationService: IInstantiationService) {
- super();
- }
-
- public hasActionsForEditorInput(context: IEditorInputActionContext): boolean {
- if (context.input instanceof DiffEditorInput && context.input.originalInput instanceof ResourceEditorInput) {
- const resource = context.input.originalInput.getResource();
-
- return resource && resource.scheme === CONFLICT_RESOLUTION_SCHEME; // scheme used for conflict resolution
- }
-
- return false;
- }
-
- public getActionsForEditorInput(context: IEditorInputActionContext): IEditorInputAction[] {
- return [
- this.instantiationService.createInstance(AcceptLocalChangesAction),
- this.instantiationService.createInstance(RevertLocalChangesAction)
- ];
- }
-}
-
 // Contribute to Viewers that show Files
 const actionBarRegistry = Registry.as<IActionBarRegistry>(ActionBarExtensions.Actionbar);
 actionBarRegistry.registerActionBarContributor(Scope.VIEWER, FilesViewerActionContributor);
 actionBarRegistry.registerActionBarContributor(Scope.VIEWER, ExplorerViewersActionContributor);
 
-// Contribute to Conflict Editor Inputs
-actionBarRegistry.registerActionBarContributor(Scope.EDITOR, ConflictResolutionActionContributor);
-
 // Contribute Global Actions
 const category = nls.localize('filesCategory', "Files");
 
@@ -340,4 +310,22 @@ function appendEditorTitleContextMenuItem(id: string, title: string, command: IC
  when: ContextKeyExpr.equals('resourceScheme', 'file'),
  group: '2_files'
  });
+}
+
+// Editor Title Menu for Conflict Resolution
+appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localize('acceptLocalChanges', "Use local changes and overwrite disk contents"), 'save-conflict-action-accept-changes', -10, acceptLocalChangesCommand);
+appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localize('revertLocalChanges', "Discard local changes and revert to content on disk"), 'save-conflict-action-revert-changes', -9, revertLocalChangesCommand);
+
+function appendSaveConflictEditorTitleAction(id: string, title: string, iconClass: string, order: number, command: ICommandHandler): void {
+
+ // Command
+ CommandsRegistry.registerCommand(id, command);
+
+ // Action
+ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
+ command: { id, title, iconClass },
+ when: ContextKeyExpr.equals(CONFLICT_RESOLUTION_CONTEXT, true),
+ group: 'navigation',
+ order
+ });
 }

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

@@ -75,19 +75,19 @@
  background-image: url('split-editor-horizontal-inverse.svg');
 }
 
-.monaco-workbench .conflict-editor-action.accept-changes {
+.monaco-workbench .save-conflict-action-accept-changes {
  background: url('check.svg') center center no-repeat;
 }
 
-.vs-dark .monaco-workbench .conflict-editor-action.accept-changes {
+.vs-dark .monaco-workbench .save-conflict-action-accept-changes {
  background: url('check-inverse.svg') center center no-repeat;
 }
 
-.monaco-workbench .conflict-editor-action.revert-changes {
+.monaco-workbench .save-conflict-action-revert-changes {
  background: url('undo.svg') center center no-repeat;
 }
 
-.vs-dark .monaco-workbench .conflict-editor-action.revert-changes {
+.vs-dark .monaco-workbench .save-conflict-action-revert-changes {
  background: url('undo-inverse.svg') center center no-repeat;
 }