Skip to content
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

Jump to bottom

added more logging and fixed hover bug #765

Merged
merged 1 commit into from
Jun 25, 2020
Merged

added more logging and fixed hover bug #765

Show file tree
Hide file tree
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
267 changes: 5 additions & 262 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,12 @@
},
"scripts": {
"vscode:prepublish": "npm run build",
"build": "tsc -p ./",
"update-vscode": "node ./node_modules/vscode/bin/install",
"postinstall": "node ./node_modules/vscode/bin/install"
"build": "tsc -p ./"
},
"devDependencies": {
"@types/vscode": "^1.46.0",
"typescript": "^3.9.5",
"vsce": "^1.77.0",
"vscode": "^1.1.37"
"vsce": "^1.77.0"
},
"dependencies": {
"leven": "^3.1.0",
Expand Down
110 changes: 60 additions & 50 deletions server/src/analyzer/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
SymbolInformation,
} from 'vscode-languageserver';
import { CallHierarchyIncomingCall, CallHierarchyItem, CallHierarchyOutgoingCall } from 'vscode-languageserver-types';
import { isMainThread } from 'worker_threads';

import { OperationCanceledException, throwIfCancellationRequested } from '../common/cancellationUtils';
import { ConfigOptions, ExecutionEnvironment } from '../common/configOptions';
Expand All @@ -26,6 +27,7 @@ import { Diagnostic } from '../common/diagnostic';
import { FileDiagnostics } from '../common/diagnosticSink';
import { FileEditAction, TextEditAction } from '../common/editAction';
import { LanguageServiceExtension } from '../common/extensibility';
import { LogTracker } from '../common/logTracker';
import {
combinePaths,
getDirectoryPath,
Expand Down Expand Up @@ -118,6 +120,7 @@ export class Program {
private _evaluator: TypeEvaluator;
private _configOptions: ConfigOptions;
private _importResolver: ImportResolver;
private _logTracker: LogTracker;

constructor(
initialImportResolver: ImportResolver,
Expand All @@ -126,6 +129,7 @@ export class Program {
private _extension?: LanguageServiceExtension
) {
this._console = console || new StandardConsole();
this._logTracker = new LogTracker(console, isMainThread ? 'FG' : 'BG');
this._importResolver = initialImportResolver;
this._configOptions = initialConfigOptions;
this._createNewEvaluator();
Expand Down Expand Up @@ -189,7 +193,7 @@ export class Program {
return sourceFileInfo.sourceFile;
}

const sourceFile = new SourceFile(this._fs, filePath, false, this._console);
const sourceFile = new SourceFile(this._fs, filePath, false, this._console, this._logTracker);
sourceFileInfo = {
sourceFile,
isTracked: true,
Expand All @@ -209,7 +213,7 @@ export class Program {
setFileOpened(filePath: string, version: number | null, contents: string) {
let sourceFileInfo = this._sourceFileMap.get(filePath);
if (!sourceFileInfo) {
const sourceFile = new SourceFile(this._fs, filePath, false, this._console);
const sourceFile = new SourceFile(this._fs, filePath, false, this._console, this._logTracker);
sourceFileInfo = {
sourceFile,
isTracked: false,
Expand Down Expand Up @@ -524,7 +528,7 @@ export class Program {
return sourceFileInfo.sourceFile;
}

const sourceFile = new SourceFile(this._fs, filePath, false, this._console);
const sourceFile = new SourceFile(this._fs, filePath, false, this._console, this._logTracker);
sourceFileInfo = {
sourceFile,
isTracked: true,
Expand All @@ -549,7 +553,7 @@ export class Program {
let shadowFileInfo = this._sourceFileMap.get(shadowImplPath);

if (!shadowFileInfo) {
const sourceFile = new SourceFile(this._fs, shadowImplPath, false, this._console);
const sourceFile = new SourceFile(this._fs, shadowImplPath, false, this._console, this._logTracker);
shadowFileInfo = {
sourceFile,
isTracked: false,
Expand Down Expand Up @@ -679,62 +683,67 @@ export class Program {
}

private _checkTypes(fileToCheck: SourceFileInfo) {
// If the file isn't needed because it was eliminated from the
// transitive closure or deleted, skip the file rather than wasting
// time on it.
if (!this._isFileNeeded(fileToCheck)) {
return false;
}
return this._logTracker.log(`analyzing: ${fileToCheck.sourceFile.getFilePath()}`, (ls) => {
// If the file isn't needed because it was eliminated from the
// transitive closure or deleted, skip the file rather than wasting
// time on it.
if (!this._isFileNeeded(fileToCheck)) {
ls.add(`analysis not needed`);
return false;
}

if (!fileToCheck.sourceFile.isCheckingRequired()) {
return false;
}
if (!fileToCheck.sourceFile.isCheckingRequired()) {
ls.add(`cache hit`);
return false;
}

if (!this._shouldCheckFile(fileToCheck)) {
return false;
}
if (!this._shouldCheckFile(fileToCheck)) {
ls.add(`analysis not needed`);
return false;
}

this._bindFile(fileToCheck);
this._bindFile(fileToCheck);

// For very large programs, we may need to discard the evaluator and
// its cached types to avoid running out of heap space.
const typeCacheSize = this._evaluator.getTypeCacheSize();
// For very large programs, we may need to discard the evaluator and
// its cached types to avoid running out of heap space.
const typeCacheSize = this._evaluator.getTypeCacheSize();

// If the type cache size has exceeded a high-water mark, query the heap usage.
// Don't bother doing this until we hit this point because the heap usage may not
// drop immediately after we empty the cache due to garbage collection timing.
if (typeCacheSize > 750000) {
const heapSizeInMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));
// If the type cache size has exceeded a high-water mark, query the heap usage.
// Don't bother doing this until we hit this point because the heap usage may not
// drop immediately after we empty the cache due to garbage collection timing.
if (typeCacheSize > 750000) {
const heapSizeInMb = Math.round(process.memoryUsage().heapUsed / (1024 * 1024));

// Don't allow the heap to get close to the 2GB limit imposed by
// the OS when running Node in a 32-bit process.
if (heapSizeInMb > 1536) {
this._console.info(`Emptying type cache to avoid heap overflow. Heap size used: ${heapSizeInMb}MB`);
this._createNewEvaluator();
// Don't allow the heap to get close to the 2GB limit imposed by
// the OS when running Node in a 32-bit process.
if (heapSizeInMb > 1536) {
this._console.info(`Emptying type cache to avoid heap overflow. Heap size used: ${heapSizeInMb}MB`);
this._createNewEvaluator();
}
}
}

fileToCheck.sourceFile.check(this._evaluator);

// Detect import cycles that involve the file.
if (this._configOptions.diagnosticRuleSet.reportImportCycles !== 'none') {
// Don't detect import cycles when doing type stub generation. Some
// third-party modules are pretty convoluted.
if (!this._allowedThirdPartyImports) {
// We need to force all of the files to be parsed and build
// a closure map for the files.
const closureMap = new Map<string, SourceFileInfo>();
this._getImportsRecursive(fileToCheck, closureMap, 0);

closureMap.forEach((file) => {
timingStats.cycleDetectionTime.timeOperation(() => {
this._detectAndReportImportCycles(file);
fileToCheck.sourceFile.check(this._evaluator);

// Detect import cycles that involve the file.
if (this._configOptions.diagnosticRuleSet.reportImportCycles !== 'none') {
// Don't detect import cycles when doing type stub generation. Some
// third-party modules are pretty convoluted.
if (!this._allowedThirdPartyImports) {
// We need to force all of the files to be parsed and build
// a closure map for the files.
const closureMap = new Map<string, SourceFileInfo>();
this._getImportsRecursive(fileToCheck, closureMap, 0);

closureMap.forEach((file) => {
timingStats.cycleDetectionTime.timeOperation(() => {
this._detectAndReportImportCycles(file);
});
});
});
}
}
}

return true;
return true;
});
}

// Builds a map of files that includes the specified file and all of the files
Expand Down Expand Up @@ -1686,7 +1695,8 @@ export class Program {
this._fs,
importPath,
importInfo.isThirdPartyImport,
this._console
this._console,
this._logTracker
);
importedFileInfo = {
sourceFile,
Expand Down
Loading