Merge branch 'master' into wrap-tabs

.vscode/searches/TrustedTypes.code-search

@@ -4,7 +4,7 @@
 # Excluding: *.test.ts
 # ContextLines: 3
 
-39 results - 23 files
+26 results - 15 files
 
 src/vs/base/browser/markdownRenderer.ts:
  156 const strValue = values[0];
@@ -32,45 +32,6 @@ src/vs/base/browser/ui/contextview/contextview.ts:
  162 ${SHADOW_ROOT_CSS}
  163 </style>
 
-src/vs/base/browser/ui/menu/menu.ts:
- 229 private initializeStyleSheet(container: HTMLElement): void {
- 230 if (isInShadowDOM(container)) {
- 231 this.styleSheet = createStyleSheet(container);
- 232: this.styleSheet.innerHTML = MENU_WIDGET_CSS;
- 233 } else {
- 234 if (!Menu.globalStyleSheet) {
- 235 Menu.globalStyleSheet = createStyleSheet();
- 236: Menu.globalStyleSheet.innerHTML = MENU_WIDGET_CSS;
- 237 }
- 238 
- 239 this.styleSheet = Menu.globalStyleSheet;
-
-src/vs/base/browser/ui/selectBox/selectBoxCustom.ts:
- 367 content.push(`.monaco-select-box-dropdown-container > .select-box-dropdown-list-container .monaco-list .monaco-list-row.option-disabled:hover { outline: none !important; }`);
- 368 }
- 369 
- 370: this.styleElement.innerHTML = content.join('\n');
- 371 
- 372 this.applyStyles();
- 373 }
-
- 680 });
- 681 
- 682 
- 683: container.innerHTML = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
- 684 elementWidth = dom.getTotalWidth(container);
- 685 }
- 686 
-
-src/vs/base/parts/quickinput/browser/quickInput.ts:
- 1693 }
- 1694 const newStyles = content.join('\n');
- 1695 if (newStyles !== this.ui.styleSheet.innerHTML) {
- 1696: this.ui.styleSheet.innerHTML = newStyles;
- 1697 }
- 1698 }
- 1699 }
-
 src/vs/code/electron-browser/workbench/workbench.js:
  124 const style = document.createElement('style');
  125 style.className = 'initialShellColors';
@@ -114,21 +75,13 @@ src/vs/code/electron-sandbox/issue/issueReporterMain.ts:
  250 }
 
 src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts:
