Skip to content

Commit

Permalink
Merge branch 'main' into typical-landfowl
Browse files Browse the repository at this point in the history
  • Loading branch information
eleanorjboyd authored Jan 8, 2025
2 parents beb4d8c + 520f396 commit 06d1ac2
Show file tree
Hide file tree
Showing 227 changed files with 3,543 additions and 13,150 deletions.
21 changes: 1 addition & 20 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ src/test/proc.ts
src/test/smokeTest.ts
src/test/standardTest.ts
src/test/startupTelemetry.unit.test.ts
src/test/sourceMapSupport.test.ts
src/test/sourceMapSupport.unit.test.ts
src/test/testBootstrap.ts
src/test/testLogger.ts
src/test/testRunner.ts
Expand All @@ -44,7 +42,6 @@ src/test/utils/fs.ts

src/test/api.functional.test.ts

src/test/testing/mocks.ts
src/test/testing/common/debugLauncher.unit.test.ts
src/test/testing/common/services/configSettingService.unit.test.ts

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

src/test/common/installer/channelManager.unit.test.ts
src/test/common/installer/pipInstaller.unit.test.ts
src/test/common/installer/installer.invalidPath.unit.test.ts
src/test/common/installer/pipEnvInstaller.unit.test.ts
src/test/common/installer/productPath.unit.test.ts

src/test/common/socketCallbackHandler.test.ts

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


src/test/python_files/formatting/dummy.ts

src/test/debugger/extension/adapter/adapter.test.ts
src/test/debugger/extension/adapter/outdatedDebuggerPrompt.unit.test.ts
src/test/debugger/extension/adapter/factory.unit.test.ts
src/test/debugger/extension/adapter/activator.unit.test.ts
src/test/debugger/extension/adapter/logging.unit.test.ts
src/test/debugger/extension/hooks/childProcessAttachHandler.unit.test.ts
src/test/debugger/extension/hooks/childProcessAttachService.unit.test.ts
src/test/debugger/utils.ts
src/test/debugger/common/protocolparser.test.ts
src/test/debugger/envVars.test.ts

src/test/telemetry/index.unit.test.ts
src/test/telemetry/envFileTelemetry.unit.test.ts

src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts
src/test/application/diagnostics/checks/pythonInterpreter.unit.test.ts
src/test/application/diagnostics/checks/invalidLaunchJsonDebugger.unit.test.ts
src/test/application/diagnostics/checks/powerShellActivation.unit.test.ts
src/test/application/diagnostics/checks/invalidPythonPathInDebugger.unit.test.ts
src/test/application/diagnostics/checks/envPathVariable.unit.test.ts
src/test/application/diagnostics/applicationDiagnostics.unit.test.ts
src/test/application/diagnostics/promptHandler.unit.test.ts
src/test/application/diagnostics/sourceMapSupportService.unit.test.ts
src/test/application/diagnostics/commands/ignore.unit.test.ts

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

src/client/extension.ts
src/client/sourceMapSupport.ts
src/client/startupTelemetry.ts

src/client/terminals/codeExecution/terminalCodeExecution.ts
Expand All @@ -158,25 +146,18 @@ src/client/activation/extensionSurvey.ts
src/client/activation/common/analysisOptions.ts
src/client/activation/languageClientMiddleware.ts

src/client/formatters/serviceRegistry.ts
src/client/formatters/helper.ts
src/client/formatters/dummyFormatter.ts
src/client/formatters/baseFormatter.ts

src/client/testing/serviceRegistry.ts
src/client/testing/main.ts
src/client/testing/configurationFactory.ts
src/client/testing/common/constants.ts
src/client/testing/common/testUtils.ts
src/client/testing/common/socketServer.ts
src/client/testing/common/runner.ts

src/client/common/helpers.ts
src/client/common/net/browser.ts
src/client/common/net/socket/socketCallbackHandler.ts
src/client/common/net/socket/socketServer.ts
src/client/common/net/socket/SocketStream.ts
src/client/common/editor.ts
src/client/common/contextKey.ts
src/client/common/experiments/telemetry.ts
src/client/common/platform/serviceRegistry.ts
Expand Down Expand Up @@ -261,7 +242,6 @@ src/client/debugger/extension/attachQuickPick/psProcessParser.ts
src/client/debugger/extension/attachQuickPick/picker.ts

src/client/application/serviceRegistry.ts
src/client/application/diagnostics/surceMapSupportService.ts
src/client/application/diagnostics/base.ts
src/client/application/diagnostics/applicationDiagnostics.ts
src/client/application/diagnostics/filter.ts
Expand All @@ -271,3 +251,4 @@ src/client/application/diagnostics/commands/ignore.ts
src/client/application/diagnostics/commands/factory.ts
src/client/application/diagnostics/commands/execVSCCommand.ts
src/client/application/diagnostics/commands/launchBrowser.ts

2 changes: 1 addition & 1 deletion .github/actions/build-vsix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ runs:
shell: bash

