Skip to content

Commit d576c7f

Browse files
author
Andrew Hall
authored
update razor and fuse on (#8047)
2 parents 5b2cc8c + aea3ab3 commit d576c7f

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
- Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
55

66
# 2.69.x
7+
* Bump razor to 9.0.0-preview.25156.2 (PR: [#8047](https://github.com/dotnet/vscode-csharp/pull/8047))
8+
* Enable FUSE by default
9+
* Improve solution load performance (#11591) (PR: [#11591](https://github.com/dotnet/razor/pull/11591))
10+
* Make logging fall into the pit of success (#11581) (PR: [#11581](https://github.com/dotnet/razor/pull/11581))
711
* Bump xamlTools to 17.14.35904.287 (PR: [#8042](https://github.com/dotnet/vscode-csharp/pull/8042))
812

913
# 2.68.x

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"defaults": {
4040
"roslyn": "4.14.0-2.25120.5",
4141
"omniSharp": "1.39.12",
42-
"razor": "9.0.0-preview.25125.9",
42+
"razor": "9.0.0-preview.25156.2",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
4444
"xamlTools": "17.14.35904.287"
4545
},
@@ -1519,7 +1519,7 @@
15191519
"razor.languageServer.forceRuntimeCodeGeneration": {
15201520
"type": "boolean",
15211521
"scope": "machine-overridable",
1522-
"default": null,
1522+
"default": true,
15231523
"description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
15241524
"order": 90
15251525
},

src/razor/src/razorLanguageServerOptionsResolver.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,7 @@ export function resolveRazorLanguageServerOptions(
2323
const usingOmniSharp =
2424
!getCSharpDevKit() && vscodeApi.workspace.getConfiguration().get<boolean>('dotnet.server.useOmnisharp');
2525

26-
const hotReload = vscodeApi.workspace.getConfiguration('csharp.experimental.debug').get<boolean>('hotReload');
27-
28-
let forceRuntimeCodeGeneration = serverConfig.get<boolean | null>('forceRuntimeCodeGeneration');
29-
30-
if (forceRuntimeCodeGeneration === null && hotReload) {
31-
logger.logMessage(
32-
'Hot Reload is enabled so treating "razor.languageServer.forceRuntimeCodeGeneration" as true. To override this set "razor.languageServer.forceRuntimeCodeGeneration" to true or false.'
33-
);
34-
35-
forceRuntimeCodeGeneration = hotReload;
36-
}
26+
const forceRuntimeCodeGeneration = serverConfig.get<boolean>('forceRuntimeCodeGeneration');
3727

3828
const suppressErrorToasts = serverConfig.get<boolean>('suppressLspErrorToasts');
3929
const useNewFormattingEngine = serverConfig.get<boolean>('useNewFormattingEngine');

0 commit comments

Comments
 (0)