From bfba85eb3c64a29c4c591926f79dc09f8f2d8d6b Mon Sep 17 00:00:00 2001
From: Evgeniy Okolnov <okolnov.evgeny@huawei.com>
Date: Fri, 15 Sep 2023 16:42:12 +0300
Subject: [PATCH] [ArkTS Linter] #13580: Remove 'ohosTest' directory from
 linter's ignorlist. Fix description for 'StrictDiagnostic' reports.

Change-Id: Ie506a8968dcb64dec22d889be89a386801218d9d
Signed-off-by: Evgeniy Okolnov <okolnov.evgeny@huawei.com>
---
 linter-4.2/src/Utils.ts                             | 2 +-
 linter-4.2/src/ts-diagnostics/TSCCompiledProgram.ts | 8 ++++----
 linter/src/ts-diagnostics/TSCCompiledProgram.ts     | 6 ++++--
 linter/src/utils/consts/ArktsIgnorePaths.ts         | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/linter-4.2/src/Utils.ts b/linter-4.2/src/Utils.ts
index 1fc3ed1ab..462af8372 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 9d7a84563..158563245 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 f69ba921e..65fc12469 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 594312ea5..ca29111ac 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'];
-- 
Gitee