Merge branch 'master' into wrap-tabs

.gitignore

@@ -32,3 +32,5 @@ coverage/
 test_data/
 test-results/
 yarn-error.log
+vscode.lsif
+vscode.db

.vscode/searches/es6.code-search

@@ -2,40 +2,26 @@
 # Flags: CaseSensitive WordMatch
 # ContextLines: 2
 
-12 results - 4 files
+10 results - 2 files
 
-src/vs/base/browser/dom.ts:
+monaco • src/vs/base/browser/dom.ts:
  83 };
  84 
  85: /** @deprecated ES6 - use classList*/
- 86 export const hasClass: (node: HTMLElement | SVGElement, className: string) => boolean = _classList.hasClass.bind(_classList);
+ 86 export function hasClass(node: HTMLElement | SVGElement, className: string): boolean { return _classList.hasClass(node, className); }
  87: /** @deprecated ES6 - use classList*/
- 88 export const addClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.addClass.bind(_classList);
+ 88 export function addClass(node: HTMLElement | SVGElement, className: string): void { return _classList.addClass(node, className); }
  89: /** @deprecated ES6 - use classList*/
- 90 export const addClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
+ 90 export function addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.addClasses(node, ...classNames); }
  91: /** @deprecated ES6 - use classList*/
- 92 export const removeClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.removeClass.bind(_classList);
+ 92 export function removeClass(node: HTMLElement | SVGElement, className: string): void { return _classList.removeClass(node, className); }
  93: /** @deprecated ES6 - use classList*/
- 94 export const removeClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
+ 94 export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); }
  95: /** @deprecated ES6 - use classList*/
- 96 export const toggleClass: (node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
+ 96 export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); }
  97 
 
-src/vs/base/common/arrays.ts:
- 401 
- 402 /**
- 403: * @deprecated ES6: use `Array.find`
- 404 */
- 405 export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
-
-src/vs/base/common/objects.ts:
- 115 
- 116 /**
- 117: * @deprecated ES6
- 118 */
- 119 export function assign<T>(destination: T): T;
-
-src/vs/base/common/strings.ts:
+monaco • src/vs/base/common/strings.ts:
  15 
  16 /**
  17: * @deprecated ES6: use `String.padStart`

extensions/css-language-features/server/package.json

@@ -10,7 +10,7 @@
  "main": "./out/node/cssServerMain",
  "browser": "./dist/browser/cssServerMain",
  "dependencies": {
- "vscode-css-languageservice": "^4.3.3",
+ "vscode-css-languageservice": "^4.3.4",
  "vscode-languageserver": "7.0.0-next.3",
  "vscode-uri": "^2.1.2"
  },

extensions/css-language-features/server/yarn.lock

@@ -696,14 +696,14 @@ to-regex-range@^5.0.1:
  dependencies:
  is-number "^7.0.0"
 
-vscode-css-languageservice@^4.3.3:
- version "4.3.3"
- resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz#fcb8c7442ae7bb8fbe6ff1d3a514be8248bfb52f"
- integrity sha512-b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw==
+vscode-css-languageservice@^4.3.4:
+ version "4.3.4"
+ resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-4.3.4.tgz#8d8711b31f2b561f78c32e8c85a8584b0b6dc43b"
+ integrity sha512-/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ==
  dependencies:
  vscode-languageserver-textdocument "^1.0.1"
  vscode-languageserver-types "3.16.0-next.2"
- vscode-nls "^4.1.2"
+ vscode-nls "^5.0.0"
  vscode-uri "^2.1.2"
 
 vscode-jsonrpc@6.0.0-next.2:
@@ -736,10 +736,10 @@ vscode-languageserver@7.0.0-next.3:
  dependencies:
  vscode-languageserver-protocol "3.16.0-next.4"
 
-vscode-nls@^4.1.2:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz#ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"
- integrity sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==
+vscode-nls@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
+ integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==
 
 vscode-uri@^2.1.2:
  version "2.1.2"
@@ -789,15 +789,7 @@ y18n@^4.0.0:
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
-yargs-parser@13.1.2, yargs-parser@^13.1.1:
- version "13.1.2"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
- integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
- dependencies:
- camelcase "^5.0.0"
- decamelize "^1.2.0"
-
-yargs-parser@^13.1.2:
+yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
  version "13.1.2"
  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==

extensions/git/src/commands.ts

@@ -1867,8 +1867,7 @@ export class CommandCenter {
  });
 
  const name = inputTagName.replace(/^\.|\/\.|\.\.|~|\^|:|\/$|\.lock$|\.lock\/|\\|\*|\s|^\s*$|\.$/g, '-');
- const message = inputMessage || name;
- await repository.tag(name, message);
+ await repository.tag(name, inputMessage);
  }
 
  @command('git.deleteTag', { repository: true })

extensions/github/src/publish.ts

@@ -177,8 +177,9 @@ export async function publishRepository(gitAPI: GitAPI, repository?: Repository)
  }
 
  progress.report({ message: 'Uploading files', increment: 25 });
+ const branch = await repository.getBranch('HEAD');
  await repository.addRemote('origin', createdGithubRepository.clone_url);
- await repository.push('origin', 'master', true);
+ await repository.push('origin', branch.name, true);
 
  return createdGithubRepository;
  });

extensions/go/package.json

@@ -9,7 +9,7 @@
  "vscode": "*"
  },
  "scripts": {
- "update-grammar": "node ../../build/npm/update-grammar.js jeff-hykin/better-go-syntax source/generated.tmLanguage.json ./syntaxes/go.tmLanguage.json"
+ "update-grammar": "node ../../build/npm/update-grammar.js jeff-hykin/better-go-syntax export/generated.tmLanguage.json ./syntaxes/go.tmLanguage.json"
  },
  "contributes": {
  "languages": [