Skip to content

Commit 06d1ac2

Browse files
authored
Merge branch 'main' into typical-landfowl
2 parents beb4d8c + 520f396 commit 06d1ac2

File tree

227 files changed

+3543
-13150
lines changed

Some content is hidden

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

227 files changed

+3543
-13150
lines changed

.eslintignore

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ src/test/proc.ts
1717
src/test/smokeTest.ts
1818
src/test/standardTest.ts
1919
src/test/startupTelemetry.unit.test.ts
20-
src/test/sourceMapSupport.test.ts
21-
src/test/sourceMapSupport.unit.test.ts
2220
src/test/testBootstrap.ts
2321
src/test/testLogger.ts
2422
src/test/testRunner.ts
@@ -44,7 +42,6 @@ src/test/utils/fs.ts
4442

4543
src/test/api.functional.test.ts
4644

47-
src/test/testing/mocks.ts
4845
src/test/testing/common/debugLauncher.unit.test.ts
4946
src/test/testing/common/services/configSettingService.unit.test.ts
5047

@@ -87,9 +84,7 @@ src/test/common/application/commands/reloadCommand.unit.test.ts
8784

8885
src/test/common/installer/channelManager.unit.test.ts
8986
src/test/common/installer/pipInstaller.unit.test.ts
90-
src/test/common/installer/installer.invalidPath.unit.test.ts
9187
src/test/common/installer/pipEnvInstaller.unit.test.ts
92-
src/test/common/installer/productPath.unit.test.ts
9388

9489
src/test/common/socketCallbackHandler.test.ts
9590

@@ -105,31 +100,25 @@ src/test/common/process/proc.unit.test.ts
105100
src/test/common/interpreterPathService.unit.test.ts
106101

107102

108-
src/test/python_files/formatting/dummy.ts
109103

110104
src/test/debugger/extension/adapter/adapter.test.ts
111105
src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
112106
src/test/debugger/extension/adapter/factory.unit.test.ts
113-
src/test/debugger/extension/adapter/activator.unit.test.ts
114107
src/test/debugger/extension/adapter/logging.unit.test.ts
115108
src/test/debugger/extension/hooks/childProcessAttachHandler.unit.test.ts
116109
src/test/debugger/extension/hooks/childProcessAttachService.unit.test.ts
117110
src/test/debugger/utils.ts
118-
src/test/debugger/common/protocolparser.test.ts
119111
src/test/debugger/envVars.test.ts
120112

121113
src/test/telemetry/index.unit.test.ts
122114
src/test/telemetry/envFileTelemetry.unit.test.ts
123115

124116
src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts
125117
src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts
126-
src/test/application/diagnostics/checks/invalidLaunchJsonDebugger.unit.test.ts
127118
src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts
128-
src/test/application/diagnostics/checks/invalidPythonPathInDebugger.unit.test.ts
129119
src/test/application/diagnostics/checks/envPathVariable.unit.test.ts
130120
src/test/application/diagnostics/applicationDiagnostics.unit.test.ts
131121
src/test/application/diagnostics/promptHandler.unit.test.ts
132-
src/test/application/diagnostics/sourceMapSupportService.unit.test.ts
133122
src/test/application/diagnostics/commands/ignore.unit.test.ts
134123

135124
src/test/performance/load.perf.test.ts
@@ -145,7 +134,6 @@ src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
145134
src/client/interpreter/display/index.ts
146135

147136
src/client/extension.ts
148-
src/client/sourceMapSupport.ts
149137
src/client/startupTelemetry.ts
150138

151139
src/client/terminals/codeExecution/terminalCodeExecution.ts
@@ -158,25 +146,18 @@ src/client/activation/extensionSurvey.ts
158146
src/client/activation/common/analysisOptions.ts
159147
src/client/activation/languageClientMiddleware.ts
160148

161-
src/client/formatters/serviceRegistry.ts
162-
src/client/formatters/helper.ts
163-
src/client/formatters/dummyFormatter.ts
164-
src/client/formatters/baseFormatter.ts
165149

166150
src/client/testing/serviceRegistry.ts
167151
src/client/testing/main.ts
168152
src/client/testing/configurationFactory.ts
169153
src/client/testing/common/constants.ts
170154
src/client/testing/common/testUtils.ts
171-
src/client/testing/common/socketServer.ts
172-
src/client/testing/common/runner.ts
173155

