Skip to content

Commit 3277243

Browse files
dibarbetdibarbet
authored
Merge pull request #7134 from ryzngard/razor_design_time
Typescript changes to add razor design time overload
2 parents 71bb620 + 036a878 commit 3277243

File tree

4 files changed

+36
-25
lines changed

4 files changed

+36
-25
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@
169169
"updatePackageDependencies"
170170
],
171171
"env": {
172-
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/63e9bcf9df9b2dc7aed8986d02eb8a99/razorlanguageserver-linux-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/d0f2ff54001f1d3f58bf70d0969ed16e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/ed94c4a4dc938d9a428202e4ce8769ec/razorlanguageserver-linux-musl-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/84627676a361059963afd170163e21f3/razorlanguageserver-linux-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/d7ca1e9512d9f585a8145588ff09857d/razorlanguageserver-osx-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/5dd13e7a225c4c0c176f50c203a5a176/razorlanguageserver-osx-x64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/89988e284b82abdf29d98c8bfa14e03b/razorlanguageserver-platformagnostic-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/6c21b84932bafaf6a4be27e6cccc6434/razorlanguageserver-win-arm64-7.0.0-preview.24178.4.zip,https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/b602af8bccf37a92bbd6429716129140/razorlanguageserver-win-x64-7.0.0-preview.24178.4.zip",
173-
"NEW_DEPS_VERSION": "7.0.0-preview.24178.4",
172+
"NEW_DEPS_URLS": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/b23fa3ac36f10300deb05a6f6d705117/razorlanguageserver-linux-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/ef50cb22ece80d50723b2e88dd6cc38c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/0558e8219fe7cad00352ef194c9721dc/razorlanguageserver-linux-musl-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/041a5e759efa80ba48dac5e2e686d2b1/razorlanguageserver-linux-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/71361816a0db3363b7afcc9f667e034b/razorlanguageserver-osx-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/002f2c48425cfc3f4ab2dcdd95c856e6/razorlanguageserver-osx-x64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/2e78857667b37f4c1dc570b45de5c967/razorlanguageserver-platformagnostic-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/08ae2e66be350ce2c2017fd7eb03978f/razorlanguageserver-win-arm64-7.0.0-preview.24266.1.zip,https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/970b8dd2e4a3b9f3487ef4239de68bcf/razorlanguageserver-win-x64-7.0.0-preview.24266.1.zip",
173+
"NEW_DEPS_VERSION": "7.0.0-preview.24266.1",
174174
"NEW_DEPS_ID": "Razor"
175175
},
176176
"cwd": "${workspaceFolder}"

