Skip to content

Commit ee903b0

Browse files
aiday-maraiday-mar
authored
Merge branch 'microsoft:main' into aiday/semanticScroll
2 parents 458d44c + 3e8a8ee commit ee903b0

File tree

74 files changed

+1060
-567
lines changed

Some content is hidden

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

74 files changed

+1060
-567
lines changed

‎.github/workflows/deep-classifier-runner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: ./actions/classifier-deep/apply/apply-labels
4747
with:
4848
configPath: classifier
49-
allowLabels: "needs more info|new release|error-telemetry|*english-please|translation-required"
49+
allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required"
5050
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
5151
manifestDbConnectionString: ${{secrets.MANIFEST_DB_CONNECTION_STRING}}
5252
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

‎.github/workflows/english-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
2525
cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
2626
nonEnglishLabel: "*english-please"
27-
needsMoreInfoLabel: "needs more info"
27+
needsMoreInfoLabel: "info-needed"
2828
translatorRequestedLabelPrefix: "translation-required-"
2929
translatorRequestedLabelColor: "c29cff"

‎.github/workflows/needs-more-info-closer.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Needs More Info Closer
1+
name: info-needed Closer
22
on:
33
schedule:
44
- cron: 20 11 * * * # 4:20am Redmond
@@ -17,12 +17,12 @@ jobs:
1717
ref: stable
1818
- name: Install Actions
1919
run: npm install --production --prefix ./actions
20-
- name: Run Needs More Info Closer
20+
- name: Run info-needed Closer
2121
uses: ./actions/needs-more-info-closer
2222
with:
2323
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
2424
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
25-
label: needs more info
25+
label: info-needed
2626
closeDays: 7
2727
additionalTeam: "cleidigh|usernamehw|gjsjohnmurray|IllusionMH"
2828
closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"

‎.github/workflows/on-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,6 @@ jobs:
8585
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
8686
cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
8787
nonEnglishLabel: "*english-please"
88-
needsMoreInfoLabel: "needs more info"
88+
needsMoreInfoLabel: "info-needed"
8989
translatorRequestedLabelPrefix: "translation-required-"
9090
translatorRequestedLabelColor: "c29cff"

‎.github/workflows/on-open.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
6060
cognitiveServicesAPIKey: ${{secrets.AZURE_TEXT_TRANSLATOR_KEY}}
6161
nonEnglishLabel: "*english-please"
62-
needsMoreInfoLabel: "needs more info"
62+
needsMoreInfoLabel: "info-needed"
6363
translatorRequestedLabelPrefix: "translation-required-"
6464
translatorRequestedLabelColor: "c29cff"

