Skip to content

Commit bbb9f2e

Browse files
sheetalkamatsheetalkamat
authored
Just like request and response, events are also logged as formatted json for readability (#54105)
1 parent 44f4e27 commit bbb9f2e

File tree

232 files changed

+24455
-1664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+24455
-1664
lines changed

‎src/server/session.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ export function formatMessage<T extends protocol.Message>(msg: T, logger: Logger
319319

320320
const json = JSON.stringify(msg);
321321
if (verboseLogging) {
322-
logger.info(`${msg.type}:${indent(json)}`);
322+
logger.info(`${msg.type}:${indent(JSON.stringify(msg, undefined, " "))}`);
323323
}
324324

325325
const len = byteLength(json, "utf8");

‎src/testRunner/unittests/helpers/tsserver.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ export function createLoggerWritingToConsole(host: TestServerHost): Logger {
117117

118118
function sanitizeLog(s: string) {
119119
return s.replace(/Elapsed::?\s*\d+(?:\.\d+)?ms/g, "Elapsed:: *ms")
120-
.replace(/\"updateGraphDurationMs\"\:\d+(?:\.\d+)?/g, `"updateGraphDurationMs":*`)
121-
.replace(/\"createAutoImportProviderProgramDurationMs\"\:\d+(?:\.\d+)?/g, `"createAutoImportProviderProgramDurationMs":*`)
120+
.replace(/\"updateGraphDurationMs\"\:\s*\d+(?:\.\d+)?/g, `"updateGraphDurationMs": *`)
121+
.replace(/\"createAutoImportProviderProgramDurationMs\"\:\s*\d+(?:\.\d+)?/g, `"createAutoImportProviderProgramDurationMs": *`)
122122
.replace(`"version":"${ts.version}"`, `"version":"FakeVersion"`)
123123
.replace(/getCompletionData: Get current token: \d+(?:\.\d+)?/g, `getCompletionData: Get current token: *`)
124124
.replace(/getCompletionData: Is inside comment: \d+(?:\.\d+)?/g, `getCompletionData: Is inside comment: *`)

‎tests/baselines/reference/tsserver/cancellationT/Geterr-is-cancellable.js

Lines changed: 85 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ Before running Timeout callback:: count: 1
9494
1: checkOne
9595

9696
Info seq [hh:mm:ss:mss] event:
97-
{"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":2}}
97+
{
98+
"seq": 0,
99+
"type": "event",
100+
"event": "requestCompleted",
101+
"body": {
102+
"request_seq": 2
103+
}
104+
}
98105
TestServerCancellationToken:: resetRequest:: 2 is as expected
99106
After running Timeout callback:: count: 0
100107

@@ -148,7 +155,14 @@ Before running Timeout callback:: count: 1
148155

149156
TestServerCancellationToken:: Cancellation is requested
150157
Info seq [hh:mm:ss:mss] event:
151-
{"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":3}}
158+
{
159+
"seq": 0,
160+
"type": "event",
161+
"event": "requestCompleted",
162+
"body": {
163+
"request_seq": 3
164+
}
165+
}
152166
TestServerCancellationToken:: resetRequest:: 3 is as expected
153167
After running Timeout callback:: count: 0
154168

@@ -177,7 +191,15 @@ Before running Timeout callback:: count: 1
177191
3: checkOne
178192

179193
Info seq [hh:mm:ss:mss] event:
180-
{"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
194+
{
195+
"seq": 0,
196+
"type": "event",
197+
"event": "syntaxDiag",
198+
"body": {
199+
"file": "/a/app.ts",
200+
"diagnostics": []
201+
}
202+
}
181203
TestServerCancellationToken:: resetRequest:: 5 is as expected
182204
After running Timeout callback:: count: 0
183205

@@ -187,7 +209,14 @@ Before running Immedidate callback:: count: 1
187209

188210
TestServerCancellationToken:: Cancellation is requested
189211
Info seq [hh:mm:ss:mss] event:
190-
{"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":5}}
212+
{
213+
"seq": 0,
214+
"type": "event",
215+
"event": "requestCompleted",
216+
"body": {
217+
"request_seq": 5
218+
}
219+
}
191220
TestServerCancellationToken:: resetRequest:: 5 is as expected
192221
After running Immedidate callback:: count: 0
193222

@@ -216,15 +245,31 @@ Before running Timeout callback:: count: 1
216245
4: checkOne
217246

218247
Info seq [hh:mm:ss:mss] event:
219-
{"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
248+
{
249+
"seq": 0,
250+
"type": "event",
251+
"event": "syntaxDiag",
252+
"body": {
253+
"file": "/a/app.ts",
254+
"diagnostics": []
255+
}
256+
}
220257
TestServerCancellationToken:: resetRequest:: 6 is as expected
221258
After running Timeout callback:: count: 0
222259

223260
Before running Immedidate callback:: count: 1
224261
2: semanticCheck
225262

226263
Info seq [hh:mm:ss:mss] event:
227-
{"seq":0,"type":"event","event":"semanticDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
264+
{
265+
"seq": 0,
266+
"type": "event",
267+
"event": "semanticDiag",
268+
"body": {
269+
"file": "/a/app.ts",
270+
"diagnostics": []
271+
}
272+
}
228273
TestServerCancellationToken:: resetRequest:: 6 is as expected
229274
After running Immedidate callback:: count: 1
230275
3: suggestionCheck
@@ -233,9 +278,24 @@ Before running Immedidate callback:: count: 1
233278
3: suggestionCheck
234279

235280
Info seq [hh:mm:ss:mss] event:
236-
{"seq":0,"type":"event","event":"suggestionDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
281+
{
282+
"seq": 0,
283+
"type": "event",
284+
"event": "suggestionDiag",
285+
"body": {
286+
"file": "/a/app.ts",
287+
"diagnostics": []
288+
}
289+
}
237290
Info seq [hh:mm:ss:mss] event:
238-
{"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":6}}
291+
{
292+
"seq": 0,
293+
"type": "event",
294+
"event": "requestCompleted",
295+
"body": {
296+
"request_seq": 6
297+
}
298+
}
239299
TestServerCancellationToken:: resetRequest:: 6 is as expected
240300
After running Immedidate callback:: count: 0
241301

@@ -264,7 +324,15 @@ Before running Timeout callback:: count: 1
264324
5: checkOne
265325

266326
Info seq [hh:mm:ss:mss] event:
267-
{"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/app.ts","diagnostics":[]}}
327+
{
328+
"seq": 0,
329+
"type": "event",
330+
"event": "syntaxDiag",
331+
"body": {
332+
"file": "/a/app.ts",
333+
"diagnostics": []
334+
}
335+
}
268336
TestServerCancellationToken:: resetRequest:: 7 is as expected
269337
After running Timeout callback:: count: 0
270338

@@ -283,7 +351,14 @@ Info seq [hh:mm:ss:mss] request:
283351
"type": "request"
284352
}
285353
Info seq [hh:mm:ss:mss] event:
286-
{"seq":0,"type":"event","event":"requestCompleted","body":{"request_seq":7}}
354+
{
355+
"seq": 0,
356+
"type": "event",
357+
"event": "requestCompleted",
358+
"body": {
359+
"request_seq": 7
360+
}
361+
}
287362
TestServerCancellationToken:: resetRequest:: 8 is as expected
288363
Info seq [hh:mm:ss:mss] response:
289364
{

‎tests/baselines/reference/tsserver/completionsIncomplete/ambient-module-specifier-resolutions-do-not-count-against-the-resolution-limit.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,13 @@ Info seq [hh:mm:ss:mss] request:
10241024
"type": "request"
10251025
}
10261026
Info seq [hh:mm:ss:mss] response:
1027-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
1027+
{
1028+
"seq": 0,
1029+
"type": "response",
1030+
"command": "configure",
1031+
"request_seq": 1,
1032+
"success": true
1033+
}
10281034
Info seq [hh:mm:ss:mss] response:
10291035
{
10301036
"responseRequired": false

‎tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(1).js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2624,7 +2624,13 @@ Info seq [hh:mm:ss:mss] request:
26242624
"type": "request"
26252625
}
26262626
Info seq [hh:mm:ss:mss] response:
2627-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
2627+
{
2628+
"seq": 0,
2629+
"type": "response",
2630+
"command": "configure",
2631+
"request_seq": 1,
2632+
"success": true
2633+
}
26282634
Info seq [hh:mm:ss:mss] response:
26292635
{
26302636
"responseRequired": false

‎tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(2).js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,13 @@ Info seq [hh:mm:ss:mss] request:
474474
"type": "request"
475475
}
476476
Info seq [hh:mm:ss:mss] response:
477-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
477+
{
478+
"seq": 0,
479+
"type": "response",
480+
"command": "configure",
481+
"request_seq": 1,
482+
"success": true
483+
}
478484
Info seq [hh:mm:ss:mss] response:
479485
{
480486
"responseRequired": false

‎tests/baselines/reference/tsserver/completionsIncomplete/works-for-transient-symbols-between-requests.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,13 @@ Info seq [hh:mm:ss:mss] request:
330330
"type": "request"
331331
}
332332
Info seq [hh:mm:ss:mss] response:
333-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
333+
{
334+
"seq": 0,
335+
"type": "response",
336+
"command": "configure",
337+
"request_seq": 1,
338+
"success": true
339+
}
334340
Info seq [hh:mm:ss:mss] response:
335341
{
336342
"responseRequired": false

‎tests/baselines/reference/tsserver/completionsIncomplete/works-with-PackageJsonAutoImportProvider.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,13 @@ Info seq [hh:mm:ss:mss] request:
533533
"type": "request"
534534
}
535535
Info seq [hh:mm:ss:mss] response:
536-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
536+
{
537+
"seq": 0,
538+
"type": "response",
539+
"command": "configure",
540+
"request_seq": 1,
541+
"success": true
542+
}
537543
Info seq [hh:mm:ss:mss] response:
538544
{
539545
"responseRequired": false

‎tests/baselines/reference/tsserver/completionsIncomplete/works.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,13 @@ Info seq [hh:mm:ss:mss] request:
774774
"type": "request"
775775
}
776776
Info seq [hh:mm:ss:mss] response:
777-
{"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
777+
{
778+
"seq": 0,
779+
"type": "response",
780+
"command": "configure",
781+
"request_seq": 1,
782+
"success": true
783+
}
778784
Info seq [hh:mm:ss:mss] response:
779785
{
780786
"responseRequired": false

0 commit comments

Comments
 (0)