diff --git a/linter-4.2/src/Utils.ts b/linter-4.2/src/Utils.ts index 1fc3ed1abd7b6ed8c1435be18dafe5ad0036e1d9..462af8372b9dcbd7101c953bd95b32ca24582a58 100644 --- a/linter-4.2/src/Utils.ts +++ b/linter-4.2/src/Utils.ts @@ -187,7 +187,7 @@ export class TsUtils { 'BigUint64Array', ] - static ARKTS_IGNORE_DIRS = ['ohosTest', 'node_modules', 'oh_modules', 'build', '.preview']; + static ARKTS_IGNORE_DIRS = ['node_modules', 'oh_modules', 'build', '.preview']; static ARKTS_IGNORE_FILES = ['hvigorfile.ts']; constructor(private tsTypeChecker: ts.TypeChecker, private testMode: boolean) { diff --git a/linter-4.2/src/ts-diagnostics/TSCCompiledProgram.ts b/linter-4.2/src/ts-diagnostics/TSCCompiledProgram.ts index 9d7a84563389c298f94c1f9d8e7c339ac37d09db..1585632451cd8d3626d27494f9edcca6fbf06b37 100644 --- a/linter-4.2/src/ts-diagnostics/TSCCompiledProgram.ts +++ b/linter-4.2/src/ts-diagnostics/TSCCompiledProgram.ts @@ -20,7 +20,7 @@ import { LintOptions } from '../LintOptions'; import { TypeScriptDiagnosticsExtractor } from './TypeScriptDiagnosticsExtractor'; import { compile } from '../CompilerWrapper'; import { getNodeOrLineEnd } from '../Utils'; -import { FaultID } from '../Problems'; +import { FaultID, faultsAttrs } from '../Problems'; export class TSCCompiledProgram { private diagnosticsExtractor: TypeScriptDiagnosticsExtractor; @@ -87,7 +87,7 @@ export function transformDiagnostic(diagnostic: ts.Diagnostic): ProblemInfo { const startPos = diagnostic.start!; const endPos = startPos + diagnostic.length!; const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'); - // TODO: set correct information & create .md rule description + const faultId = FaultID.StrictDiagnostic; return { line: line, @@ -97,10 +97,10 @@ export function transformDiagnostic(diagnostic: ts.Diagnostic): ProblemInfo { end: endPos, type: 'StrictModeError', severity: ProblemSeverity.ERROR, // expect strict options to always present - problem: FaultID[FaultID.StrictDiagnostic], + problem: FaultID[faultId], suggest: messageText, rule: messageText, - ruleTag: 0, + ruleTag: faultsAttrs[faultId] ? Number(faultsAttrs[faultId].cookBookRef) : 0, autofixable: false, }; } diff --git a/linter/src/ts-diagnostics/TSCCompiledProgram.ts b/linter/src/ts-diagnostics/TSCCompiledProgram.ts index f69ba921ebd88511add855c2efa8759e203a50f4..65fc12469a474866236b85ccf601be56ab7bdc04 100644 --- a/linter/src/ts-diagnostics/TSCCompiledProgram.ts +++ b/linter/src/ts-diagnostics/TSCCompiledProgram.ts @@ -21,6 +21,7 @@ import { TypeScriptDiagnosticsExtractor } from './TypeScriptDiagnosticsExtractor import { compile } from '../CompilerWrapper'; import { getNodeOrLineEnd } from '../utils/functions/GetNodeOrLineEnd'; import { FaultID } from '../Problems'; +import { faultsAttrs } from '../FaultAttrs'; export interface TSCCompiledProgram { getOriginalProgram(): ts.Program; @@ -106,6 +107,7 @@ export function transformDiagnostic(diagnostic: ts.Diagnostic): ProblemInfo { const startPos = diagnostic.start!; const endPos = startPos + diagnostic.length!; const messageText = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'); + const faultId = FaultID.StrictDiagnostic; return { line: line, @@ -115,10 +117,10 @@ export function transformDiagnostic(diagnostic: ts.Diagnostic): ProblemInfo { end: endPos, type: 'StrictModeError', severity: ProblemSeverity.ERROR, // expect strict options to always present - problem: FaultID[FaultID.StrictDiagnostic], + problem: FaultID[faultId], suggest: messageText, rule: messageText, - ruleTag: 0, + ruleTag: faultsAttrs[faultId] ? Number(faultsAttrs[faultId].cookBookRef) : 0, autofixable: false, }; } diff --git a/linter/src/utils/consts/ArktsIgnorePaths.ts b/linter/src/utils/consts/ArktsIgnorePaths.ts index 594312ea5656525bbee73877282255430e2e4b53..ca29111acbd80c0ddef33c69535c82997937a355 100644 --- a/linter/src/utils/consts/ArktsIgnorePaths.ts +++ b/linter/src/utils/consts/ArktsIgnorePaths.ts @@ -13,5 +13,5 @@ * limitations under the License. */ -export const ARKTS_IGNORE_DIRS = ['ohosTest', 'node_modules', 'oh_modules', 'build', '.preview']; +export const ARKTS_IGNORE_DIRS = ['node_modules', 'oh_modules', 'build', '.preview']; export const ARKTS_IGNORE_FILES = ['hvigorfile.ts'];