‎package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
}
3838
},
3939
"defaults": {
40-
"roslyn": "4.11.0-2.24266.3",
40+
"roslyn": "4.11.0-2.24267.3",
4141
"omniSharp": "1.39.11",
42-
"razor": "7.0.0-preview.24178.4",
42+
"razor": "7.0.0-preview.24266.1",
4343
"razorOmnisharp": "7.0.0-preview.23363.1",
4444
"razorTelemetry": "7.0.0-preview.24178.4",
4545
"xamlTools": "17.11.34917.22"
@@ -577,33 +577,33 @@
577577
{
578578
"id": "Razor",
579579
"description": "Razor Language Server (Windows / x64)",
580-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/b602af8bccf37a92bbd6429716129140/razorlanguageserver-win-x64-7.0.0-preview.24178.4.zip",
580+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/970b8dd2e4a3b9f3487ef4239de68bcf/razorlanguageserver-win-x64-7.0.0-preview.24266.1.zip",
581581
"installPath": ".razor",
582582
"platforms": [
583583
"win32"
584584
],
585585
"architectures": [
586586
"x86_64"
587587
],
588-
"integrity": "556FD2B6907CD80EF571F701181D409DBC70F9D9CD963F70BE999DA1B1BFA11E"
588+
"integrity": "8D255E5DB63345CAEFB795B93F029C108345D5E234B7D7B86FB54EBDE9B3FC2A"
589589
},
590590
{
591591
"id": "Razor",
592592
"description": "Razor Language Server (Windows / ARM64)",
593-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/6c21b84932bafaf6a4be27e6cccc6434/razorlanguageserver-win-arm64-7.0.0-preview.24178.4.zip",
593+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/08ae2e66be350ce2c2017fd7eb03978f/razorlanguageserver-win-arm64-7.0.0-preview.24266.1.zip",
594594
"installPath": ".razor",
595595
"platforms": [
596596
"win32"
597597
],
598598
"architectures": [
599599
"arm64"
600600
],
601-
"integrity": "C0A0B0AFB461449F3B7B1CFA182C84E0B70C5892B9560F4447E5FCDAE9934E5E"
601+
"integrity": "E4074218E23D45D4269985A18F1627BDD7426A16DC4539E434FE00F1E6EFE81E"
602602
},
603603
{
604604
"id": "Razor",
605605
"description": "Razor Language Server (Linux / x64)",
606-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/84627676a361059963afd170163e21f3/razorlanguageserver-linux-x64-7.0.0-preview.24178.4.zip",
606+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/041a5e759efa80ba48dac5e2e686d2b1/razorlanguageserver-linux-x64-7.0.0-preview.24266.1.zip",
607607
"installPath": ".razor",
608608
"platforms": [
609609
"linux"
@@ -614,12 +614,12 @@
614614
"binaries": [
615615
"./rzls"
616616
],
617-
"integrity": "C035F1B1FBB01CB9E45C0CDA3B68A75F938987D4E01E1D7EFF1A1DBC8AA9CD5C"
617+
"integrity": "4EF2240CA5EAADB30D0BD3EDF259858925B8EEDBE81F04B5FADA6370DCC4DD64"
618618
},
619619
{
620620
"id": "Razor",
621621
"description": "Razor Language Server (Linux ARM64)",
622-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/63e9bcf9df9b2dc7aed8986d02eb8a99/razorlanguageserver-linux-arm64-7.0.0-preview.24178.4.zip",
622+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/b23fa3ac36f10300deb05a6f6d705117/razorlanguageserver-linux-arm64-7.0.0-preview.24266.1.zip",
623623
"installPath": ".razor",
624624
"platforms": [
625625
"linux"
@@ -630,12 +630,12 @@
630630
"binaries": [
631631
"./rzls"
632632
],
633-
"integrity": "55C6F9F8C7A6D9A1FC5FF17ABC80A27B2D60CF31EA578DDEE35D0270AEE6FD04"
633+
"integrity": "622D13897AE67A18A2801F2B500BDD929E355847625091C2F5F85C8A74359CBE"
634634
},
635635
{
636636
"id": "Razor",
637637
"description": "Razor Language Server (Linux musl / x64)",
638-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/ed94c4a4dc938d9a428202e4ce8769ec/razorlanguageserver-linux-musl-x64-7.0.0-preview.24178.4.zip",
638+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/0558e8219fe7cad00352ef194c9721dc/razorlanguageserver-linux-musl-x64-7.0.0-preview.24266.1.zip",
639639
"installPath": ".razor",
640640
"platforms": [
641641
"linux-musl"
@@ -646,12 +646,12 @@
646646
"binaries": [
647647
"./rzls"
648648
],
649-
"integrity": "53DC84C3EC82AB1DF0A31E440F128D4279E0BB7B89A8AD5AF443B7826A50C589"
649+
"integrity": "61ED517AD29DFB3BDF01852F43AD455698437111B925B872115E3B39174C77AA"
650650
},
651651
{
652652
"id": "Razor",
653653
"description": "Razor Language Server (Linux musl ARM64)",
654-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/d0f2ff54001f1d3f58bf70d0969ed16e/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24178.4.zip",
654+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/ef50cb22ece80d50723b2e88dd6cc38c/razorlanguageserver-linux-musl-arm64-7.0.0-preview.24266.1.zip",
655655
"installPath": ".razor",
656656
"platforms": [
657657
"linux-musl"
@@ -662,12 +662,12 @@
662662
"binaries": [
663663
"./rzls"
664664
],
665-
"integrity": "13B3739E6A33C0CAACD6F3436F953DD7E198ECC2145FCA32211F870425FB5C30"
665+
"integrity": "DDC420476CC117857DED9DCDBFB8A387A102E9C19DE57749ADB8351CEF7ACEDD"
666666
},
667667
{
668668
"id": "Razor",
669669
"description": "Razor Language Server (macOS / x64)",
670-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/5dd13e7a225c4c0c176f50c203a5a176/razorlanguageserver-osx-x64-7.0.0-preview.24178.4.zip",
670+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/002f2c48425cfc3f4ab2dcdd95c856e6/razorlanguageserver-osx-x64-7.0.0-preview.24266.1.zip",
671671
"installPath": ".razor",
672672
"platforms": [
673673
"darwin"
@@ -678,12 +678,12 @@
678678
"binaries": [
679679
"./rzls"
680680
],
681-
"integrity": "560119C5861F61511F8BA2D81CB3FC01F6E2589916F8521C56D50E17C15A1BC4"
681+
"integrity": "AB86AD64955373EC9F0EA23FBDDA9D676B895150A5BAF75E1CFC1321B2B6ADBB"
682682
},
683683
{
684684
"id": "Razor",
685685
"description": "Razor Language Server (macOS ARM64)",
686-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/d7ca1e9512d9f585a8145588ff09857d/razorlanguageserver-osx-arm64-7.0.0-preview.24178.4.zip",
686+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/71361816a0db3363b7afcc9f667e034b/razorlanguageserver-osx-arm64-7.0.0-preview.24266.1.zip",
687687
"installPath": ".razor",
688688
"platforms": [
689689
"darwin"
@@ -694,12 +694,12 @@
694694
"binaries": [
695695
"./rzls"
696696
],
697-
"integrity": "35DB75890A227289F2E5C8D3FF041D92BB7D94315EBB26CE0B48443CE4286E45"
697+
"integrity": "C30559DD13E3A5799FC596992FA04822A253C7EDB514EBE52E24A318DD0288EE"
698698
},
699699
{
700700
"id": "Razor",
701701
"description": "Razor Language Server (Platform Agnostic)",
702-
"url": "https://download.visualstudio.microsoft.com/download/pr/534f8426-a4f4-4b2d-b3ba-c4e16a38c48c/89988e284b82abdf29d98c8bfa14e03b/razorlanguageserver-platformagnostic-7.0.0-preview.24178.4.zip",
702+
"url": "https://download.visualstudio.microsoft.com/download/pr/f64a0a13-30e9-4525-8ed9-4f18e89a01f2/2e78857667b37f4c1dc570b45de5c967/razorlanguageserver-platformagnostic-7.0.0-preview.24266.1.zip",
703703
"installPath": ".razor",
704704
"platforms": [
705705
"neutral"
@@ -710,7 +710,7 @@
710710
"binaries": [
711711
"./rzls"
712712
],
713-
"integrity": "D6E4EF2064433E1569401D68F9E76AE49D47FA32918383B8B8437DB5E6ACF53E"
713+
"integrity": "EE83F90BC19447192171703BCCCA30CADB6177C9D37CCE61E6042B8662321C80"
714714
},
715715
{
716716
"id": "RazorOmnisharp",

‎src/lsptoolshost/roslynLanguageServer.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { registerShowToastNotification } from './showToastNotification';
5656
import { registerRazorCommands } from './razorCommands';
5757
import { registerOnAutoInsert } from './onAutoInsert';
5858
import { registerCodeActionFixAllCommands } from './fixAllCodeAction';
59-
import { commonOptions, languageServerOptions, omnisharpOptions } from '../shared/options';
59+
import { commonOptions, languageServerOptions, omnisharpOptions, razorOptions } from '../shared/options';
6060
import { NamedPipeInformation } from './roslynProtocol';
6161
import { IDisposable } from '../disposable';
6262
import { registerNestedCodeActionCommands } from './nestedCodeAction';
@@ -513,9 +513,16 @@ export class RoslynLanguageServer {
513513
args.push('--logLevel', logLevel);
514514
}
515515

516+
const razorPath =
517+
razorOptions.razorServerPath === ''
518+
? path.join(context.extension.extensionPath, '.razor')
519+
: razorOptions.razorServerPath;
520+
521+
args.push('--razorSourceGenerator', path.join(razorPath, 'Microsoft.CodeAnalysis.Razor.Compiler.dll'));
522+
516523
args.push(
517-
'--razorSourceGenerator',
518-
path.join(context.extension.extensionPath, '.razor', 'Microsoft.CodeAnalysis.Razor.Compiler.dll')
524+
'--razorDesignTimePath',
525+
path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
519526
);
520527

521528
// Get the brokered service pipe name from C# Dev Kit (if installed).

‎src/shared/options.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export interface LanguageServerOptions {
8585
export interface RazorOptions {
8686
readonly razorDevMode: boolean;
8787
readonly razorPluginPath: string;
88+
readonly razorServerPath: string;
8889
}
8990

9091
class CommonOptionsImpl implements CommonOptions {
@@ -418,6 +419,9 @@ class RazorOptionsImpl implements RazorOptions {
418419
public get razorPluginPath() {
419420
return readOption<string>('razor.plugin.path', '');
420421
}
422+
public get razorServerPath() {
423+
return readOption<string>('razor.languageServer.directory', '');
424+
}
421425
}
422426

423427
export const commonOptions: CommonOptions = new CommonOptionsImpl();

0 commit comments

Comments
 (0)