diff --git a/ets2panda/linter/src/cli/LinterCLI.ts b/ets2panda/linter/src/cli/LinterCLI.ts index 9d8ae8337f1a0130cd49e30139e9e795171d26d2..be7e4cdaaa633e0441d49d7d9fb98d34281deaa5 100644 --- a/ets2panda/linter/src/cli/LinterCLI.ts +++ b/ets2panda/linter/src/cli/LinterCLI.ts @@ -32,7 +32,7 @@ import { logStatistics } from '../lib/statistics/StatisticsLogger'; import { compileLintOptions, getEtsLoaderPath } from '../lib/ts-compiler/Compiler'; import { processSyncErr, processSyncOut } from '../lib/utils/functions/ProcessWrite'; import { parseCommandLine } from './CommandLineParser'; -import { getwholeRules } from '../lib/utils/functions/ConfiguredRulesProcess'; +import { getAllLinterRules } from '../lib/utils/functions/ConfiguredRulesProcess'; export function run(): void { const commandLineArgs = process.argv.slice(2); @@ -78,7 +78,7 @@ async function runIdeInteractiveMode(cmdOptions: CommandLineOptions): Promise, wholeLinterRules: string[]) : Map { +function getProcessedRuleToNumbersMap( + ruleToNumbersMap: Map, + allLinterRules: string[] +): Map { const processedRuleToNumbersMap: Map = new Map(); const homecheckRuleToNumbersMap: Map = ruleToNumbersMap; - wholeLinterRules.forEach((ruleName) => { + allLinterRules.forEach((ruleName) => { const ruleNumber = ruleToNumbersMap.get(ruleName) || 0; homecheckRuleToNumbersMap.delete(ruleName); processedRuleToNumbersMap.set(ruleName, ruleNumber); }); - + homecheckRuleToNumbersMap.forEach((number, ruleName) => { processedRuleToNumbersMap.set(ruleName, number); - }) + }); return processedRuleToNumbersMap; } @@ -213,7 +216,7 @@ export function generateMigrationStatisicsReport( const statisticsReportData = getProblemStatisticsInfo( problemNumbers, - getProcessedRuleToNumbersMap(ruleToNumbersMap, getwholeRules()), + getProcessedRuleToNumbersMap(ruleToNumbersMap, getAllLinterRules()), ruleToAutoFixedNumbersMap, timeRecorder ); diff --git a/ets2panda/linter/src/lib/statistics/scan/StatisticsReportInPutInfo.ts b/ets2panda/linter/src/lib/statistics/scan/StatisticsReportInPutInfo.ts index b43198f2fe80379338ac267289c162c59ab69600..a841890f976e085f546d76fb5f527ea40c92d083 100644 --- a/ets2panda/linter/src/lib/statistics/scan/StatisticsReportInPutInfo.ts +++ b/ets2panda/linter/src/lib/statistics/scan/StatisticsReportInPutInfo.ts @@ -20,7 +20,7 @@ export class StatisticsReportInPutInfo { totalProblemNumbers: number = 0; arkOnePointOneProblemNumbers: number = 0; ruleToNumbersMap: Map = {} as Map; - wholeRules: string[] = [] as string[]; + allLinterRules: string[] = [] as string[]; ruleToAutoFixedNumbersMap: Map = {} as Map; cmdOptions: CommandLineOptions = {} as CommandLineOptions; timeRecorder: TimeRecorder = {} as TimeRecorder; diff --git a/ets2panda/linter/src/lib/utils/TsUtils.ts b/ets2panda/linter/src/lib/utils/TsUtils.ts index d49c2cdff90b6f373fae3ef111910582e071cbcc..3aa1893629cf4d0872461b648811448b079a9595 100644 --- a/ets2panda/linter/src/lib/utils/TsUtils.ts +++ b/ets2panda/linter/src/lib/utils/TsUtils.ts @@ -3590,7 +3590,7 @@ export class TsUtils { return false; } - projectPath.concat(PATH_SEPARATOR + currentModule); + projectPath = projectPath.concat(PATH_SEPARATOR + currentModule); } const importedFile = path.resolve(projectPath, importFilePath + extension); diff --git a/ets2panda/linter/src/lib/utils/functions/ConfiguredRulesProcess.ts b/ets2panda/linter/src/lib/utils/functions/ConfiguredRulesProcess.ts index 65ee056abc9fd480f9d3625541c8c71054d2ecec..27bf5988bdf90f09b96cc29e3546d7c95d570935 100644 --- a/ets2panda/linter/src/lib/utils/functions/ConfiguredRulesProcess.ts +++ b/ets2panda/linter/src/lib/utils/functions/ConfiguredRulesProcess.ts @@ -97,7 +97,7 @@ function isStringArray(value: any): value is string[] { ); } -export function getwholeRules() : string[] { +export function getAllLinterRules(): string[] { const configureRulePath = getDefaultConfigurePath(); const configuredRulesMap = getRulesFromConfig(configureRulePath); return Array.from(configuredRulesMap.values()).flat();