Skip to content

Commit 8e46670

Browse files
authored
Merge pull request #655 from icsharpcode/stable-editor
Avoid pseudo-errors in C# output
2 parents 9b2a00b + 900d1a1 commit 8e46670

4 files changed

Lines changed: 166 additions & 18 deletions

File tree

vscode-extension/package.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,35 @@
684684
}
685685
}
686686
}
687+
],
688+
"languages": [
689+
{
690+
"id": "ilspy-code-cs",
691+
"aliases": [
692+
"ILSpy (C#)"
693+
],
694+
"icon": {
695+
"light": "resources/il-spy-modern-icon.svg",
696+
"dark": "resources/il-spy-modern-icon-dark.svg"
697+
}
698+
},
699+
{
700+
"id": "ilspy-code-il",
701+
"aliases": [
702+
"ILSpy (IL)"
703+
],
704+
"icon": {
705+
"light": "resources/il-spy-modern-icon.svg",
706+
"dark": "resources/il-spy-modern-icon-dark.svg"
707+
}
708+
}
709+
],
710+
"grammars": [
711+
{
712+
"language": "ilspy-code-cs",
713+
"scopeName": "source.ilspy-code-cs",
714+
"path": "resources/ilspy-code-cs.tmLanguage.json"
715+
}
687716
]
688717
},
689718
"scripts": {
Lines changed: 104 additions & 0 deletions
Loading
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"scopeName": "source.ilspy-code-cs",
3+
"patterns": [
4+
{
5+
"include": "source.cs"
6+
}
7+
]
8+
}

vscode-extension/src/decompiler/languageInfos.ts

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,104 @@
11
import { LanguageName } from "../protocol/LanguageName";
22

3+
const ILSPY_CODE_CS_LANG = "ilspy-code-cs";
4+
const ILSPY_CODE_IL_LANG = "ilspy-code-il";
5+
36
export interface LanguageInfo {
47
name: LanguageName;
58
displayName: string;
69
vsLanguageMode: string;
710
}
811

912
export const languageInfos = createLanguageMap([
10-
{ name: LanguageName.IL, displayName: "IL", vsLanguageMode: "il" },
13+
{
14+
name: LanguageName.IL,
15+
displayName: "IL",
16+
vsLanguageMode: ILSPY_CODE_IL_LANG,
17+
},
1118
{
1219
name: LanguageName.CSharp_1,
1320
displayName: "C# 1.0 / VS .NET",
14-
vsLanguageMode: "csharp",
21+
vsLanguageMode: ILSPY_CODE_CS_LANG,
1522
},
1623
{
1724
name: LanguageName.CSharp_2,
1825
displayName: "C# 2.0 / VS 2005",
19-
vsLanguageMode: "csharp",
26+
vsLanguageMode: ILSPY_CODE_CS_LANG,
2027
},
2128
{
2229
name: LanguageName.CSharp_3,
2330
displayName: "C# 3.0 / VS 2008",
24-
vsLanguageMode: "csharp",
31+
vsLanguageMode: ILSPY_CODE_CS_LANG,
2532
},
2633
{
2734
name: LanguageName.CSharp_4,
2835
displayName: "C# 4.0 / VS 2010",
29-
vsLanguageMode: "csharp",
36+
vsLanguageMode: ILSPY_CODE_CS_LANG,
3037
},
3138
{
3239
name: LanguageName.CSharp_5,
3340
displayName: "C# 5.0 / VS 2012",
34-
vsLanguageMode: "csharp",
41+
vsLanguageMode: ILSPY_CODE_CS_LANG,
3542
},
3643
{
3744
name: LanguageName.CSharp_6,
3845
displayName: "C# 6.0 / VS 2015",
39-
vsLanguageMode: "csharp",
46+
vsLanguageMode: ILSPY_CODE_CS_LANG,
4047
},
4148
{
4249
name: LanguageName.CSharp_7,
4350
displayName: "C# 7.0 / VS 2017",
44-
vsLanguageMode: "csharp",
51+
vsLanguageMode: ILSPY_CODE_CS_LANG,
4552
},
4653
{
4754
name: LanguageName.CSharp_7_1,
4855
displayName: "C# 7.1 / VS 2017.3",
49-
vsLanguageMode: "csharp",
56+
vsLanguageMode: ILSPY_CODE_CS_LANG,
5057
},
5158
{
5259
name: LanguageName.CSharp_7_2,
5360
displayName: "C# 7.2 / VS 2017.4",
54-
vsLanguageMode: "csharp",
61+
vsLanguageMode: ILSPY_CODE_CS_LANG,
5562
},
5663
{
5764
name: LanguageName.CSharp_7_3,
5865
displayName: "C# 7.3 / VS 2017.7",
59-
vsLanguageMode: "csharp",
66+
vsLanguageMode: ILSPY_CODE_CS_LANG,
6067
},
6168
{
6269
name: LanguageName.CSharp_8,
6370
displayName: "C# 8.0 / VS 2019",
64-
vsLanguageMode: "csharp",
71+
vsLanguageMode: ILSPY_CODE_CS_LANG,
6572
},
6673
{
6774
name: LanguageName.CSharp_9,
6875
displayName: "C# 9.0 / VS 2019.8",
69-
vsLanguageMode: "csharp",
76+
vsLanguageMode: ILSPY_CODE_CS_LANG,
7077
},
7178
{
7279
name: LanguageName.CSharp_10,
7380
displayName: "C# 10.0 / VS 2022",
74-
vsLanguageMode: "csharp",
81+
vsLanguageMode: ILSPY_CODE_CS_LANG,
7582
},
7683
{
7784
name: LanguageName.CSharp_11,
7885
displayName: "C# 11.0 / VS 2022.4",
79-
vsLanguageMode: "csharp",
86+
vsLanguageMode: ILSPY_CODE_CS_LANG,
8087
},
8188
{
8289
name: LanguageName.CSharp_12,
8390
displayName: "C# 12.0 / VS 2022.8",
84-
vsLanguageMode: "csharp",
91+
vsLanguageMode: ILSPY_CODE_CS_LANG,
8592
},
8693
{
8794
name: LanguageName.CSharp_13,
8895
displayName: "C# 13.0 / VS 2022.12",
89-
vsLanguageMode: "csharp",
96+
vsLanguageMode: ILSPY_CODE_CS_LANG,
9097
},
9198
{
9299
name: LanguageName.CSharp_14,
93100
displayName: "C# 14.0 / VS 2026",
94-
vsLanguageMode: "csharp",
101+
vsLanguageMode: ILSPY_CODE_CS_LANG,
95102
},
96103
]);
97104

0 commit comments

Comments
 (0)