mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-21 09:35:38 -05:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
@@ -0,0 +1,192 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import * as extfs from 'vs/base/node/extfs';
|
||||
import { dirname, join } from 'vs/base/common/path';
|
||||
import { ITextModel } from 'vs/editor/common/model';
|
||||
import { URI } from 'vs/base/common/uri';
|
||||
import { ThrottledDelayer } from 'vs/base/common/async';
|
||||
import { IFileService } from 'vs/platform/files/common/files';
|
||||
import { IModelService } from 'vs/editor/common/services/modelService';
|
||||
import { IModeService } from 'vs/editor/common/services/modeService';
|
||||
import { toDisposable, IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IOutputChannelModel, AbstractFileOutputChannelModel, IOutputChannelModelService, AsbtractOutputChannelModelService } from 'vs/workbench/services/output/common/outputChannelModel';
|
||||
import { OutputAppender } from 'vs/workbench/services/output/node/outputAppender';
|
||||
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { IWindowService } from 'vs/platform/windows/common/windows';
|
||||
import { toLocalISOString } from 'vs/base/common/date';
|
||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
|
||||
let watchingOutputDir = false;
|
||||
let callbacks: ((eventType: string, fileName?: string) => void)[] = [];
|
||||
function watchOutputDirectory(outputDir: string, logService: ILogService, onChange: (eventType: string, fileName: string) => void): IDisposable {
|
||||
callbacks.push(onChange);
|
||||
if (!watchingOutputDir) {
|
||||
const watcherDisposable = extfs.watch(outputDir, (eventType, fileName) => {
|
||||
for (const callback of callbacks) {
|
||||
callback(eventType, fileName);
|
||||
}
|
||||
}, (error: string) => {
|
||||
logService.error(error);
|
||||
});
|
||||
watchingOutputDir = true;
|
||||
return toDisposable(() => {
|
||||
callbacks = [];
|
||||
watcherDisposable.dispose();
|
||||
});
|
||||
}
|
||||
return toDisposable(() => { });
|
||||
}
|
||||
|
||||
class OutputChannelBackedByFile extends AbstractFileOutputChannelModel implements IOutputChannelModel {
|
||||
|
||||
private appender: OutputAppender;
|
||||
private appendedMessage: string;
|
||||
private loadingFromFileInProgress: boolean;
|
||||
private resettingDelayer: ThrottledDelayer<void>;
|
||||
private readonly rotatingFilePath: string;
|
||||
|
||||
constructor(
|
||||
id: string,
|
||||
modelUri: URI,
|
||||
mimeType: string,
|
||||
@IWindowService windowService: IWindowService,
|
||||
@IEnvironmentService environmentService: IEnvironmentService,
|
||||
@IFileService fileService: IFileService,
|
||||
@IModelService modelService: IModelService,
|
||||
@IModeService modeService: IModeService,
|
||||
@ILogService logService: ILogService
|
||||
) {
|
||||
const outputDir = join(environmentService.logsPath, `output_${windowService.getCurrentWindowId()}_${toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')}`);
|
||||
super(modelUri, mimeType, URI.file(join(outputDir, `${id}.log`)), fileService, modelService, modeService);
|
||||
this.appendedMessage = '';
|
||||
this.loadingFromFileInProgress = false;
|
||||
|
||||
// Use one rotating file to check for main file reset
|
||||
this.appender = new OutputAppender(id, this.file.fsPath);
|
||||
this.rotatingFilePath = `${id}.1.log`;
|
||||
this._register(watchOutputDirectory(dirname(this.file.fsPath), logService, (eventType, file) => this.onFileChangedInOutputDirector(eventType, file)));
|
||||
|
||||
this.resettingDelayer = new ThrottledDelayer<void>(50);
|
||||
}
|
||||
|
||||
append(message: string): void {
|
||||
// update end offset always as message is read
|
||||
this.endOffset = this.endOffset + Buffer.from(message).byteLength;
|
||||
if (this.loadingFromFileInProgress) {
|
||||
this.appendedMessage += message;
|
||||
} else {
|
||||
this.write(message);
|
||||
if (this.model) {
|
||||
this.appendedMessage += message;
|
||||
if (!this.modelUpdater.isScheduled()) {
|
||||
this.modelUpdater.schedule();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
clear(till?: number): void {
|
||||
super.clear(till);
|
||||
this.appendedMessage = '';
|
||||
}
|
||||
|
||||
loadModel(): Promise<ITextModel> {
|
||||
this.loadingFromFileInProgress = true;
|
||||
if (this.modelUpdater.isScheduled()) {
|
||||
this.modelUpdater.cancel();
|
||||
}
|
||||
this.appendedMessage = '';
|
||||
return this.loadFile()
|
||||
.then(content => {
|
||||
if (this.endOffset !== this.startOffset + Buffer.from(content).byteLength) {
|
||||
// Queue content is not written into the file
|
||||
// Flush it and load file again
|
||||
this.flush();
|
||||
return this.loadFile();
|
||||
}
|
||||
return content;
|
||||
})
|
||||
.then(content => {
|
||||
if (this.appendedMessage) {
|
||||
this.write(this.appendedMessage);
|
||||
this.appendedMessage = '';
|
||||
}
|
||||
this.loadingFromFileInProgress = false;
|
||||
return this.createModel(content);
|
||||
});
|
||||
}
|
||||
|
||||
private resetModel(): Promise<void> {
|
||||
this.startOffset = 0;
|
||||
this.endOffset = 0;
|
||||
if (this.model) {
|
||||
return this.loadModel().then(() => undefined);
|
||||
}
|
||||
return Promise.resolve(undefined);
|
||||
}
|
||||
|
||||
private loadFile(): Promise<string> {
|
||||
return this.fileService.resolveContent(this.file, { position: this.startOffset, encoding: 'utf8' })
|
||||
.then(content => this.appendedMessage ? content.value + this.appendedMessage : content.value);
|
||||
}
|
||||
|
||||
protected updateModel(): void {
|
||||
if (this.model && this.appendedMessage) {
|
||||
this.appendToModel(this.appendedMessage);
|
||||
this.appendedMessage = '';
|
||||
}
|
||||
}
|
||||
|
||||
private onFileChangedInOutputDirector(eventType: string, fileName?: string): void {
|
||||
// Check if rotating file has changed. It changes only when the main file exceeds its limit.
|
||||
if (this.rotatingFilePath === fileName) {
|
||||
this.resettingDelayer.trigger(() => this.resetModel());
|
||||
}
|
||||
}
|
||||
|
||||
private write(content: string): void {
|
||||
this.appender.append(content);
|
||||
}
|
||||
|
||||
private flush(): void {
|
||||
this.appender.flush();
|
||||
}
|
||||
}
|
||||
|
||||
export class OutputChannelModelService extends AsbtractOutputChannelModelService implements IOutputChannelModelService {
|
||||
|
||||
_serviceBrand: any;
|
||||
|
||||
constructor(
|
||||
@IInstantiationService instantiationService: IInstantiationService,
|
||||
@ILogService private readonly logService: ILogService,
|
||||
@ITelemetryService private readonly telemetryService: ITelemetryService
|
||||
) {
|
||||
super(instantiationService);
|
||||
}
|
||||
|
||||
createOutputChannelModel(id: string, modelUri: URI, mimeType: string, file?: URI): IOutputChannelModel {
|
||||
if (!file) {
|
||||
try {
|
||||
return this.instantiationService.createInstance(OutputChannelBackedByFile, id, modelUri, mimeType);
|
||||
} catch (e) {
|
||||
// Do not crash if spdlog rotating logger cannot be loaded (workaround for https://github.com/Microsoft/vscode/issues/47883)
|
||||
this.logService.error(e);
|
||||
/* __GDPR__
|
||||
"output.channel.creation.error" : {}
|
||||
*/
|
||||
this.telemetryService.publicLog('output.channel.creation.error');
|
||||
}
|
||||
}
|
||||
return super.createOutputChannelModel(id, modelUri, mimeType, file);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
registerSingleton(IOutputChannelModelService, OutputChannelModelService);
|
||||
Reference in New Issue
Block a user