VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2022-01-06 09:06:56 -08:00
committed by GitHub
co-authored by ADS Merger
parent fd2736b6a6
commit 2bc6a0cd01
2099 changed files with 79520 additions and 43813 deletions
+4
View File
@@ -1,5 +1,9 @@
src/**
notebook/**
extension-browser.webpack.config.js
extension.webpack.config.js
esbuild.js
cgmanifest.json
yarn.lock
webpack.config.js
tsconfig.json
+11 -1
View File
@@ -14,12 +14,22 @@ export async function activate(ctx: {
throw new Error('Could not load markdownItRenderer');
}
// Add katex styles to be copied to shadow dom
const link = document.createElement('link');
link.rel = 'stylesheet';
link.classList.add('markdown-style');
link.href = styleHref;
document.head.append(link);
// Add same katex style to root document.
// This is needed for the font to be loaded correctly inside the shadow dom.
//
// Seems like https://bugs.chromium.org/p/chromium/issues/detail?id=336876
const linkHead = document.createElement('link');
linkHead.rel = 'stylesheet';
linkHead.href = styleHref;
document.head.appendChild(linkHead);
const style = document.createElement('style');
style.classList.add('markdown-style');
style.textContent = `
@@ -31,6 +41,6 @@ export async function activate(ctx: {
const katex = require('@iktakahiro/markdown-it-katex');
markdownItRenderer.extendMarkdownIt((md: markdownIt.MarkdownIt) => {
return md.use(katex);
return md.use(katex, { globalGroup: true });
});
}
+1 -1
View File
@@ -40,7 +40,7 @@
],
"configuration": [
{
"title": "Markdown",
"title": "Markdown Math",
"properties": {
"markdown.math.enabled": {
"type": "boolean",
+2 -2
View File
@@ -1,5 +1,5 @@
{
"displayName": "Markdown Math",
"description": "Adds math support to markdown in notebooks.",
"config.markdown.math.enabled": "Enable/disable rendering math in the built-in markdown preview."
"description": "Adds math support to Markdown in notebooks.",
"config.markdown.math.enabled": "Enable/disable rendering math in the built-in Markdown preview."
}
@@ -3,6 +3,10 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
<<<<<<< HEAD:extensions/markdown-math/preview-styles/index.css
.katex-error {
color: var(--vscode-editorError-foreground);
}
=======
export const flatTestItemDelimiter = ' ';
>>>>>>> cb7b7da0a4bb2b45f0b6092e42fd1ca385938f09:src/vs/workbench/contrib/testing/browser/explorerProjections/display.ts
+3 -2
View File
@@ -4,12 +4,13 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
declare function require(path: string): any;
const enabledSetting = 'markdown.math.enabled';
export function activate(context: vscode.ExtensionContext) {
function isEnabled(): boolean {
const config = vscode.workspace.getConfiguration('markdown');
console.log(config.get<boolean>('math.enabled', true));
return config.get<boolean>('math.enabled', true);
}
@@ -23,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
extendMarkdownIt(md: any) {
if (isEnabled()) {
const katex = require('@iktakahiro/markdown-it-katex');
return md.use(katex);
return md.use(katex, { globalGroup: true });
}
return md;
}
+4
View File
@@ -1 +1,5 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../src/vs/vscode.d.ts'/>
+1 -8
View File
@@ -2,14 +2,7 @@
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "./out",
"experimentalDecorators": true,
"lib": [
"es6",
"es2015.promise",
"es2019.array",
"es2020.string",
"dom"
]
"types": []
},
"include": [
"src/**/*"