diff --git a/lib/tsserver.js b/lib/tsserver.js index b578cf4c184406b07616d35f246c1a55117a8bb7..d0cc1abb94d29d58ce3343dd913a70ef9dd79e40 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -200898,6 +200898,9 @@ var ts; } var currentDiagnostics; if (changedFiles.has(fileToLint.resolvedPath)) { + if (!!compilerOptions.skipOhModulesLint && ts.isOHModules(fileToLint.fileName)) { + return "continue"; + } if (fileToLint.scriptKind === 8 /* ScriptKind.ETS */) { ArkTSLinter_1_1.TypeScriptLinter.initStatic(); var linter = new ArkTSLinter_1_1.TypeScriptLinter(fileToLint, program, tscStrictDiagnostics); diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index c90562b81baf770c903f6dfa2ccca16dffc0a491..a9c1a27b95efc7c30fec393791b540c1c1e81ac1 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -3208,6 +3208,7 @@ declare namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number; diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index ebee2765fb54ea46d889c20b39a8207acb0736dd..f414d4c6e7c85e554d86ae6645192ecbd3a2cce4 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -200643,6 +200643,9 @@ var ts; } var currentDiagnostics; if (changedFiles.has(fileToLint.resolvedPath)) { + if (!!compilerOptions.skipOhModulesLint && ts.isOHModules(fileToLint.fileName)) { + return "continue"; + } if (fileToLint.scriptKind === 8 /* ScriptKind.ETS */) { ArkTSLinter_1_1.TypeScriptLinter.initStatic(); var linter = new ArkTSLinter_1_1.TypeScriptLinter(fileToLint, program, tscStrictDiagnostics); diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts index 1692b17ff5c008ab951af2414ebb205ece08cd9f..e6fde0607219b3dcba282b79de71f36db1a164dc 100644 --- a/lib/typescript.d.ts +++ b/lib/typescript.d.ts @@ -3208,6 +3208,7 @@ declare namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number; diff --git a/lib/typescript.js b/lib/typescript.js index ec37e2214a8e8ea4b781c7263b4be3391d4124c5..d54df5dceec2147d8a1b195186f2300b02fa693a 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -189737,6 +189737,9 @@ var ts; } var currentDiagnostics; if (changedFiles.has(fileToLint.resolvedPath)) { + if (!!compilerOptions.skipOhModulesLint && ts.isOHModules(fileToLint.fileName)) { + return "continue"; + } if (fileToLint.scriptKind === 8 /* ScriptKind.ETS */) { ArkTSLinter_1_1.TypeScriptLinter.initStatic(); var linter = new ArkTSLinter_1_1.TypeScriptLinter(fileToLint, program, tscStrictDiagnostics); diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts index 65bc4903dc1963d89a8585ee37298b569c62909b..af2a47a4a5e1d46c87910fa230a0cfb4523ff88f 100644 --- a/lib/typescriptServices.d.ts +++ b/lib/typescriptServices.d.ts @@ -3208,6 +3208,7 @@ declare namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number; diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index 70e94c031366a9424a7ed47470a250f35d2d8031..8a4d96e55d19f039a31273806bea3f6029ef41fc 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -189737,6 +189737,9 @@ var ts; } var currentDiagnostics; if (changedFiles.has(fileToLint.resolvedPath)) { + if (!!compilerOptions.skipOhModulesLint && ts.isOHModules(fileToLint.fileName)) { + return "continue"; + } if (fileToLint.scriptKind === 8 /* ScriptKind.ETS */) { ArkTSLinter_1_1.TypeScriptLinter.initStatic(); var linter = new ArkTSLinter_1_1.TypeScriptLinter(fileToLint, program, tscStrictDiagnostics); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 79b63a7aa70367275dc05d5891e8d94405c6d70f..f8fefb2023ca841df319e644d16807b2beae86e0 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -6818,6 +6818,7 @@ namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number; // The value of maxFlowDepth ranges from 2000 to 65535. diff --git a/src/linter/ArkTSLinter_1_1/LinterRunner.ts b/src/linter/ArkTSLinter_1_1/LinterRunner.ts index 5c3fe171d2c636c63f25b22027dafbf5ae101566..29158623a6740df979349f9e98ffd4c7526bff96 100644 --- a/src/linter/ArkTSLinter_1_1/LinterRunner.ts +++ b/src/linter/ArkTSLinter_1_1/LinterRunner.ts @@ -86,6 +86,9 @@ export function runArkTSLinter(tsBuilderProgram: BuilderProgram, srcFile?: Sourc let currentDiagnostics: Diagnostic[]; if (changedFiles.has(fileToLint.resolvedPath)) { + if (!!compilerOptions.skipOhModulesLint && isOHModules(fileToLint.fileName)) { + continue; + } if (fileToLint.scriptKind === ScriptKind.ETS) { TypeScriptLinter.initStatic(); const linter = new TypeScriptLinter(fileToLint, program, tscStrictDiagnostics); diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index c90562b81baf770c903f6dfa2ccca16dffc0a491..a9c1a27b95efc7c30fec393791b540c1c1e81ac1 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3208,6 +3208,7 @@ declare namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 1692b17ff5c008ab951af2414ebb205ece08cd9f..e6fde0607219b3dcba282b79de71f36db1a164dc 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -3208,6 +3208,7 @@ declare namespace ts { compatibleSdkVersion?: number; compatibleSdkVersionStage?: string; noTransformedKitInParser?: boolean; + skipOhModulesLint?: boolean; [option: string]: CompilerOptionsValue | TsConfigSourceFile | undefined; etsAnnotationsEnable?: boolean; maxFlowDepth?: number;