Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions

View File

@@ -50,11 +50,11 @@ export interface ILogger extends IDisposable {
}
export interface ILogService extends ILogger {
_serviceBrand: undefined;
readonly _serviceBrand: undefined;
}
export interface ILoggerService {
_serviceBrand: undefined;
readonly _serviceBrand: undefined;
getLogger(file: URI): ILogger;
}
@@ -80,7 +80,7 @@ export abstract class AbstractLogService extends Disposable {
export class ConsoleLogMainService extends AbstractLogService implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
private useColors: boolean;
constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
@@ -161,7 +161,7 @@ export class ConsoleLogMainService extends AbstractLogService implements ILogSer
export class ConsoleLogService extends AbstractLogService implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
super();
@@ -215,7 +215,7 @@ export class ConsoleLogService extends AbstractLogService implements ILogService
export class LogServiceAdapter extends AbstractLogService implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(private readonly adapter: { consoleLog: (type: string, args: any[]) => void }, logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
super();
@@ -277,7 +277,7 @@ export class LogServiceAdapter extends AbstractLogService implements ILogService
export class ConsoleLogInMainService extends LogServiceAdapter implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(client: LoggerChannelClient, logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
super({ consoleLog: (type, args) => client.consoleLog(type, args) }, logLevel);
@@ -285,7 +285,7 @@ export class ConsoleLogInMainService extends LogServiceAdapter implements ILogSe
}
export class MultiplexLogService extends AbstractLogService implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(private readonly logServices: ReadonlyArray<ILogService>) {
super();
@@ -351,7 +351,7 @@ export class MultiplexLogService extends AbstractLogService implements ILogServi
}
export class DelegatedLogService extends Disposable implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
constructor(private logService: ILogService) {
super();
@@ -400,7 +400,7 @@ export class DelegatedLogService extends Disposable implements ILogService {
}
export class NullLogService implements ILogService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
readonly onDidChangeLogLevel: Event<LogLevel> = new Emitter<LogLevel>().event;
setLevel(level: LogLevel): void { }
getLevel(): LogLevel { return LogLevel.Info; }