Skip to content

Commit 9bd7ffe

Browse files
authored
Merge branch 'master' into feature/enableroslynanalyzers-flag
2 parents 7b21668 + 2edb841 commit 9bd7ffe

File tree

20 files changed

+360
-106
lines changed

20 files changed

+360
-106
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ out
88
.vscode-test
99
.razor
1010
dist/
11+
*.razor.json
1112

1213
install.*
1314

.vscode/launch.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,31 @@
109109
],
110110
"preLaunchTask": "buildDev"
111111
},
112+
{
113+
"name": "Launch Razor Tests",
114+
"type": "extensionHost",
115+
"request": "launch",
116+
"runtimeExecutable": "${execPath}",
117+
"args": [
118+
"--disable-extensions",
119+
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
120+
"--extensionDevelopmentPath=${workspaceRoot}",
121+
"--extensionTestsPath=${workspaceRoot}/out/test/razorTests"
122+
],
123+
"env": {
124+
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
125+
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/razorTests",
126+
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
127+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
128+
"OSVC_SUITE": "BasicRazorApp2_1"
129+
},
130+
"stopOnEntry": false,
131+
"sourceMaps": true,
132+
"outFiles": [
133+
"${workspaceRoot}/dist/*.js"
134+
],
135+
"preLaunchTask": "buildDev"
136+
},
112137
{
113138
"type": "node",
114139
"request": "launch",

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.18.0-beta10",
4+
"version": "1.18.0-beta11",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -25,7 +25,8 @@
2525
"multi-root ready"
2626
],
2727
"defaults": {
28-
"omniSharp": "1.32.11"
28+
"omniSharp": "1.32.11",
29+
"razor": "1.0.0-alpha2.1-20190322.5"
2930
},
3031
"main": "./dist/extension",
3132
"scripts": {
@@ -74,7 +75,7 @@
7475
"http-proxy-agent": "2.1.0",
7576
"https-proxy-agent": "2.2.1",
7677
"jsonc-parser": "2.0.3",
77-
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/386a5dff35391e14f14e5945e7903f63/microsoft.aspnetcore.razor.vscode-1.0.0-alpha2-20181112.3.tgz",
78+
"microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/d05e29c3f776b3b0f63641f5d93601c4/microsoft.aspnetcore.razor.vscode-1.0.0-alpha2.1-20190322.5.tgz",
7879
"mkdirp": "0.5.1",
7980
"node-filter-async": "1.1.1",
8081
"remove-bom-buffer": "3.0.0",
@@ -297,7 +298,8 @@
297298
{
298299
"id": "Razor",
299300
"description": "Razor Language Server (Windows / x64)",
300-
"url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/bbd021dbeab477395f37f1c4e39c31ad/razorlanguageserver-win-x64-1.0.0-alpha2-20181112.3.zip",
301+
"url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/890063ec1dc258ca517d764c03b2d212/razorlanguageserver-win-x64-1.0.0-alpha2.1-20190322.5.zip",
302+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-1.0.0-alpha2.1-20190322.5.zip",
301303
"installPath": ".razor",
302304
"platforms": [
303305
"win32"
@@ -309,7 +311,8 @@
309311
{
310312
"id": "Razor",
311313
"description": "Razor Language Server (Windows / x86)",
312-
"url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/d4196db447b32b655910532321f4bd6a/razorlanguageserver-win-x86-1.0.0-alpha2-20181112.3.zip",
314+
"url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/e8568cd3b28f1d7b947da4d1252fbf89/razorlanguageserver-win-x86-1.0.0-alpha2.1-20190322.5.zip",
315+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-1.0.0-alpha2.1-20190322.5.zip",
313316
"installPath": ".razor",
314317
"platforms": [
315318
"win32"
@@ -321,7 +324,8 @@
321324
{
322325
"id": "Razor",
323326
"description": "Razor Language Server (Linux / x64)",
324-
"url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/ad6d340d6d68e760bb1bb7a8073051f3/razorlanguageserver-linux-x64-1.0.0-alpha2-20181112.3.zip",
327+
"url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/fe52ada3d813e9d5381af603346b9d7b/razorlanguageserver-linux-x64-1.0.0-alpha2.1-20190322.5.zip",
328+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-1.0.0-alpha2.1-20190322.5.zip",
325329
"installPath": ".razor",
326330
"platforms": [
327331
"linux"
@@ -336,7 +340,8 @@
336340
{
337341
"id": "Razor",
338342
"description": "Razor Language Server (macOS / x64)",
339-
"url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/e4808fd370ba60d528944a5a36543cf0/razorlanguageserver-osx-x64-1.0.0-alpha2-20181112.3.zip",
343+
"url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/de81e6e1d243d743e3c0b569ebdd372e/razorlanguageserver-osx-x64-1.0.0-alpha2.1-20190322.5.zip",
344+
"fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-1.0.0-alpha2.1-20190322.5.zip",
340345
"installPath": ".razor",
341346
"platforms": [
342347
"darwin"

src/CSharpExtensionExports.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Advisor } from "./features/diagnosticsProvider";
7+
import { EventStream } from "./EventStream";
78

89
export default interface CSharpExtensionExports {
910
initializationFinished: () => Promise<void>;
10-
1111
getAdvisor: () => Promise<Advisor>;
12+
eventStream: EventStream;
1213
}

src/main.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
141141
coreClrDebugPromise = coreclrdebug.activate(extension, context, platformInfo, eventStream);
142142
}
143143

144+
let razorPromise = Promise.resolve();
144145
if (!optionProvider.GetLatestOptions().razorDisabled) {
145146
const razorObserver = new RazorLoggerObserver(omnisharpChannel);
146147
eventStream.subscribe(razorObserver.post);
147148

148149
if (!optionProvider.GetLatestOptions().razorDevMode) {
149-
await activateRazorExtension(context, extension.extensionPath, eventStream);
150+
razorPromise = activateRazorExtension(context, extension.extensionPath, eventStream);
150151
}
151152
}
152153

@@ -155,11 +156,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
155156
let langService = await langServicePromise;
156157
await langService.server.waitForEmptyEventQueue();
157158
await coreClrDebugPromise;
159+
await razorPromise;
158160
},
159161
getAdvisor: async () => {
160162
let langService = await langServicePromise;
161163
return langService.advisor;
162-
}
164+
},
165+
eventStream
163166
};
164167
}
165168

src/omnisharp/EventType.ts

Lines changed: 79 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -4,79 +4,82 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
export enum EventType {
7-
OmnisharpStart,
8-
TelemetryEvent,
9-
TelemetryEventWithMeasures,
10-
OmnisharpDelayTrackerEventMeasures,
11-
OmnisharpInitialisation,
12-
OmnisharpLaunch,
13-
PackageInstallStart,
14-
PackageInstallation,
15-
LogPlatformInfo,
16-
InstallationStart,
17-
InstallationFailure,
18-
DownloadProgress,
19-
OmnisharpFailure,
20-
OmnisharpRequestMessage,
21-
TestExecutionCountReport,
22-
OmnisharpServerOnError,
23-
OmnisharpServerMsBuildProjectDiagnostics,
24-
OmnisharpServerUnresolvedDependencies,
25-
OmnisharpServerEnqueueRequest,
26-
OmnisharpServerProcessRequestStart,
27-
OmnisharpEventPacketReceived,
28-
OmnisharpServerOnServerError,
29-
OmnisharpOnMultipleLaunchTargets,
30-
WorkspaceInformationUpdated,
31-
EventWithMessage,
32-
DownloadStart,
33-
DownloadFallBack,
34-
DownloadSizeObtained,
35-
ZipError,
36-
ReportDotNetTestResults,
37-
DotNetTestRunStart,
38-
DotNetTestDebugStart,
39-
DotNetTestDebugProcessStart,
40-
DotNetTestsInClassRunStart,
41-
DotNetTestsInClassDebugStart,
42-
DocumentSynchronizationFailure,
43-
OpenURL,
44-
IntegrityCheckFailure,
45-
IntegrityCheckSuccess,
46-
RazorPluginPathSpecified,
47-
RazorPluginPathDoesNotExist,
48-
DebuggerPrerequisiteFailure,
49-
CommandDotNetRestoreProgress,
50-
DownloadValidation,
51-
DotNetTestDebugComplete,
52-
LatestBuildDownloadStart,
53-
ActiveTextEditorChanged,
54-
OmnisharpOnBeforeServerStart,
55-
ProjectJsonDeprecatedWarning,
56-
OmnisharpServerProcessRequestComplete,
57-
InstallationSuccess,
58-
CommandDotNetRestoreStart,
59-
DebuggerNotInstalledFailure,
60-
ShowOmniSharpChannel,
61-
ActivationFailure,
62-
ProjectModified,
63-
RazorDevModeActive,
64-
DotNetTestDebugStartFailure,
65-
DotNetTestDebugWarning,
66-
DotNetTestRunFailure,
67-
DotNetTestMessage,
68-
OmnisharpServerVerboseMessage,
69-
OmnisharpServerMessage,
70-
OmnisharpServerOnStdErr,
71-
DownloadFailure,
72-
DownloadSuccess,
73-
CommandDotNetRestoreSucceeded,
74-
DebuggerPrerequisiteWarning,
75-
CommandDotNetRestoreFailed,
76-
OmnisharpRestart,
77-
OmnisharpServerDequeueRequest,
78-
OmnisharpServerOnStop,
79-
OmnisharpServerOnStart,
80-
OmnisharpOnBeforeServerInstall,
81-
ProjectConfigurationReceived
82-
}
7+
OmnisharpStart = 0,
8+
TelemetryEvent = 1,
9+
TelemetryEventWithMeasures = 2,
10+
OmnisharpDelayTrackerEventMeasures = 3,
11+
OmnisharpInitialisation = 4,
12+
OmnisharpLaunch = 5,
13+
PackageInstallStart = 6,
14+
PackageInstallation = 7,
15+
LogPlatformInfo = 8,
16+
InstallationStart = 9,
17+
InstallationFailure = 10,
18+
DownloadProgress = 11,
19+
OmnisharpFailure = 12,
20+
OmnisharpRequestMessage = 13,
21+
TestExecutionCountReport = 14,
22+
OmnisharpServerOnError = 15,
23+
OmnisharpServerMsBuildProjectDiagnostics = 16,
24+
OmnisharpServerUnresolvedDependencies = 17,
25+
OmnisharpServerEnqueueRequest = 18,
26+
OmnisharpServerProcessRequestStart = 19,
27+
OmnisharpEventPacketReceived = 20,
28+
OmnisharpServerOnServerError = 21,
29+
OmnisharpOnMultipleLaunchTargets = 22,
30+
WorkspaceInformationUpdated = 23,
31+
EventWithMessage = 24,
32+
DownloadStart = 25,
33+
DownloadFallBack = 26,
34+
DownloadSizeObtained = 27,
35+
ZipError = 28,
36+
ReportDotNetTestResults = 29,
37+
DotNetTestRunStart = 30,
38+
DotNetTestDebugStart = 31,
39+
DotNetTestDebugProcessStart = 32,
40+
DotNetTestsInClassRunStart = 33,
41+
DotNetTestsInClassDebugStart = 34,
42+
DocumentSynchronizationFailure = 35,
43+
OpenURL = 36,
44+
IntegrityCheckFailure = 37,
45+
IntegrityCheckSuccess = 38,
46+
RazorPluginPathSpecified = 39,
47+
RazorPluginPathDoesNotExist = 40,
48+
DebuggerPrerequisiteFailure = 41,
49+
CommandDotNetRestoreProgress = 42,
50+
DownloadValidation = 43,
51+
DotNetTestDebugComplete = 44,
52+
LatestBuildDownloadStart = 45,
53+
ActiveTextEditorChanged = 46,
54+
OmnisharpOnBeforeServerStart = 47,
55+
ProjectJsonDeprecatedWarning = 48,
56+
OmnisharpServerProcessRequestComplete = 49,
57+
InstallationSuccess = 50,
58+
CommandDotNetRestoreStart = 51,
59+
DebuggerNotInstalledFailure = 52,
60+
ShowOmniSharpChannel = 53,
61+
ActivationFailure = 54,
62+
ProjectModified = 55,
63+
RazorDevModeActive = 56,
64+
DotNetTestDebugStartFailure = 57,
65+
DotNetTestDebugWarning = 58,
66+
DotNetTestRunFailure = 59,
67+
DotNetTestMessage = 60,
68+
OmnisharpServerVerboseMessage = 61,
69+
OmnisharpServerMessage = 62,
70+
OmnisharpServerOnStdErr = 63,
71+
DownloadFailure = 64,
72+
DownloadSuccess = 65,
73+
CommandDotNetRestoreSucceeded = 66,
74+
DebuggerPrerequisiteWarning = 67,
75+
CommandDotNetRestoreFailed = 68,
76+
OmnisharpRestart = 69,
77+
OmnisharpServerDequeueRequest = 70,
78+
OmnisharpServerOnStop = 71,
79+
OmnisharpServerOnStart = 72,
80+
OmnisharpOnBeforeServerInstall = 73,
81+
ProjectConfigurationReceived = 74,
82+
}
83+
84+
//Note that the EventType protocol is shared with Razor.VSCode and the numbers here should not be altered
85+
//The enum is needed because we use webpack for the extension(which trims the names in production mode) and need to be able to filter on the eventType

0 commit comments

Comments
 (0)