‎.vscode/notebooks/inbox.github-issues

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "$inbox -label:\"needs more info\" sort:created-desc"
10+
"value": "$inbox -label:\"info-needed\" sort:created-desc"
1111
},
1212
{
1313
"kind": 2,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
{
9393
"kind": 2,
9494
"language": "github-issues",
95-
"value": "$repos assignee:@me is:open type:issue -label:bug -label:\"needs more info\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry"
95+
"value": "$repos assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry"
9696
},
9797
{
9898
"kind": 1,
@@ -102,7 +102,7 @@
102102
{
103103
"kind": 2,
104104
"language": "github-issues",
105-
"value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"needs more info\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
105+
"value": "repo:microsoft/vscode assignee:@me is:open type:issue -label:\"info-needed\" -label:api -label:api-finalization -label:api-proposal -label:authentication -label:bisect-ext -label:bracket-pair-colorization -label:bracket-pair-guides -label:breadcrumbs -label:callhierarchy -label:chrome-devtools -label:code-lens -label:color-palette -label:comments -label:config -label:context-keys -label:css-less-scss -label:custom-editors -label:debug -label:debug-disassembly -label:dialogs -label:diff-editor -label:dropdown -label:editor -label:editor-autoclosing -label:editor-autoindent -label:editor-bracket-matching -label:editor-clipboard -label:editor-code-actions -label:editor-color-picker -label:editor-columnselect -label:editor-commands -label:editor-comments -label:editor-contrib -label:editor-core -label:editor-drag-and-drop -label:editor-error-widget -label:editor-find -label:editor-folding -label:editor-highlight -label:editor-hover -label:editor-indent-detection -label:editor-indent-guides -label:editor-input -label:editor-input-IME -label:editor-insets -label:editor-minimap -label:editor-multicursor -label:editor-parameter-hints -label:editor-render-whitespace -label:editor-rendering -label:editor-RTL -label:editor-scrollbar -label:editor-symbols -label:editor-synced-region -label:editor-textbuffer -label:editor-theming -label:editor-wordnav -label:editor-wrapping -label:emmet -label:engineering -label:error-list -label:extension-host -label:extension-recommendations -label:extensions -label:extensions-development -label:file-decorations -label:file-encoding -label:file-explorer -label:file-glob -label:file-io -label:file-watcher -label:font-rendering -label:formatting -label:getting-started -label:ghost-text -label:git -label:github -label:gpu -label:grammar -label:grid-view -label:html -label:i18n -label:icon-brand -label:icons-product -label:image-preview -label:inlay-hints -label:inline-completions -label:install-update -label:intellisense-config -label:interactive-window -label:ipc -label:issue-bot -label:issue-reporter -label:javascript -label:json -label:keybindings -label:keybindings-editor -label:keyboard-layout -label:L10N -label:label-provider -label:languages-basic -label:languages-diagnostics -label:languages-guessing -label:layout -label:lcd-text-rendering -label:list -label:live-server -label:log -label:markdown -label:marketplace -label:menus -label:merge-conflict -label:network -label:notebook -label:notebook-api -label:notebook-celltoolbar -label:notebook-diff -label:notebook-dnd -label:notebook-folding -label:notebook-globaltoolbar -label:notebook-ipynb -label:notebook-kernel -label:notebook-keybinding -label:notebook-layout -label:notebook-markdown -label:notebook-minimap -label:notebook-multiselect -label:notebook-output -label:notebook-perf -label:notebook-statusbar -label:open-editors -label:opener -label:outline -label:output -label:perf -label:perf-bloat -label:perf-startup -label:php -label:portable-mode -label:proxy -label:quick-open -label:quick-pick -label:references-viewlet -label:release-notes -label:remote -label:remote-connection -label:remote-explorer -label:remotehub -label:rename -label:sandbox -label:sash -label:scm -label:screencast-mode -label:search -label:search-api -label:search-editor -label:search-replace -label:semantic-tokens -label:settings-editor -label:settings-sync -label:settings-sync-server -label:shared-process -label:simple-file-dialog -label:smart-select -label:snap -label:snippets -label:splitview -label:suggest -label:sync-error-handling -label:table -label:tasks -label:telemetry -label:terminal -label:terminal-conpty -label:terminal-editors -label:terminal-external -label:terminal-links -label:terminal-local-echo -label:terminal-profiles -label:terminal-reconnection -label:terminal-rendering -label:terminal-tabs -label:terminal-winpty -label:testing -label:themes -label:timeline -label:timeline-git -label:titlebar -label:tokenization -label:touch/pointer -label:trackpad/scroll -label:tree-views -label:tree-widget -label:typehierarchy -label:typescript -label:undo-redo -label:uri -label:ux -label:variable-resolving -label:VIM -label:virtual-workspaces -label:vscode-build -label:vscode-website -label:web -label:webview -label:webview-views -label:workbench-actions -label:workbench-cli -label:workbench-diagnostics -label:workbench-dnd -label:workbench-editor-grid -label:workbench-editor-groups -label:workbench-editor-resolver -label:workbench-editors -label:workbench-electron -label:workbench-feedback -label:workbench-history -label:workbench-hot-exit -label:workbench-hover -label:workbench-launch -label:workbench-link -label:workbench-multiroot -label:workbench-notifications -label:workbench-os-integration -label:workbench-rapid-render -label:workbench-run-as-admin -label:workbench-state -label:workbench-status -label:workbench-tabs -label:workbench-touchbar -label:workbench-untitled-editors -label:workbench-views -label:workbench-welcome -label:workbench-window -label:workbench-zen -label:workspace-edit -label:workspace-symbols -label:workspace-trust -label:zoom"
106106
},
107107
{
108108
"kind": 1,
@@ -112,7 +112,7 @@
112112
{
113113
"kind": 2,
114114
"language": "github-issues",
115-
"value": "$repos assignee:@me is:open label:\"needs more info\""
115+
"value": "$repos assignee:@me is:open label:\"info-needed\""
116116
},
117117
{
118118
"kind": 1,

‎ThirdPartyNotices.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ This project incorporates components from the projects listed below. The origina
3131
24. ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
3232
25. James-Yu/LaTeX-Workshop version 8.19.1 (https://github.com/James-Yu/LaTeX-Workshop)
3333
26. jeff-hykin/better-c-syntax version 1.13.2 (https://github.com/jeff-hykin/better-c-syntax)
34-
27. jeff-hykin/better-cpp-syntax version 1.15.17 (https://github.com/jeff-hykin/better-cpp-syntax)
34+
27. jeff-hykin/better-cpp-syntax version 1.15.18 (https://github.com/jeff-hykin/better-cpp-syntax)
3535
28. jeff-hykin/better-objc-syntax version 0.2.0 (https://github.com/jeff-hykin/better-objc-syntax)
3636
29. jeff-hykin/better-objcpp-syntax version 0.1.0 (https://github.com/jeff-hykin/better-objcpp-syntax)
3737
30. jlelong/vscode-latex-basics version 1.3.0 (https://github.com/jlelong/vscode-latex-basics)
@@ -47,7 +47,7 @@ This project incorporates components from the projects listed below. The origina
4747
40. microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
4848
41. microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
4949
42. microsoft/vscode-markdown-tm-grammar version 1.0.0 (https://github.com/microsoft/vscode-markdown-tm-grammar)
50-
43. microsoft/vscode-mssql version 1.10.1 (https://github.com/microsoft/vscode-mssql)
50+
43. microsoft/vscode-mssql version 1.16.0 (https://github.com/microsoft/vscode-mssql)
5151
44. mmims/language-batchfile version 0.7.6 (https://github.com/mmims/language-batchfile)
5252
45. NVIDIA/cuda-cpp-grammar (https://github.com/NVIDIA/cuda-cpp-grammar)
5353
46. PowerShell/EditorSyntax version 1.0.0 (https://github.com/PowerShell/EditorSyntax)
@@ -73,7 +73,7 @@ This project incorporates components from the projects listed below. The origina
7373
66. TypeScript-TmLanguage version 1.0.0 (https://github.com/microsoft/TypeScript-TmLanguage)
7474
67. Unicode version 12.0.0 (https://home.unicode.org/)
7575
68. vscode-codicons version 0.0.14 (https://github.com/microsoft/vscode-codicons)
76-
69. vscode-logfile-highlighter version 2.11.0 (https://github.com/emilast/vscode-logfile-highlighter)
76+
69. vscode-logfile-highlighter version 2.15.0 (https://github.com/emilast/vscode-logfile-highlighter)
7777
70. vscode-swift version 0.0.1 (https://github.com/owensd/vscode-swift)
7878
71. vscode-win32-app-container-tokens (https://github.com/microsoft/vscode-win32-app-container-tokens)
7979
72. Web Background Synchronization (https://github.com/WICG/background-sync)

‎build/lib/compilation.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,15 @@ class MonacoGenerator {
188188
}
189189
}
190190
function generateApiProposalNames() {
191+
let eol;
192+
try {
193+
const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
194+
const match = /\r?\n/m.exec(src);
195+
eol = match ? match[0] : os.EOL;
196+
}
197+
catch {
198+
eol = os.EOL;
199+
}
191200
const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
192201
const proposalNames = new Set();
193202
const input = es.through();
@@ -214,7 +223,7 @@ function generateApiProposalNames() {
214223
'});',
215224
'export type ApiProposalName = keyof typeof allApiProposals;',
216225
'',
217-
].join(os.EOL);
226+
].join(eol);
218227
this.emit('data', new File({
219228
path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',
220229
contents: Buffer.from(contents)

‎build/lib/compilation.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,16 @@ class MonacoGenerator {
226226
}
227227

228228
function generateApiProposalNames() {
229+
let eol: string;
230+
231+
try {
232+
const src = fs.readFileSync('src/vs/workbench/services/extensions/common/extensionsApiProposals.ts', 'utf-8');
233+
const match = /\r?\n/m.exec(src);
234+
eol = match ? match[0] : os.EOL;
235+
} catch {
236+
eol = os.EOL;
237+
}
238+
229239
const pattern = /vscode\.proposed\.([a-zA-Z]+)\.d\.ts$/;
230240
const proposalNames = new Set<string>();
231241

@@ -254,7 +264,7 @@ function generateApiProposalNames() {
254264
'});',
255265
'export type ApiProposalName = keyof typeof allApiProposals;',
256266
'',
257-
].join(os.EOL);
267+
].join(eol);
258268

259269
this.emit('data', new File({
260270
path: 'vs/workbench/services/extensions/common/extensionsApiProposals.ts',

0 commit comments

Comments
 (0)