Skip to content

Commit d9dc9d3

Browse files
committed
Actually pass init option to logger
1 parent b1f1dd7 commit d9dc9d3

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

apps/lsp/src/config.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,12 @@ export class ConfigurationManager extends Disposable {
140140
this._settings = defaultSettings();
141141
}
142142

143-
public init(logLevel?: string) {
144-
const initLogLevel = Logger.parseLogLevel(
145-
logLevel ?? "warn"
146-
);
147-
143+
public init(logLevel: LogLevel) {
148144
this._settings = {
149145
...this._settings,
150146
quarto: {
151147
...this._settings.quarto,
152-
logLevel: initLogLevel,
148+
logLevel,
153149
}
154150
};
155151
}

apps/lsp/src/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,11 @@ let mdLs: IMdLanguageService | undefined;
7575
connection.onInitialize((params: InitializeParams) => {
7676
// Set log level from initialization options if provided so that we use the
7777
// expected level as soon as possible
78-
configManager.init(params.initializationOptions?.logLevel);
78+
const initLogLevel = Logger.parseLogLevel(
79+
params.initializationOptions?.logLevel ?? "warn"
80+
);
81+
logger.init(initLogLevel);
82+
configManager.init(initLogLevel);
7983

8084
// We're connected, log messages via LSP
8185
logger.setConnection(connection);

apps/lsp/src/logging.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class Logger extends Disposable implements ILogger {
4646
return JSON.stringify(data, undefined, 2);
4747
}
4848

49-
private _logLevel: LogLevel;
49+
private _logLevel = LogLevel.Warn;
5050
private _connection?: Connection;
5151
private _config?: ConfigurationManager;
5252

@@ -56,6 +56,10 @@ export class Logger extends Disposable implements ILogger {
5656
super();
5757
}
5858

59+
init(logLevel: LogLevel): void {
60+
this._logLevel = logLevel;
61+
}
62+
5963
setConnection(connection: Connection) {
6064
this._connection = connection;
6165
this.logInfo('LSP is now connected');

0 commit comments

Comments
 (0)