174156
src/client/common/helpers.ts
175157
src/client/common/net/browser.ts
176158
src/client/common/net/socket/socketCallbackHandler.ts
177159
src/client/common/net/socket/socketServer.ts
178160
src/client/common/net/socket/SocketStream.ts
179-
src/client/common/editor.ts
180161
src/client/common/contextKey.ts
181162
src/client/common/experiments/telemetry.ts
182163
src/client/common/platform/serviceRegistry.ts
@@ -261,7 +242,6 @@ src/client/debugger/extension/attachQuickPick/psProcessParser.ts
261242
src/client/debugger/extension/attachQuickPick/picker.ts
262243

263244
src/client/application/serviceRegistry.ts
264-
src/client/application/diagnostics/surceMapSupportService.ts
265245
src/client/application/diagnostics/base.ts
266246
src/client/application/diagnostics/applicationDiagnostics.ts
267247
src/client/application/diagnostics/filter.ts
@@ -271,3 +251,4 @@ src/client/application/diagnostics/commands/ignore.ts
271251
src/client/application/diagnostics/commands/factory.ts
272252
src/client/application/diagnostics/commands/execVSCCommand.ts
273253
src/client/application/diagnostics/commands/launchBrowser.ts
254+

.github/actions/build-vsix/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ runs:
8787
shell: bash
8888

8989
- name: Upload VSIX
90-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
9191
with:
9292
name: ${{ inputs.artifact_name }}
9393
path: ${{ inputs.vsix_name }}

.github/actions/lint/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ runs:
4343

4444
- name: Run Ruff
4545
run: |
46-
python -m pip install -U ruff
46+
python -m pip install -U "ruff"
4747
python -m ruff check .
4848
python -m ruff format --check
4949
working-directory: python_files

.github/actions/smoke-tests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ runs:
4343

4444
# Bits from the VSIX are reused by smokeTest.ts to speed things up.
4545
- name: Download VSIX
46-
uses: actions/download-artifact@v3
46+
uses: actions/download-artifact@v4
4747
with:
4848
name: ${{ inputs.artifact_name }}
4949

@@ -61,6 +61,6 @@ runs:
6161
env:
6262
DISPLAY: 10
6363
INSTALL_JUPYTER_EXTENSION: true
64-
uses: GabrielBB/xvfb-action@v1.5
64+
uses: GabrielBB/xvfb-action@v1.7
6565
with:
6666
run: node --no-force-async-hooks-checks ./out/test/smokeTest.js

