Skip to content

Commit 6ff1e38

Browse files
Christopher SuhADS Mergerkburtram
authored
Merge from vscode fcf3346 (#12295)
* Merge from vscode fcf3346 * Fix test build break * Update distro * Fix build errors * Update distro * Update REH build file * Update build task names for REL * Fix product build yaml * Fix product REH task name * Fix type in task name * Update linux build step * Update windows build tasks * Turn off server publish * Disable REH * Fix typo * Bump distro * Update vscode tests * Bump distro * Fix type in disto * Bump distro * Turn off docker build * Remove docker step from release Co-authored-by: ADS Merger <[email protected]> Co-authored-by: Karl Burtram <[email protected]>
1 parent 58d02b7 commit 6ff1e38

File tree

687 files changed

+10490
-9087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

687 files changed

+10490
-9087
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ RUN apt-get update \
7373
libnss3 \
7474
libxss1 \
7575
libasound2 \
76+
libgbm1 \
7677
xfonts-base \
7778
xfonts-terminus \
7879
fonts-noto \

.github/subscribers.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"label-to-subscribe-to": [
3+
"list of usernames to subscribe",
4+
"such as:",
5+
"JacksonKearl"
6+
]
7+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: "Deep Classifier: Runner"
2+
on:
3+
schedule:
4+
- cron: 0 * * * *
5+
repository_dispatch:
6+
types: [trigger-deep-classifier-runner]
7+
8+
jobs:
9+
main:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Actions
13+
uses: actions/checkout@v2
14+
with:
15+
repository: 'microsoft/vscode-github-triage-actions'
16+
ref: v35
17+
path: ./actions
18+
- name: Install Actions
19+
run: npm install --production --prefix ./actions
20+
- name: Install Additional Dependencies
21+
# Pulls in a bunch of other packages that arent needed for the rest of the actions
22+
run: npm install @azure/[email protected]
23+
- name: "Run Classifier: Scraper"
24+
uses: ./actions/classifier-deep/apply/fetch-sources
25+
with:
26+
# slightly overlapping to protect against issues slipping through the cracks if a run is delayed
27+
from: 80
28+
until: 5
29+
configPath: classifier
30+
blobContainerName: vscode-issue-classifier
31+
blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
32+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
33+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
34+
- name: Set up Python 3.7
35+
uses: actions/setup-python@v1
36+
with:
37+
python-version: 3.7
38+
- name: Install dependencies
39+
run: |
40+
python -m pip install --upgrade pip
41+
pip install --upgrade numpy scipy scikit-learn joblib nltk simpletransformers torch torchvision
42+
- name: "Run Classifier: Generator"
43+
run: python ./actions/classifier-deep/apply/generate-labels/main.py
44+
- name: "Run Classifier: Labeler"
45+
uses: ./actions/classifier-deep/apply/apply-labels
46+
with:
47+
configPath: classifier
48+
allowLabels: "needs more info|new release"
49+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
50+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "Deep Classifier: Scraper"
2+
on:
3+
repository_dispatch:
4+
types: [trigger-deep-classifier-scraper]
5+
6+
jobs:
7+
main:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Actions
11+
uses: actions/checkout@v2
12+
with:
13+
repository: 'microsoft/vscode-github-triage-actions'
14+
ref: v35
15+
path: ./actions
16+
- name: Install Actions
17+
run: npm install --production --prefix ./actions
18+
- name: Install Additional Dependencies
19+
# Pulls in a bunch of other packages that arent needed for the rest of the actions
20+
run: npm install @azure/[email protected]
21+
- name: "Run Classifier: Scraper"
22+
uses: ./actions/classifier-deep/train/fetch-issues
23+
with:
24+
blobContainerName: vscode-issue-classifier
25+
blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
26+
token: ${{secrets.ISSUE_SCRAPER_TOKEN}}
27+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Latest Release Monitor
2+
on:
3+
schedule:
4+
- cron: 0/5 * * * *
5+
repository_dispatch:
6+
types: [trigger-latest-release-monitor]
7+
8+
jobs:
9+
main:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout Actions
13+
uses: actions/checkout@v2
14+
with:
15+
repository: 'microsoft/vscode-github-triage-actions'
16+
path: ./actions
17+
ref: v35
18+
- name: Install Actions
19+
run: npm install --production --prefix ./actions
20+
- name: Install Storage Module
21+
run: npm install @azure/[email protected]
22+
- name: Run Latest Release Monitor
23+
uses: ./actions/latest-release-monitor
24+
with:
25+
storageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
26+
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
27+
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

.vscode/notebooks/api.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": 2,
1010
"language": "github-issues",
11-
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"August 2020\"",
11+
"value": "$repo=repo:microsoft/vscode\n$milestone=milestone:\"September 2020\"",
1212
"editable": true
1313
},
1414
{

.vscode/notebooks/my-work.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": 2,
1010
"language": "github-issues",
11-
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks\n\n// current milestone name\n$milestone=milestone:\"August 2020\"",
11+
"value": "// list of repos we work in\n$repos=repo:microsoft/vscode repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks\n\n// current milestone name\n$milestone=milestone:\"September 2020\"",
1212
"editable": true
1313
},
1414
{

.vscode/notebooks/verification.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{
1515
"kind": 2,
1616
"language": "github-issues",
17-
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"July 2020\"",
17+
"value": "$repos=repo:microsoft/vscode repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-remote-release repo:microsoft/vscode-js-debug repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-github-issue-notebooks \n$milestone=milestone:\"September 2020\"",
1818
"editable": true
1919
},
2020
{
Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
# Query: .innerHTML =
2+
# Flags: CaseSensitive WordMatch
3+
# Including: src/vs/**/*.{t,j}s
4+
# Excluding: *.test.ts
5+
# ContextLines: 3
6+
7+
22 results - 14 files
8+
9+
src/vs/base/browser/markdownRenderer.ts:
10+
161 const strValue = values[0];
11+
162 const span = element.querySelector(`div[data-code="${id}"]`);
12+
163 if (span) {
13+
164: span.innerHTML = strValue;
14+
165 }
15+
166 }).catch(err => {
16+
167 // ignore
17+
18+
243 return true;
19+
244 }
20+
245
21+
246: element.innerHTML = insane(renderedMarkdown, {
22+
247 allowedSchemes,
23+
248 // allowedTags should included everything that markdown renders to.
24+
249 // Since we have our own sanitize function for marked, it's possible we missed some tag so let insane make sure.
25+
26+
src/vs/base/browser/ui/contextview/contextview.ts:
27+
157 this.shadowRootHostElement = DOM.$('.shadow-root-host');
28+
158 this.container.appendChild(this.shadowRootHostElement);
29+
159 this.shadowRoot = this.shadowRootHostElement.attachShadow({ mode: 'open' });
30+
160: this.shadowRoot.innerHTML = `
31+
161 <style>
32+
162 ${SHADOW_ROOT_CSS}
33+
163 </style>
34+
35+
src/vs/code/electron-sandbox/issue/issueReporterMain.ts:
36+
57 const platformClass = platform.isWindows ? 'windows' : platform.isLinux ? 'linux' : 'mac';
37+
58 addClass(document.body, platformClass); // used by our fonts
38+
59
39+
60: document.body.innerHTML = BaseHtml();
40+
61 const issueReporter = new IssueReporter(configuration);
41+
62 issueReporter.render();
42+
63 document.body.style.display = 'block';
43+
44+
src/vs/code/electron-sandbox/processExplorer/processExplorerMain.ts:
45+
320 content.push(`.highest { color: ${styles.highlightForeground}; }`);
46+
321 }
47+
322
48+
323: styleTag.innerHTML = content.join('\n');
49+
324 if (document.head) {
50+
325 document.head.appendChild(styleTag);
51+
326 }
52+
53+
src/vs/editor/browser/view/domLineBreaksComputer.ts:
54+
107 allCharOffsets[i] = tmp[0];
55+
108 allVisibleColumns[i] = tmp[1];
56+
109 }
57+
110: containerDomNode.innerHTML = sb.build();
58+
111
59+
112 containerDomNode.style.position = 'absolute';
60+
113 containerDomNode.style.top = '10000';
61+
62+
src/vs/editor/browser/view/viewLayer.ts:
63+
507 private _finishRenderingNewLines(ctx: IRendererContext<T>, domNodeIsEmpty: boolean, newLinesHTML: string, wasNew: boolean[]): void {
64+
508 const lastChild = <HTMLElement>this.domNode.lastChild;
65+
509 if (domNodeIsEmpty || !lastChild) {
66+
510: this.domNode.innerHTML = newLinesHTML;
67+
511 } else {
68+
512 lastChild.insertAdjacentHTML('afterend', newLinesHTML);
69+
513 }
70+
71+
525 private _finishRenderingInvalidLines(ctx: IRendererContext<T>, invalidLinesHTML: string, wasInvalid: boolean[]): void {
72+
526 const hugeDomNode = document.createElement('div');
73+
527
74+
528: hugeDomNode.innerHTML = invalidLinesHTML;
75+
529
76+
530 for (let i = 0; i < ctx.linesLength; i++) {
77+
531 const line = ctx.lines[i];
78+
79+
src/vs/editor/browser/widget/diffEditorWidget.ts:
80+
2157
81+
2158 let domNode = document.createElement('div');
82+
2159 domNode.className = `view-lines line-delete ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`;
83+
2160: domNode.innerHTML = sb.build();
84+
2161 Configuration.applyFontInfoSlow(domNode, fontInfo);
85+
2162
86+
2163 let marginDomNode = document.createElement('div');
87+
2164 marginDomNode.className = 'inline-deleted-margin-view-zone';
88+
2165: marginDomNode.innerHTML = marginHTML.join('');
89+
2166 Configuration.applyFontInfoSlow(marginDomNode, fontInfo);
90+
2167
91+
2168 return {
92+
93+
src/vs/editor/standalone/browser/colorizer.ts:
94+
40 let text = domNode.firstChild ? domNode.firstChild.nodeValue : '';
95+
41 domNode.className += ' ' + theme;
96+
42 let render = (str: string) => {
97+
43: domNode.innerHTML = str;
98+
44 };
99+
45 return this.colorize(modeService, text || '', mimeType, options).then(render, (err) => console.error(err));
100+
46 }
101+
102+
src/vs/editor/standalone/browser/standaloneThemeServiceImpl.ts:
103+
212 if (!this._globalStyleElement) {
104+
213 this._globalStyleElement = dom.createStyleSheet();
105+
214 this._globalStyleElement.className = 'monaco-colors';
106+
215: this._globalStyleElement.innerHTML = this._css;
107+
216 this._styleElements.push(this._globalStyleElement);
108+
217 }
109+
218 return Disposable.None;
110+
111+
221 private _registerShadowDomContainer(domNode: HTMLElement): IDisposable {
112+
222 const styleElement = dom.createStyleSheet(domNode);
113+
223 styleElement.className = 'monaco-colors';
114+
224: styleElement.innerHTML = this._css;
115+
225 this._styleElements.push(styleElement);
116+
226 return {
117+
227 dispose: () => {
118+
119+
291 ruleCollector.addRule(generateTokensCSSForColorMap(colorMap));
120+
292
121+
293 this._css = cssRules.join('\n');
122+
294: this._styleElements.forEach(styleElement => styleElement.innerHTML = this._css);
123+
295
124+
296 TokenizationRegistry.setColorMap(colorMap);
125+
297 this._onColorThemeChange.fire(theme);
126+
127+
src/vs/editor/test/browser/controller/imeTester.ts:
128+
55 let content = this._model.getModelLineContent(i);
129+
56 r += content + '<br/>';
130+
57 }
131+
58: output.innerHTML = r;
132+
59 }
133+
60 }
134+
61
135+
136+
69 let title = document.createElement('div');
137+
70 title.className = 'title';
138+
71
139+
72: title.innerHTML = description + '. Type <strong>' + inputStr + '</strong>';
140+
73 container.appendChild(title);
141+
74
142+
75 let startBtn = document.createElement('button');
143+
144+
src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.ts:
145+
454
146+
455 private getMarkdownDragImage(templateData: MarkdownCellRenderTemplate): HTMLElement {
147+
456 const dragImageContainer = DOM.$('.cell-drag-image.monaco-list-row.focused.markdown-cell-row');
148+
457: dragImageContainer.innerHTML = templateData.container.outerHTML;
149+
458
150+
459 // Remove all rendered content nodes after the
151+
460 const markdownContent = dragImageContainer.querySelector('.cell.markdown')!;
152+
153+
611 return null;
154+
612 }
155+
613
156+
614: editorContainer.innerHTML = richEditorText;
157+
615
158+
616 return dragImageContainer;
159+
617 }
160+
161+
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts:
162+
375 addMouseoverListeners(outputNode, outputId);
163+
376 const content = data.content;
164+
377 if (content.type === RenderOutputType.Html) {
165+
378: outputNode.innerHTML = content.htmlContent;
166+
379 cellOutputContainer.appendChild(outputNode);
167+
380 domEval(outputNode);
168+
381 } else {
169+
170+
src/vs/workbench/contrib/webview/browser/pre/main.js:
171+
386 // apply default styles
172+
387 const defaultStyles = newDocument.createElement('style');
173+
388 defaultStyles.id = '_defaultStyles';
174+
389: defaultStyles.innerHTML = defaultCssRules;
175+
390 newDocument.head.prepend(defaultStyles);
176+
391
177+
392 applyStyles(newDocument, newDocument.body);
178+
179+
src/vs/workbench/contrib/welcome/walkThrough/browser/walkThroughPart.ts:
180+
281
181+
282 const content = model.main.textEditorModel.getValue(EndOfLinePreference.LF);
182+
283 if (!strings.endsWith(input.resource.path, '.md')) {
183+
284: this.content.innerHTML = content;
184+
285 this.updateSizeClasses();
185+
286 this.decorateContent();
186+
287 this.contentDisposables.push(this.keybindingService.onDidUpdateKeybindings(() => this.decorateContent()));
187+
188+
303 const innerContent = document.createElement('div');
189+
304 innerContent.classList.add('walkThroughContent'); // only for markdown files
190+
305 const markdown = this.expandMacros(content);
191+
306: innerContent.innerHTML = marked(markdown, { renderer });
192+
307 this.content.appendChild(innerContent);
193+
308
194+
309 model.snippets.forEach((snippet, i) => {

0 commit comments

Comments
 (0)