Skip to content

Commit 897977f

Browse files
authored
Merge branch 'main' into witty-walrus
2 parents dfd8e9a + f3675b0 commit 897977f

File tree

22 files changed

+854
-299
lines changed

22 files changed

+854
-299
lines changed

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

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

3333
# Jedi LS depends on dataclasses which is not in the stdlib in Python 3.7.
3434
- name: Use Python 3.9 for JediLSP
35-
uses: actions/setup-python@v5
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version: 3.9
3838
cache: 'pip'

.github/actions/lint/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Install Node
13-
uses: actions/setup-node@v4
13+
uses: actions/setup-node@v5
1414
with:
1515
node-version: ${{ inputs.node_version }}
1616
cache: 'npm'
@@ -36,7 +36,7 @@ runs:
3636
shell: bash
3737

3838
- name: Install Python
39-
uses: actions/setup-python@v5
39+
uses: actions/setup-python@v6
4040
with:
4141
python-version: '3.x'
4242
cache: 'pip'
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
applyTo: '**'
3+
description: This document describes how to deal with learnings that you make. (meta instruction)
4+
---
5+
6+
This document describes how to deal with learnings that you make.
7+
It is a meta-instruction file.
8+
9+
Structure of learnings:
10+
11+
- Each instruction file has a "Learnings" section.
12+
- Each learning has a counter that indicates how often that learning was useful (initially 1).
13+
- Each learning has a 1 sentence description of the learning that is clear and concise.
14+
15+
Example:
16+
17+
```markdown
18+
## Learnings
19+
20+
- Prefer `const` over `let` whenever possible (1)
21+
- Avoid `any` type (3)
22+
```
23+
24+
When the user tells you "learn!", you should:
25+
26+
- extract a learning from the recent conversation
27+
_ identify the problem that you created
28+
_ identify why it was a problem
29+
_ identify how you were told to fix it/how the user fixed it
30+
_ generate only one learning (1 sentence) that helps to summarize the insight gained
31+
- then, add the reflected learning to the "Learnings" section of the most appropriate instruction file
32+
33+
Important: Whenever a learning was really useful, increase the counter!!
34+
When a learning was not useful and just caused more problems, decrease the counter.

.github/instructions/testing_feature_area.instructions.md

Lines changed: 181 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
runs-on: ubuntu-latest
131131
steps:
132132
- name: Use Python ${{ env.PYTHON_VERSION }}
133-
uses: actions/setup-python@v5
133+
uses: actions/setup-python@v6
134134
with:
135135
python-version: ${{ env.PYTHON_VERSION }}
136136

@@ -155,7 +155,7 @@ jobs:
155155
python -m pip install --upgrade -r build/test-requirements.txt
156156
157157
- name: Run Pyright
158-
uses: jakebailey/pyright-action@b5d50e5cde6547546a5c4ac92e416a8c2c1a1dfe # v2.3.2
158+
uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
159159
with:
160160
version: 1.1.308
161161
working-directory: 'python_files'
@@ -184,7 +184,7 @@ jobs:
184184
persist-credentials: false
185185

186186
- name: Use Python ${{ matrix.python }}
187-
uses: actions/setup-python@v5
187+
uses: actions/setup-python@v6
188188
with:
189189
python-version: ${{ matrix.python }}
190190

@@ -236,7 +236,7 @@ jobs:
236236
sparse-checkout-cone-mode: false
237237

238238
- name: Install Node
239-
uses: actions/setup-node@v4
239+
uses: actions/setup-node@v5
240240
with:
241241
node-version: ${{ env.NODE_VERSION }}
242242
cache: 'npm'
@@ -252,7 +252,7 @@ jobs:
252252
run: npx @vscode/l10n-dev@latest export ./src
253253

254254
- name: Install Python ${{ matrix.python }}
255-
uses: actions/setup-python@v5
255+
uses: actions/setup-python@v6
256256
with:
257257
python-version: ${{ matrix.python }}
258258

.github/workflows/gen-issue-velocity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@v5
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: '3.x'
2525

.github/workflows/pr-check.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
runs-on: ubuntu-latest
102102
steps:
103103
- name: Use Python ${{ env.PYTHON_VERSION }}
104-
uses: actions/setup-python@v5
104+
uses: actions/setup-python@v6
105105
with:
106106
python-version: ${{ env.PYTHON_VERSION }}
107107

@@ -138,7 +138,7 @@ jobs:
138138
python -m pip install --upgrade -r build/test-requirements.txt
139139
140140
- name: Run Pyright
141-
uses: jakebailey/pyright-action@b5d50e5cde6547546a5c4ac92e416a8c2c1a1dfe # v2.3.2
141+
uses: jakebailey/pyright-action@6cabc0f01c4994be48fd45cd9dbacdd6e1ee6e5e # v2.3.3
142142
with:
143143
version: 1.1.308
144144
working-directory: 'python_files'
@@ -168,7 +168,7 @@ jobs:
168168
persist-credentials: false
169169

