Skip to content

Commit 0dd75bf

Browse files
committed
v3.25.2 revision
1 parent 32f277d commit 0dd75bf

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ All notable version changes will be recorded in this file.
66

77
***
88

9+
### [v3.25.2] revision
10+
11+
**Improve**:
12+
- `Debug`: Support one-click to start debugging for `probe-rs` flasher. Require extension [probe-rs.probe-rs-debugger](https://marketplace.visualstudio.com/items?itemName=probe-rs.probe-rs-debugger)
13+
14+
***
15+
916
### [v3.25.1] revision
1017

1118
**Improve**:

package.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"homepage": "https://em-ide.com",
3737
"license": "MIT",
3838
"description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/MIPS/RISC-V",
39-
"version": "3.25.1",
39+
"version": "3.25.2",
4040
"preview": false,
4141
"engines": {
4242
"vscode": "^1.67.0"
@@ -114,12 +114,6 @@
114114
"yaml": "^1.10.2"
115115
},
116116
"contributes": {
117-
"debuggers": [
118-
{
119-
"type": "eide.cortex-debug",
120-
"label": "EIDE (Cortex-Debug)"
121-
}
122-
],
123117
"terminal": {
124118
"profiles": [
125119
{

src/EIDEProject.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,10 +1685,14 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
16851685

16861686
//--
16871687

1688+
/**
1689+
* 检查文件是否已被排除
1690+
* @param path 要执行检查的源文件的路径,可以为虚拟路径,比如 '\<virual_root\>/abc.c'
1691+
*/
16881692
isExcluded(path: string): boolean {
1689-
const excList = this.GetConfiguration().config.excludeList.map((excpath) => this.resolveEnvVar(excpath));
1690-
const rePath = this.toRelativePath(path);
1691-
return excList.findIndex(excluded => rePath === excluded || rePath.startsWith(`${excluded}/`)) !== -1;
1693+
const excList = this.GetConfiguration().config.excludeList.map(p => this.resolveEnvVar(p));
1694+
const rePath = VirtualSource.isVirtualPath(path) ? path : this.toRelativePath(path);
1695+
return excList.findIndex(p => rePath === p || rePath.startsWith(`${p}/`)) !== -1;
16921696
}
16931697

16941698
protected addExclude(path: string): boolean {

0 commit comments

Comments
 (0)