Skip to content

Commit 29dd67e

Browse files
authored
Merge pull request #27443 from Microsoft/errorMessageLogger
Default logger for projectService has assert on exceptions being logged in tsserver
2 parents 6e8027e + 6549969 commit 29dd67e

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/testRunner/unittests/compileOnSave.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace ts.projectSystem {
3636
typingsInstaller: typingsInstaller || server.nullTypingsInstaller,
3737
byteLength: Utils.byteLength,
3838
hrtime: process.hrtime,
39-
logger: nullLogger,
39+
logger: createHasErrorMessageLogger().logger,
4040
canUseEvents: false
4141
};
4242
return new server.Session(opts);

src/testRunner/unittests/session.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ namespace ts.server {
502502
typingsInstaller: undefined!, // TODO: GH#18217
503503
byteLength: Utils.byteLength,
504504
hrtime: process.hrtime,
505-
logger: projectSystem.nullLogger,
505+
logger: projectSystem.createHasErrorMessageLogger().logger,
506506
canUseEvents: true
507507
});
508508
this.addProtocolHandler(this.customHandler, () => {
@@ -570,7 +570,7 @@ namespace ts.server {
570570
typingsInstaller: undefined!, // TODO: GH#18217
571571
byteLength: Utils.byteLength,
572572
hrtime: process.hrtime,
573-
logger: projectSystem.nullLogger,
573+
logger: projectSystem.createHasErrorMessageLogger().logger,
574574
canUseEvents: true
575575
});
576576
this.addProtocolHandler("echo", (req: protocol.Request) => ({

src/testRunner/unittests/tsserverProjectSystem.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,13 @@ namespace ts.projectSystem {
5858
getLogFileName: () => undefined,
5959
};
6060

61-
function createHasErrorMessageLogger() {
61+
export function createHasErrorMessageLogger() {
6262
let hasErrorMsg = false;
6363
const { close, hasLevel, loggingEnabled, startGroup, endGroup, info, getLogFileName, perftrc } = nullLogger;
6464
const logger: server.Logger = {
6565
close, hasLevel, loggingEnabled, startGroup, endGroup, info, getLogFileName, perftrc,
66-
msg: () => {
66+
msg: (s, type) => {
67+
Debug.fail(`Error: ${s}, type: ${type}`);
6768
hasErrorMsg = true;
6869
}
6970
};
@@ -322,7 +323,7 @@ namespace ts.projectSystem {
322323
typingsInstaller: undefined!, // TODO: GH#18217
323324
byteLength: Utils.byteLength,
324325
hrtime: process.hrtime,
325-
logger: opts.logger || nullLogger,
326+
logger: opts.logger || createHasErrorMessageLogger().logger,
326327
canUseEvents: false
327328
};
328329

@@ -359,7 +360,7 @@ namespace ts.projectSystem {
359360
}
360361
export function createProjectService(host: server.ServerHost, parameters: CreateProjectServiceParameters = {}, options?: Partial<server.ProjectServiceOptions>) {
361362
const cancellationToken = parameters.cancellationToken || server.nullCancellationToken;
362-
const logger = parameters.logger || nullLogger;
363+
const logger = parameters.logger || createHasErrorMessageLogger().logger;
363364
const useSingleInferredProject = parameters.useSingleInferredProject !== undefined ? parameters.useSingleInferredProject : false;
364365
return new TestProjectService(host, logger, cancellationToken, useSingleInferredProject, parameters.typingsInstaller!, parameters.eventHandler!, options); // TODO: GH#18217
365366
}

0 commit comments

Comments
 (0)