170170
- name: Use Python ${{ matrix.python }}
171-
uses: actions/setup-python@v5
171+
uses: actions/setup-python@v6
172172
with:
173173
python-version: ${{ matrix.python }}
174174

@@ -233,7 +233,7 @@ jobs:
233233
sparse-checkout-cone-mode: false
234234

235235
- name: Install Node
236-
uses: actions/setup-node@v4
236+
uses: actions/setup-node@v5
237237
with:
238238
node-version: ${{ env.NODE_VERSION }}
239239
cache: 'npm'
@@ -249,7 +249,7 @@ jobs:
249249
run: npx @vscode/l10n-dev@latest export ./src
250250

251251
- name: Use Python ${{ matrix.python }}
252-
uses: actions/setup-python@v5
252+
uses: actions/setup-python@v6
253253
with:
254254
python-version: ${{ matrix.python }}
255255

@@ -505,7 +505,7 @@ jobs:
505505
sparse-checkout-cone-mode: false
506506

507507
- name: Install Node
508-
uses: actions/setup-node@v4
508+
uses: actions/setup-node@v5
509509
with:
510510
node-version: ${{ env.NODE_VERSION }}
511511
cache: 'npm'
@@ -520,7 +520,7 @@ jobs:
520520
run: npx @vscode/l10n-dev@latest export ./src
521521

522522
- name: Use Python ${{ env.PYTHON_VERSION }}
523-
uses: actions/setup-python@v5
523+
uses: actions/setup-python@v6
524524
with:
525525
python-version: ${{ env.PYTHON_VERSION }}
526526
cache: 'pip'

.github/workflows/pr-file-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
failure-message: 'TypeScript code was edited without also editing a ${file-pattern} file; see the Testing page in our wiki on testing guidelines (the ${skip-label} label can be used to pass this check)'
4545

4646
- name: 'Ensure PR has an associated issue'
47-
uses: actions/github-script@v7
47+
uses: actions/github-script@v8
4848
with:
4949
script: |
5050
const labels = context.payload.pull_request.labels.map(label => label.name);

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Python extension for Visual Studio Code
22

3-
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) with rich support for the [Python language](https://www.python.org/) (for all [actively supported Python versions](https://devguide.python.org/versions/#supported-versions)), providing access points for extensions to seamlessly integrate and offer support for IntelliSense (Pylance), debugging (Python Debugger), formatting, linting, code navigation, refactoring, variable explorer, test explorer, and more!
3+
A [Visual Studio Code](https://code.visualstudio.com/) [extension](https://marketplace.visualstudio.com/VSCode) with rich support for the [Python language](https://www.python.org/) (for all [actively supported Python versions](https://devguide.python.org/versions/#supported-versions)), providing access points for extensions to seamlessly integrate and offer support for IntelliSense (Pylance), debugging (Python Debugger), formatting, linting, code navigation, refactoring, variable explorer, test explorer, environment management (**NEW** Python Environments Extension).
44

55
## Support for [vscode.dev](https://vscode.dev/)
66

@@ -13,7 +13,7 @@ The Python extension will automatically install the following extensions by defa
1313

1414
- [Pylance](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-pylance) – performant Python language support
1515
- [Python Debugger](https://marketplace.visualstudio.com/items?itemName=ms-python.debugpy) – seamless debug experience with debugpy
16-
- [Python Environments](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-python-envs) – dedicated environment management (see below)
16+
- **(NEW)** [Python Environments](https://marketplace.visualstudio.com/items?itemName=ms-python.vscode-python-envs) – dedicated environment management (see below)
1717

1818
These extensions are optional dependencies, meaning the Python extension will remain fully functional if they fail to be installed. Any or all of these extensions can be [disabled](https://code.visualstudio.com/docs/editor/extension-marketplace#_disable-an-extension) or [uninstalled](https://code.visualstudio.com/docs/editor/extension-marketplace#_uninstall-an-extension) at the expense of some features. Extensions installed through the marketplace are subject to the [Marketplace Terms of Use](https://cdn.vsassets.io/v/M146_20190123.39/_content/Microsoft-Visual-Studio-Marketplace-Terms-of-Use.pdf).
1919

build/azure-pipeline.stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ extends:
128128
project: 'Monaco'
129129
definition: 593
130130
buildVersionToDownload: 'latestFromBranch'
131-
branchName: 'refs/heads/release/2025.12'
131+
branchName: 'refs/heads/release/2025.14'
132132
targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
133133
artifactName: 'bin-$(buildTarget)'
134134
itemPattern: |

0 commit comments

Comments
 (0)