Skip to content

Properly ignore large projects/solutions when processing diagnostics #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 17, 2016
Merged

Properly ignore large projects/solutions when processing diagnostics #677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 53 additions & 18 deletions src/features/diagnosticsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ export class Advisor {

constructor(server: OmnisharpServer) {
this._server = server;

let d1 = server.onProjectChange(this._onProjectChange, this);
let d2 = server.onBeforePackageRestore(this._onBeforePackageRestore, this);
let d3 = server.onPackageRestore(this._onPackageRestore, this);
this._disposable = Disposable.from(d1, d2, d3);
let d2 = server.onProjectAdded(this._onProjectAdded, this);
let d3 = server.onProjectRemoved(this._onProjectRemoved, this);
let d4 = server.onBeforePackageRestore(this._onBeforePackageRestore, this);
let d5 = server.onPackageRestore(this._onPackageRestore, this);
this._disposable = Disposable.from(d1, d2, d3, d4, d5);
}

public dispose() {
Expand All @@ -42,15 +45,42 @@ export class Advisor {
&& !this._isHugeProject();
}

private _onProjectChange(info: protocol.ProjectInformationResponse): void {
private _updateProjectFileCount(path: string, fileCount: number): void {
this._projectSourceFileCounts[path] = fileCount;
}

private _addOrUpdateProjectFileCount(info: protocol.ProjectInformationResponse): void {
if (info.DotNetProject && info.DotNetProject.SourceFiles) {
this._updateProjectFileCount(info.DotNetProject.Path, info.DotNetProject.SourceFiles.length);
}

if (info.MsBuildProject && info.MsBuildProject.SourceFiles) {
this._updateProjectFileCount(info.MsBuildProject.Path, info.MsBuildProject.SourceFiles.length);
}
}

private _removeProjectFileCount(info: protocol.ProjectInformationResponse): void {
if (info.DotNetProject && info.DotNetProject.SourceFiles) {
this._projectSourceFileCounts[info.DotNetProject.Path] = info.DotNetProject.SourceFiles.length;
delete this._updateProjectFileCount[info.DotNetProject.Path];
}

if (info.MsBuildProject && info.MsBuildProject.SourceFiles) {
this._projectSourceFileCounts[info.MsBuildProject.Path] = info.MsBuildProject.SourceFiles.length;
delete this._updateProjectFileCount[info.MsBuildProject.Path];
}
}

private _onProjectAdded(info: protocol.ProjectInformationResponse): void {
this._addOrUpdateProjectFileCount(info);
}

private _onProjectRemoved(info: protocol.ProjectInformationResponse): void {
this._removeProjectFileCount(info);
}

private _onProjectChange(info: protocol.ProjectInformationResponse): void {
this._addOrUpdateProjectFileCount(info);
}

private _onBeforePackageRestore(): void {
this._packageRestoreCounter += 1;
}
Expand All @@ -59,22 +89,25 @@ export class Advisor {
this._packageRestoreCounter -= 1;
}

private _isServerStarted(): boolean {
return this._server.isRunning();
}

private _isRestoringPackages(): boolean {
return this._packageRestoreCounter > 0;
}

private _isServerStarted(): boolean {
return this._server.isRunning();
}

private _isHugeProject(): boolean {
let sourceFileCount = 0;
for (let key in this._projectSourceFileCounts) {
sourceFileCount += this._projectSourceFileCounts[key];
if (sourceFileCount > 1000) {
console.log(`_isHugeProject = true (${sourceFileCount})`);
return true;
}
}

console.log(`_isHugeProject = false (${sourceFileCount})`);
return false;
}
}
Expand Down Expand Up @@ -143,15 +176,16 @@ class DiagnosticsProvider extends AbstractSupport {

private _validateDocument(document: TextDocument): void {

if (!this._validationAdvisor.shouldValidateFiles()) {
return;
}

// If we've already started computing for this document, cancel that work.
let key = document.uri.toString();
if (this._documentValidations[key]) {
this._documentValidations[key].cancel();
}

if (!this._validationAdvisor.shouldValidateFiles()) {
return;
}

let source = new CancellationTokenSource();
let handle = setTimeout(() => {
serverUtils.codeCheck(this._server, { Filename: document.fileName }, source.token).then(value => {
Expand All @@ -176,17 +210,18 @@ class DiagnosticsProvider extends AbstractSupport {
}

private _validateProject(): void {
// If we've already started computing for this project, cancel that work.
if (this._projectValidation) {
this._projectValidation.cancel();
}

if (!this._validationAdvisor.shouldValidateProject()) {
return;
}

if (this._projectValidation) {
this._projectValidation.cancel();
}

this._projectValidation = new CancellationTokenSource();
let handle = setTimeout(() => {

serverUtils.codeCheck(this._server, { Filename: null }, this._projectValidation.token).then(value => {

let quickFixes = value.QuickFixes.sort((a, b) => a.FileName.localeCompare(b.FileName));
Expand Down