.github/commands.json

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
[
2+
{
3+
"type": "label",
4+
"name": "*question",
5+
"action": "close",
6+
"reason": "not_planned",
7+
"comment": "We closed this issue because it is a question about using the Python extension for VS Code rather than an issue or feature request. We recommend browsing resources such as our [Python documentation](https://code.visualstudio.com/docs/languages/python) and our [Discussions page](https://github.com/microsoft/vscode-python/discussions). You may also find help on [StackOverflow](https://stackoverflow.com/questions/tagged/vscode-python), where the community has already answered thousands of similar questions. \n\nHappy Coding!"
8+
},
9+
{
10+
"type": "label",
11+
"name": "*dev-question",
12+
"action": "close",
13+
"reason": "not_planned",
14+
"comment": "We have a great extension developer community over on [GitHub discussions](https://github.com/microsoft/vscode-discussions/discussions) and [Slack](https://vscode-dev-community.slack.com/) where extension authors help each other. This is a great place for you to ask questions and find support.\n\nHappy Coding!"
15+
},
16+
{
17+
"type": "label",
18+
"name": "*extension-candidate",
19+
"action": "close",
20+
"reason": "not_planned",
21+
"comment": "We try to keep the Python extension lean and we think the functionality you're asking for is great for a VS Code extension. You might be able to find one that suits you in the [VS Code Marketplace](https://aka.ms/vscodemarketplace) already. If not, in a few simple steps you can get started [writing your own extension](https://aka.ms/vscodewritingextensions) or leverage our [tool extension template](https://github.com/microsoft/vscode-python-tools-extension-template) to get started. In addition, check out the [vscode-python-environments](https://github.com/microsoft/vscode-python-environments) as this may be the right spot for your request. \n\nHappy Coding!"
22+
},
23+
{
24+
"type": "label",
25+
"name": "*not-reproducible",
26+
"action": "close",
27+
"reason": "not_planned",
28+
"comment": "We closed this issue because we are unable to reproduce the problem with the steps you describe. Chances are we've already fixed your problem in a recent version of the Python extension, so we recommend updating to the latest version and trying again. If you continue to experience this issue, please ask us to reopen the issue and provide us with more detail.\n\nHappy Coding!"
29+
},
30+
{
31+
"type": "label",
32+
"name": "*out-of-scope",
33+
"action": "close",
34+
"reason": "not_planned",
35+
"comment": "We closed this issue because we [don't plan to address it](https://github.com/microsoft/vscode-python/wiki/Issue-Management#criteria-for-closing-out-of-scope-feature-requests) in the foreseeable future. If you disagree and feel that this issue is crucial: we are happy to listen and to reconsider.\n\nIf you wonder what we are up to, please see our [roadmap](https://aka.ms/pythonvscoderoadmap) and [issue reporting guidelines]( https://github.com/microsoft/vscode-python/wiki/Issue-Management).\n\nThanks for your understanding, and happy coding!"
36+
},
37+
{
38+
"type": "label",
39+
"name": "wont-fix",
40+
"action": "close",
41+
"reason": "not_planned",
42+
"comment": "We closed this issue because we [don't plan to address it](https://github.com/microsoft/vscode/wiki/Issue-Grooming#wont-fix-bugs).\n\nThanks for your understanding, and happy coding!"
43+
},
44+
{
45+
"type": "label",
46+
"name": "*caused-by-extension",
47+
"action": "close",
48+
"reason": "not_planned",
49+
"comment": "This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the [marketplace](https://aka.ms/vscodemarketplace) for VS Code. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting). If you don't know which extension is causing the problem, you can run `Help: Start extension bisect` from the command palette (F1) to help identify the problem extension.\n\nHappy Coding!"
50+
},
51+
{
52+
"type": "label",
53+
"name": "*as-designed",
54+
"action": "close",
55+
"reason": "not_planned",
56+
"comment": "The described behavior is how it is expected to work. If you disagree, please explain what is expected and what is not in more detail. See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
57+
},
58+
{
59+
"type": "label",
60+
"name": "L10N",
61+
"assign": [
62+
"csigs",
63+
"TylerLeonhardt"
64+
]
65+
},
66+
{
67+
"type": "label",
68+
"name": "*duplicate",
69+
"action": "close",
70+
"reason": "not_planned",
71+
"comment": "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for [similar existing issues](${duplicateQuery}). See also our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
72+
},
73+
{
74+
"type": "comment",
75+
"name": "verified",
76+
"allowUsers": [
77+
"@author"
78+
],
79+
"action": "updateLabels",
80+
"addLabel": "verified",
81+
"removeLabel": "author-verification-requested",
82+
"requireLabel": "author-verification-requested",
83+
"disallowLabel": "unreleased"
84+
},
85+
{
86+
"type": "comment",
87+
"name": "confirm",
88+
"allowUsers": [
89+
"cleidigh",
90+
"usernamehw",
91+
"gjsjohnmurray",
92+
"IllusionMH"
93+
],
94+
"action": "updateLabels",
95+
"addLabel": "confirmed",
96+
"removeLabel": "confirmation-pending"
97+
},
98+
{
99+
"type": "label",
100+
"name": "*off-topic",
101+
"action": "close",
102+
"reason": "not_planned",
103+
"comment": "Thanks for creating this issue. We think this issue is unactionable or unrelated to the goals of this project. Please follow our [issue reporting guidelines](https://aka.ms/vscodeissuereporting).\n\nHappy Coding!"
104+
},
105+
{
106+
"type": "comment",
107+
"name": "gifPlease",
108+
"allowUsers": [
109+
"cleidigh",
110+
"usernamehw",
111+
"gjsjohnmurray",
112+
"IllusionMH"
113+
],
114+
"action": "comment",
115+
"addLabel": "info-needed",
116+
"comment": "Thanks for reporting this issue! Unfortunately, it's hard for us to understand what issue you're seeing. Please help us out by providing a screen recording showing exactly what isn't working as expected. While we can work with most standard formats, `.gif` files are preferred as they are displayed inline on GitHub. You may find https://gifcap.dev helpful as a browser-based gif recording tool.\n\nIf the issue depends on keyboard input, you can help us by enabling screencast mode for the recording (`Developer: Toggle Screencast Mode` in the command palette). Lastly, please attach this file via the GitHub web interface as emailed responses will strip files out from the issue.\n\nHappy coding!"
117+
},
118+
{
119+
"type": "label",
120+
"name": "*workspace-trust-docs",
121+
"action": "close",
122+
"reason": "not_planned",
123+
"comment": "This issue appears to be the result of the new workspace trust feature shipped in June 2021. This security-focused feature has major impact on the functionality of VS Code. Due to the volume of issues, we ask that you take some time to review our [comprehensive documentation](https://aka.ms/vscode-workspace-trust) on the feature. If your issue is still not resolved, please let us know."
124+
},
125+
{
126+
"type": "label",
127+
"name": "~verification-steps-needed",
128+
"action": "updateLabels",
129+
"addLabel": "verification-steps-needed",
130+
"removeLabel": "~verification-steps-needed",
131+
"comment": "Friendly ping! Looks like this issue requires some further steps to be verified. Please provide us with the steps necessary to verify this issue."
132+
},
133+
{
134+
"type": "label",
135+
"name": "~info-needed",
136+
"action": "updateLabels",
137+
"addLabel": "info-needed",
138+
"removeLabel": "~info-needed",
139+
"comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting guidelines](https://aka.ms/pvsc-bug). Please take the time to review these and update the issue or even open a new one with the Report Issue command in VS Code (**Help > Report Issue**) to have all the right information collected for you.\n\nHappy Coding!"
140+
},
141+
{
142+
"type": "label",
143+
"name": "~version-info-needed",
144+
"action": "updateLabels",
145+
"addLabel": "info-needed",
146+
"removeLabel": "~version-info-needed",
147+
"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our issue reporting guidelines. Please take the time to review these and update the issue or even open a new one with the Report Issue command in VS Code (**Help > Report Issue**) to have all the right information collected for you.\n\nHappy Coding!"
148+
},
149+
{
150+
"type": "label",
151+
"name": "~confirmation-needed",
152+
"action": "updateLabels",
153+
"addLabel": "info-needed",
154+
"removeLabel": "~confirmation-needed",
155+
"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
156+
}
157+
]

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ jobs:
358358
env:
359359
TEST_FILES_SUFFIX: testvirtualenvs
360360
CI_PYTHON_VERSION: ${{ matrix.python }}
361-
uses: GabrielBB/xvfb-action@v1.6
361+
uses: GabrielBB/xvfb-action@v1.7
362362
with:
363363
run: npm run testSingleWorkspace
364364
working-directory: ${{ env.special-working-directory }}
@@ -367,7 +367,7 @@ jobs:
367367
- name: Run single-workspace tests
368368
env:
369369
CI_PYTHON_VERSION: ${{ matrix.python }}
370-
uses: GabrielBB/xvfb-action@v1.6
370+
uses: GabrielBB/xvfb-action@v1.7
371371
with:
372372
run: npm run testSingleWorkspace
373373
working-directory: ${{ env.special-working-directory }}
@@ -376,7 +376,7 @@ jobs:
376376
- name: Run multi-workspace tests
377377
env:
378378
CI_PYTHON_VERSION: ${{ matrix.python }}
379-
uses: GabrielBB/xvfb-action@v1.6
379+
uses: GabrielBB/xvfb-action@v1.7
380380
with:
381381
run: npm run testMultiWorkspace
382382
working-directory: ${{ env.special-working-directory }}
@@ -385,7 +385,7 @@ jobs:
385385
- name: Run debugger tests
386386
env:
387387
CI_PYTHON_VERSION: ${{ matrix.python }}
388-
uses: GabrielBB/xvfb-action@v1.6
388+
uses: GabrielBB/xvfb-action@v1.7
389389
with:
390390
run: npm run testDebugger
391391
working-directory: ${{ env.special-working-directory }}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Issues Summary
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * 2' # Runs every Tuesday at midnight
6+
workflow_dispatch:
7+
8+
jobs:
9+
generate-summary:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
16+
- name: Set up Python
17+
uses: actions/setup-python@v5
18+
with:
19+
python-version: '3.x'
20+
21+
- name: Install dependencies
22+
run: |
23+
python -m pip install --upgrade pip
24+
pip install requests
25+
26+
- name: Run summary script
27+
run: python scripts/issue_velocity_summary_script.py
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened, reopened]
66

77
env:
8-
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd","anthonykim1"]'
8+
TRIAGERS: '["karthiknadig","eleanorjboyd","anthonykim1"]'
99

1010
permissions:
1111
issues: write

0 commit comments

Comments
 (0)