From 798d6dd409682c0919f3023018306bbf3aca0fef Mon Sep 17 00:00:00 2001 From: openharmony_ci <120357966@qq.com> Date: Thu, 16 May 2024 03:53:38 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!2300=20?= =?UTF-8?q?:=20[ArkTS][Linter]=20Improve=20shared=20exports=20rule=20highl?= =?UTF-8?q?ighting'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ets2panda/linter/lib/TypeScriptLinter.ts | 4 ++-- ets2panda/linter/test/shared_module.ts.json | 19 +++---------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/ets2panda/linter/lib/TypeScriptLinter.ts b/ets2panda/linter/lib/TypeScriptLinter.ts index 2ee4cc4bbb..2bd2880785 100644 --- a/ets2panda/linter/lib/TypeScriptLinter.ts +++ b/ets2panda/linter/lib/TypeScriptLinter.ts @@ -2489,13 +2489,13 @@ export class TypeScriptLinter { case ts.SyntaxKind.InterfaceDeclaration: case ts.SyntaxKind.ClassDeclaration: if (!this.tsUtils.isShareableType(this.tsTypeChecker.getTypeAtLocation(parentNode))) { - this.incrementCounters((parentNode as ts.NamedDeclaration).name ?? parentNode, FaultID.SharedModuleExports); + this.incrementCounters(parentNode, FaultID.SharedModuleExports); } return; case ts.SyntaxKind.VariableStatement: for (const variableDeclaration of (parentNode as ts.VariableStatement).declarationList.declarations) { if (!this.tsUtils.isShareableEntity(variableDeclaration.name)) { - this.incrementCounters(variableDeclaration.name, FaultID.SharedModuleExports); + this.incrementCounters(variableDeclaration, FaultID.SharedModuleExports); } } return; diff --git a/ets2panda/linter/test/shared_module.ts.json b/ets2panda/linter/test/shared_module.ts.json index b3b74291dc..fa18e4c145 100644 --- a/ets2panda/linter/test/shared_module.ts.json +++ b/ets2panda/linter/test/shared_module.ts.json @@ -16,93 +16,80 @@ "nodes": [ { "line": 21, - "column": 13, + "column": 1, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 23, "column": 12, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 25, - "column": 14, + "column": 1, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 28, "column": 12, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 30, - "column": 18, + "column": 1, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 35, "column": 9, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 38, "column": 9, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 41, "column": 13, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 42, "column": 1, "problem": "SharedModuleNoWildcardExport", - "suggest": "", "rule": "\"export * from ...\" is not allowed in shared module (arkts-shared-module-no-wildcard-export)" }, { "line": 45, "column": 14, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 46, "column": 12, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 47, "column": 12, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" }, { "line": 57, "column": 9, "problem": "SharedModuleExports", - "suggest": "", "rule": "Only \"Sendable\" entities can be exported in shared module (arkts-shared-module-exports)" } ] -- Gitee