microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-11-13 09:34:44 +03:00
Code Issues Projects Releases Wiki Activity

Cleaned up main CLI logic in prep for new type validation command.

Browse Source
This commit is contained in:
Eric Traut 2020-09-27 22:30:58 -07:00
parent dd12062cbd
commit 8c01e0d652
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/pyright-internal/src/pyright.ts
View File

@ -47,7 +47,8 @@ interface PyrightJsonDiagnostic {
file: string;
severity: 'error' | 'warning' | 'information';
message: string;
range: Range;
range?: Range;
rule?: string;
}
interface PyrightJsonSummary {
@ -128,6 +129,16 @@ function processArgs() {
}
}
if (args.createstub) {
const incompatibleArgs = ['watch', 'stats', 'verifytypes', 'dependencies'];
for (const arg of incompatibleArgs) {
if (args[arg] !== undefined) {
console.error(`'createstub' option cannot be used with '${arg}' option`);
return;
}
}
}
const options = new PyrightCommandLineOptions(process.cwd(), false);
// Assume any relative paths are relative to the working directory.
@ -305,17 +316,7 @@ function reportDiagnosticsAsJson(
diag.category === DiagnosticCategory.Warning ||
diag.category === DiagnosticCategory.Information
) {
report.diagnostics.push({
file: fileDiag.filePath,
severity:
diag.category === DiagnosticCategory.Error
? 'error'
: DiagnosticCategory.Warning
? 'warning'
: 'information',
message: diag.message,
range: diag.range,
});
report.diagnostics.push(convertDiagnosticToJson(fileDiag.filePath, diag));
if (diag.category === DiagnosticCategory.Error) {
errorCount++;
@ -342,6 +343,21 @@ function reportDiagnosticsAsJson(
};
}
function convertDiagnosticToJson(filePath: string, diag: Diagnostic): PyrightJsonDiagnostic {
return {
file: filePath,
severity:
diag.category === DiagnosticCategory.Error
? 'error'
: DiagnosticCategory.Warning
? 'warning'
: 'information',
message: diag.message,
range: isEmptyRange(diag.range) ? undefined : diag.range,
rule: diag.getRule(),
};
}
function reportDiagnosticsAsText(fileDiagnostics: FileDiagnostics[]): DiagnosticResult {
let errorCount = 0;
let warningCount = 0;
@ -356,7 +372,7 @@ function reportDiagnosticsAsText(fileDiagnostics: FileDiagnostics[]): Diagnostic
if (fileErrorsAndWarnings.length > 0) {
console.log(`${fileDiagnostics.filePath}`);
fileErrorsAndWarnings.forEach((diag) => {
logDiagnosticToConsole(diag);
logDiagnosticToConsole(convertDiagnosticToJson(fileDiagnostics.filePath, diag));
if (diag.category === DiagnosticCategory.Error) {
errorCount++;
@ -383,7 +399,7 @@ function reportDiagnosticsAsText(fileDiagnostics: FileDiagnostics[]): Diagnostic
};
}
function logDiagnosticToConsole(diag: Diagnostic, prefix = ' ') {
function logDiagnosticToConsole(diag: PyrightJsonDiagnostic, prefix = ' ') {
let message = prefix;
if (diag.range && !isEmptyRange(diag.range)) {
message +=
@ -396,19 +412,18 @@ function logDiagnosticToConsole(diag: Diagnostic, prefix = ' ') {
const [firstLine, ...remainingLines] = diag.message.split('\n');
message +=
diag.category === DiagnosticCategory.Error
diag.severity === 'error'
? chalk.red('error')
: diag.category === DiagnosticCategory.Warning
? chalk.green('warning')
: diag.severity === 'warning'
? chalk.cyan('warning')
: chalk.blue('info');
message += `: ${firstLine}`;
if (remainingLines.length > 0) {
message += '\n' + prefix + remainingLines.join('\n' + prefix);
}
const rule = diag.getRule();
if (rule) {
message += chalk.gray(` (${rule})`);
if (diag.rule) {
message += chalk.gray(` (${diag.rule})`);
}
console.log(message);