- 282 this.listeners.clear();
- 283 
- 284 const tableHead = document.createElement('thead');
- 285: tableHead.innerHTML = `<tr>
- 286 <th scope="col" class="cpu">${localize('cpu', "CPU %")}</th>
- 287 <th scope="col" class="memory">${localize('memory', "Memory (MB)")}</th>
- 288 <th scope="col" class="pid">${localize('pid', "PID")}</th>
-
- 319 content.push(`.highest { color: ${styles.highlightForeground}; }`);
- 320 }
- 321 
- 322: styleTag.innerHTML = content.join('\n');
- 323 if (document.head) {
- 324 document.head.appendChild(styleTag);
- 325 }
+ 320 content.push(`.highest { color: ${styles.highlightForeground}; }`);
+ 321 }
+ 322 
+ 323: styleTag.innerHTML = content.join('\n');
+ 324 if (document.head) {
+ 325 document.head.appendChild(styleTag);
+ 326 }
 
 src/vs/editor/browser/view/domLineBreaksComputer.ts:
  107 allCharOffsets[i] = tmp[0];
@@ -221,41 +174,6 @@ src/vs/editor/test/browser/controller/imeTester.ts:
  74 
  75 let startBtn = document.createElement('button');
 
-src/vs/workbench/contrib/comments/browser/commentsView.ts:
- 109 content.push(`.comments-panel .comments-panel-container .text code { color: ${codeTextForegroundColor}; }`);
- 110 }
- 111 
- 112: styleElement.innerHTML = content.join('\n');
- 113 }
- 114 
- 115 private async renderComments(): Promise<void> {
-
-src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts:
- 692 }
- 693 
- 694 if (label) {
- 695: this._headingLabel.innerHTML = strings.escape(label);
- 696 this._headingLabel.setAttribute('aria-label', label);
- 697 }
- 698 }
-
- 916 font-weight: ${fontInfo.fontWeight};
- 917 }`);
- 918 
- 919: this._styleElement.innerHTML = content.join('\n');
- 920 
- 921 // Editor decorations should also be responsive to theme changes
- 922 this.setCommentEditorDecorations();
-
-src/vs/workbench/contrib/debug/browser/repl.ts:
- 306 const replInputLineHeight = this.replInput.getOption(EditorOption.lineHeight);
- 307 
- 308 // Set the font size, font family, line height and align the twistie to be centered, and input theme color
- 309: this.styleElement.innerHTML = `
- 310 .repl .repl-tree .expression {
- 311 font-size: ${fontSize}px;
- 312 font-family: ${fontFamily};
-
 src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
  454 
  455 private getMarkdownDragImage(templateData: MarkdownCellRenderTemplate): HTMLElement {
@@ -265,21 +183,13 @@ src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
  459 // Remove all rendered content nodes after the
  460 const markdownContent = dragImageContainer.querySelector('.cell.markdown')!;
 
- 598 
- 599 private getDragImageImpl(templateData: BaseCellRenderTemplate, editor: ICodeEditor, type: 'code' | 'markdown'): HTMLElement | null {
- 600 const dragImageContainer = DOM.$(`.cell-drag-image.monaco-list-row.focused.${type}-cell-row`);
- 601: dragImageContainer.innerHTML = templateData.container.innerHTML;
- 602 
- 603 const editorContainer = dragImageContainer.querySelector('.cell-editor-container');
- 604 if (!editorContainer) {
-
- 610 return null;
- 611 }
- 612 
- 613: editorContainer.innerHTML = richEditorText;
- 614 
- 615 return dragImageContainer;
- 616 }
+ 611 return null;
+ 612 }
+ 613 
+ 614: editorContainer.innerHTML = richEditorText;
+ 615 
+ 616 return dragImageContainer;
+ 617 }
 
 src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
  375 addMouseoverListeners(outputNode, outputId);
@@ -290,14 +200,6 @@ src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
  380 domEval(outputNode);
  381 } else {
 
-src/vs/workbench/contrib/webview/browser/webviewIconManager.ts:
- 61 }
- 62 }
- 63 }
- 64: this._styleElement.innerHTML = cssRules.join('\n');
- 65 }
- 66 }
-
 src/vs/workbench/contrib/webview/browser/pre/main.js:
  386 // apply default styles
  387 const defaultStyles = newDocument.createElement('style');
@@ -307,15 +209,6 @@ src/vs/workbench/contrib/webview/browser/pre/main.js:
  391 
  392 applyStyles(newDocument, newDocument.body);
 
-src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts:
- 328 
- 329 const prodName = container.querySelector('.welcomePage .title .caption') as HTMLElement;
- 330 if (prodName) {
- 331: prodName.innerHTML = this.productService.nameLong;
- 332 }
- 333 
- 334 recentlyOpened.then(({ workspaces }) => {
-
 src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts:
  281 
  282 const content = model.main.textEditorModel.getValue(EndOfLinePreference.LF);

build/azure-pipelines/linux/product-build-linux.yml

@@ -52,21 +52,25 @@ steps:
  git merge $(node -p "require('./package.json').distro")
  displayName: Merge distro
 
+- script: |
+ echo -n $VSCODE_ARCH > .build/arch
+ displayName: Prepare arch cache flag
+
 - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
  inputs:
- keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+ keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
  targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
  vstsFeed: 'npm-vscode'
 
 - script: |
  set -e
- CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+ CHILD_CONCURRENCY=1 npm_config_arch=$(NPM_ARCH) yarn --frozen-lockfile
  displayName: Install dependencies
  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
  inputs:
- keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+ keyfile: '.build/arch, build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
  targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
  vstsFeed: 'npm-vscode'
  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
@@ -85,64 +89,64 @@ steps:
 - script: |
  set -e
  VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
- yarn gulp vscode-linux-x64-min-ci
+ yarn gulp vscode-linux-$(VSCODE_ARCH)-min-ci
  VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
- yarn gulp vscode-reh-linux-x64-min-ci
+ yarn gulp vscode-reh-linux-$(VSCODE_ARCH)-min-ci
  VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
- yarn gulp vscode-reh-web-linux-x64-min-ci
+ yarn gulp vscode-reh-web-linux-$(VSCODE_ARCH)-min-ci
  displayName: Build
 
 - script: |
  set -e
  service xvfb start
  displayName: Start xvfb
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
  set -e
  DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
  displayName: Run unit tests (Electron)
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
  set -e
  DISPLAY=:10 yarn test-browser --build --browser chromium --tfs "Browser Unit Tests"
  displayName: Run unit tests (Browser)
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
  # Figure out the full absolute path of the product we just built
  # including the remote server and configure the integration tests
  # to run with these builds instead of running out of sources.
  set -e
- APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
+ APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
  APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
  INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
- VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+ VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
  DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
  displayName: Run integration tests (Electron)
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
  set -e
- VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
+ VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-$(VSCODE_ARCH)" \
  DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
  displayName: Run integration tests (Browser)
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
  set -e
- APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
+ APP_ROOT=$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)
  APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
  INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
- VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+ VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-$(VSCODE_ARCH)" \
  DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
  displayName: Run remote integration tests (Electron)
- condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - task: PublishPipelineArtifact@0
  inputs:
- artifactName: crash-dump-linux
+ artifactName: 'crash-dump-linux-$(VSCODE_ARCH)'
  targetPath: .build/crashes
  displayName: 'Publish Crash Reports'
  continueOnError: true
@@ -157,15 +161,26 @@ steps:
 
 - script: |
  set -e
- yarn gulp "vscode-linux-x64-build-deb"
- yarn gulp "vscode-linux-x64-build-rpm"
- yarn gulp "vscode-linux-x64-prepare-snap"
- displayName: Build packages
+ yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-deb"
+ yarn gulp "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+ displayName: Build deb, rpm packages
+
+- script: |
+ set -e
+ yarn gulp "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+ displayName: Prepare snap package
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
+
+# needed for code signing
+- task: UseDotNet@2
+ displayName: 'Install .NET Core SDK 2.x'
+ inputs:
+ version: 2.x
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
  inputs:
  ConnectedServiceName: 'ESRP CodeSign'
- FolderPath: '.build/linux/rpm/x86_64'
+ FolderPath: '.build/linux/rpm'
  Pattern: '*.rpm'
  signConfigType: inlineSignParams
  inlineOperation: |
@@ -186,14 +201,16 @@ steps:
  AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
  AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
  VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+ VSCODE_ARCH="$(VSCODE_ARCH)" \
  ./build/azure-pipelines/linux/publish.sh
  displayName: Publish
 
 - task: PublishPipelineArtifact@0
  displayName: 'Publish Pipeline Artifact'
  inputs:
- artifactName: snap-x64
+ artifactName: 'snap-$(VSCODE_ARCH)'
  targetPath: .build/linux/snap-tarball
+ condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64'))
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
  displayName: 'Component Detection'