- name: Upload VSIX
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ inputs.artifact_name }}
path: ${{ inputs.vsix_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/lint/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:

- name: Run Ruff
run: |
python -m pip install -U ruff
python -m pip install -U "ruff"
python -m ruff check .
python -m ruff format --check
working-directory: python_files
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/smoke-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ runs:

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

Expand All @@ -61,6 +61,6 @@ runs:
env:
DISPLAY: 10
INSTALL_JUPYTER_EXTENSION: true
uses: GabrielBB/xvfb-action@v1.5
uses: GabrielBB/xvfb-action@v1.7
with:
run: node --no-force-async-hooks-checks ./out/test/smokeTest.js
157 changes: 157 additions & 0 deletions .github/commands.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
[
{
"type": "label",
"name": "*question",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*dev-question",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*extension-candidate",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*not-reproducible",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*out-of-scope",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "wont-fix",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*caused-by-extension",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "*as-designed",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "label",
"name": "L10N",
"assign": [
"csigs",
"TylerLeonhardt"
]
},
{
"type": "label",
"name": "*duplicate",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "comment",
"name": "verified",
"allowUsers": [
"@author"
],
"action": "updateLabels",
"addLabel": "verified",
"removeLabel": "author-verification-requested",
"requireLabel": "author-verification-requested",
"disallowLabel": "unreleased"
},
{
"type": "comment",
"name": "confirm",
"allowUsers": [
"cleidigh",
"usernamehw",
"gjsjohnmurray",
"IllusionMH"
],
"action": "updateLabels",
"addLabel": "confirmed",
"removeLabel": "confirmation-pending"
},
{
"type": "label",
"name": "*off-topic",
"action": "close",
"reason": "not_planned",
"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!"
},
{
"type": "comment",
"name": "gifPlease",
"allowUsers": [
"cleidigh",
"usernamehw",
"gjsjohnmurray",
"IllusionMH"
],
"action": "comment",
"addLabel": "info-needed",
"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!"
},
{
"type": "label",
"name": "*workspace-trust-docs",
"action": "close",
"reason": "not_planned",
"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."
},
{
"type": "label",
"name": "~verification-steps-needed",
"action": "updateLabels",
"addLabel": "verification-steps-needed",
"removeLabel": "~verification-steps-needed",
"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."
},
{
"type": "label",
"name": "~info-needed",
"action": "updateLabels",
"addLabel": "info-needed",
"removeLabel": "~info-needed",
"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!"
},
{
"type": "label",
"name": "~version-info-needed",
"action": "updateLabels",
"addLabel": "info-needed",
"removeLabel": "~version-info-needed",
"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!"
},
{
"type": "label",
"name": "~confirmation-needed",
"action": "updateLabels",
"addLabel": "info-needed",
"removeLabel": "~confirmation-needed",
"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!"
}
]
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ jobs:
env:
TEST_FILES_SUFFIX: testvirtualenvs
CI_PYTHON_VERSION: ${{ matrix.python }}
uses: GabrielBB/xvfb-action@v1.6
uses: GabrielBB/xvfb-action@v1.7
with:
run: npm run testSingleWorkspace
working-directory: ${{ env.special-working-directory }}
Expand All @@ -367,7 +367,7 @@ jobs:
- name: Run single-workspace tests
env:
CI_PYTHON_VERSION: ${{ matrix.python }}
uses: GabrielBB/xvfb-action@v1.6
uses: GabrielBB/xvfb-action@v1.7
with:
run: npm run testSingleWorkspace
working-directory: ${{ env.special-working-directory }}
Expand All @@ -376,7 +376,7 @@ jobs:
- name: Run multi-workspace tests
env:
CI_PYTHON_VERSION: ${{ matrix.python }}
uses: GabrielBB/xvfb-action@v1.6
uses: GabrielBB/xvfb-action@v1.7
with:
run: npm run testMultiWorkspace
working-directory: ${{ env.special-working-directory }}
Expand All @@ -385,7 +385,7 @@ jobs:
- name: Run debugger tests
env:
CI_PYTHON_VERSION: ${{ matrix.python }}
uses: GabrielBB/xvfb-action@v1.6
uses: GabrielBB/xvfb-action@v1.7
with:
run: npm run testDebugger
working-directory: ${{ env.special-working-directory }}
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/gen-issue-velocity.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Issues Summary

on:
schedule:
- cron: '0 0 * * 2' # Runs every Tuesday at midnight
workflow_dispatch:

jobs:
generate-summary:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install requests
- name: Run summary script
run: python scripts/issue_velocity_summary_script.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/issue-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [opened, reopened]

env:
TRIAGERS: '["karrtikr","karthiknadig","paulacamargo25","eleanorjboyd","anthonykim1"]'
TRIAGERS: '["karthiknadig","eleanorjboyd","anthonykim1"]'

permissions:
issues: write
Expand Down
Loading

0 comments on commit 06d1ac2

Please sign in to comment.