From 73ef4d7c6b0edef33e78c3650570483a2ee5a44c Mon Sep 17 00:00:00 2001 From: wangweiyuan Date: Tue, 22 Jul 2025 16:30:08 +0800 Subject: [PATCH] ui-syntax-plugins 0722 Signed-off-by: wangweiyuan --- .../componentV2-state-usage-validation.ts | 2 -- .../rules/computed-decorator-check.ts | 18 +++++++----------- .../rules/consumer-provider-decorator-check.ts | 6 ++---- .../rules/monitor-decorator-check.ts | 18 ++++++------------ .../rules/no-duplicate-preview.ts | 1 - .../rules/no-prop-link-objectlink-in-entry.ts | 1 - .../rules/observedV2-trace-usage-validation.ts | 3 --- .../rules/once-decorator-check.ts | 3 +-- .../rules/one-decorator-on-function-method.ts | 3 +-- .../rules/track-decorator-check.ts | 2 -- 10 files changed, 17 insertions(+), 40 deletions(-) diff --git a/arkui-plugins/ui-syntax-plugins/rules/componentV2-state-usage-validation.ts b/arkui-plugins/ui-syntax-plugins/rules/componentV2-state-usage-validation.ts index f77421dd0..2f62ea5af 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/componentV2-state-usage-validation.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/componentV2-state-usage-validation.ts @@ -116,7 +116,6 @@ class ComponentV2StateUsageValidationRule extends AbstractUISyntaxRule { message: this.messages.requireOnlyWithParam, fix: (requireDecorator) => { let startPosition = requireDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = requireDecorator.endPosition; return { range: [startPosition, endPosition], @@ -151,7 +150,6 @@ class ComponentV2StateUsageValidationRule extends AbstractUISyntaxRule { data: { annotationName }, fix: (annotation) => { let startPosition = annotation.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = annotation.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/computed-decorator-check.ts b/arkui-plugins/ui-syntax-plugins/rules/computed-decorator-check.ts index 683ba3d3c..2a1d477ab 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/computed-decorator-check.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/computed-decorator-check.ts @@ -14,7 +14,7 @@ */ import * as arkts from '@koalaui/libarkts'; -import { getClassAnnotationUsage, getIdentifierName, PresetDecorators, getAnnotationName, getAnnotationUsage, BUILD_NAME, findDecorator } from '../utils'; +import { getClassAnnotationUsage, getIdentifierName, PresetDecorators, getAnnotationUsage, BUILD_NAME, findDecorator } from '../utils'; import { AbstractUISyntaxRule } from './ui-syntax-rule'; class ComputedDecoratorCheckRule extends AbstractUISyntaxRule { @@ -80,8 +80,7 @@ class ComputedDecoratorCheckRule extends AbstractUISyntaxRule { node: computedDecorator, message: this.messages.onlyOnGetter, fix: (computedDecorator) => { - let startPosition = computedDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = computedDecorator.startPosition; const endPosition = computedDecorator.endPosition; return { range: [startPosition, endPosition], @@ -115,8 +114,7 @@ class ComputedDecoratorCheckRule extends AbstractUISyntaxRule { node: computedDecorator, message: this.messages.onlyOnGetter, fix: (computedDecorator) => { - let startPosition = computedDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = computedDecorator.startPosition; const endPosition = computedDecorator.endPosition; return { range: [startPosition, endPosition], @@ -261,12 +259,11 @@ class ComputedDecoratorCheckRule extends AbstractUISyntaxRule { node: computedDecorator, message: this.messages.componentV2InStruct, fix: () => { - let startPosition = componentDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = componentDecorator.startPosition; const endPosition = componentDecorator.endPosition; return { range: [startPosition, endPosition], - code: `@${PresetDecorators.COMPONENT_V2}`, + code: `${PresetDecorators.COMPONENT_V2}`, }; }, }); @@ -300,12 +297,11 @@ class ComputedDecoratorCheckRule extends AbstractUISyntaxRule { node: computedDecorator, message: this.messages.onlyInObservedV2, fix: () => { - let startPosition = observedDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = observedDecorator.startPosition; const endPosition = observedDecorator.endPosition; return { range: [startPosition, endPosition], - code: `@${PresetDecorators.OBSERVED_V2}`, + code: `${PresetDecorators.OBSERVED_V2}`, }; }, }); diff --git a/arkui-plugins/ui-syntax-plugins/rules/consumer-provider-decorator-check.ts b/arkui-plugins/ui-syntax-plugins/rules/consumer-provider-decorator-check.ts index 837c8d85f..9f56e3915 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/consumer-provider-decorator-check.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/consumer-provider-decorator-check.ts @@ -144,8 +144,7 @@ class ConsumerProviderDecoratorCheckRule extends AbstractUISyntaxRule { decorator: getAnnotationName(decorator) }, fix: () => { - let startPosition = otherDecorators.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = otherDecorators.startPosition; const endPosition = otherDecorators.endPosition; return { range: [startPosition, endPosition], @@ -220,8 +219,7 @@ class ConsumerProviderDecoratorCheckRule extends AbstractUISyntaxRule { decorator: getAnnotationName(decorator), }, fix: (decorator) => { - let startPosition = decorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = decorator.startPosition; const endPosition = decorator.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/monitor-decorator-check.ts b/arkui-plugins/ui-syntax-plugins/rules/monitor-decorator-check.ts index 151ce78fb..4074a1724 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/monitor-decorator-check.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/monitor-decorator-check.ts @@ -76,11 +76,9 @@ class MonitorDecoratorCheckRule extends AbstractUISyntaxRule { node: monitorDecorator, message: this.messages.monitorUsedInObservedV2Class, fix: () => { - let startPosition = observedV1Decorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); return { - range: [startPosition, observedV1Decorator.endPosition], - code: `@${PresetDecorators.OBSERVED_V2}` + range: [observedV1Decorator.startPosition, observedV1Decorator.endPosition], + code: `${PresetDecorators.OBSERVED_V2}` }; } }); @@ -113,11 +111,9 @@ class MonitorDecoratorCheckRule extends AbstractUISyntaxRule { node: monitorDecorator, message: this.messages.monitorUsedInComponentV2Struct, fix: () => { - let startPosition = componentV1Decorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); return { - range: [startPosition, componentV1Decorator.endPosition], - code: `@${PresetDecorators.COMPONENT_V2}` + range: [componentV1Decorator.startPosition, componentV1Decorator.endPosition], + code: `${PresetDecorators.COMPONENT_V2}` }; } }); @@ -179,8 +175,7 @@ class MonitorDecoratorCheckRule extends AbstractUISyntaxRule { const startPositions = conflictingDecorators.map(annotation => annotation.startPosition); const endPositions = conflictingDecorators.map(annotation => annotation.endPosition); - let startPosition = startPositions[0]; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = startPositions[0]; const endPosition = endPositions[endPositions.length - 1]; return { range: [startPosition, endPosition], @@ -211,8 +206,7 @@ class MonitorDecoratorCheckRule extends AbstractUISyntaxRule { node: monitorDecorator, message: this.messages.monitorDecorateMethod, fix: () => { - let startPosition = monitorDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = monitorDecorator.startPosition; const endPosition = monitorDecorator.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/no-duplicate-preview.ts b/arkui-plugins/ui-syntax-plugins/rules/no-duplicate-preview.ts index 75c0d847e..4cd553402 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/no-duplicate-preview.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/no-duplicate-preview.ts @@ -63,7 +63,6 @@ class NoDuplicatePreviewRule extends AbstractUISyntaxRule { private reportError(errorNode: arkts.AnnotationUsage): void { let startPosition = errorNode.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); this.report({ node: errorNode, message: this.messages.duplicateEntry, diff --git a/arkui-plugins/ui-syntax-plugins/rules/no-prop-link-objectlink-in-entry.ts b/arkui-plugins/ui-syntax-plugins/rules/no-prop-link-objectlink-in-entry.ts index 7d0b98c83..5cfe3351c 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/no-prop-link-objectlink-in-entry.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/no-prop-link-objectlink-in-entry.ts @@ -72,7 +72,6 @@ class NoPropLinkObjectLinkInEntryRule extends AbstractUISyntaxRule { }, fix: (annotation) => { let startPosition = annotation.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = annotation.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/observedV2-trace-usage-validation.ts b/arkui-plugins/ui-syntax-plugins/rules/observedV2-trace-usage-validation.ts index c1b3a827c..c8a7ae084 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/observedV2-trace-usage-validation.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/observedV2-trace-usage-validation.ts @@ -49,7 +49,6 @@ class ObservedV2TraceUsageValidationRule extends AbstractUISyntaxRule { message: this.messages.observedV2DecoratorError, fix: (observedV2Decorator) => { let startPosition = observedV2Decorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = observedV2Decorator.endPosition; return { range: [startPosition, endPosition], @@ -66,7 +65,6 @@ class ObservedV2TraceUsageValidationRule extends AbstractUISyntaxRule { message: this.messages.traceMemberVariableError, fix: (traceDecorator) => { let startPosition = traceDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = traceDecorator.endPosition; return { range: [startPosition, endPosition], @@ -103,7 +101,6 @@ class ObservedV2TraceUsageValidationRule extends AbstractUISyntaxRule { message: this.messages.traceDecoratorError, fix: (traceDecorator) => { let startPosition = traceDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = traceDecorator.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/once-decorator-check.ts b/arkui-plugins/ui-syntax-plugins/rules/once-decorator-check.ts index 92b32d50a..85e8bd8cf 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/once-decorator-check.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/once-decorator-check.ts @@ -75,8 +75,7 @@ class OnceDecoratorCheckRule extends AbstractUISyntaxRule { node: decorator, message: message, fix: (decorator) => { - let startPosition = decorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = decorator.startPosition; const endPosition = decorator.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/one-decorator-on-function-method.ts b/arkui-plugins/ui-syntax-plugins/rules/one-decorator-on-function-method.ts index 69c7eb7ac..f31cfec4a 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/one-decorator-on-function-method.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/one-decorator-on-function-method.ts @@ -107,8 +107,7 @@ class OneDecoratorOnFunctionMethodRule extends AbstractUISyntaxRule { node: annotation, message: this.messages.invalidDecorator, fix: () => { - let startPosition = otherDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); + const startPosition = otherDecorator.startPosition; const endPosition = otherDecorator.endPosition; return { range: [startPosition, endPosition], diff --git a/arkui-plugins/ui-syntax-plugins/rules/track-decorator-check.ts b/arkui-plugins/ui-syntax-plugins/rules/track-decorator-check.ts index ec80d3afd..e7ab4ec8d 100644 --- a/arkui-plugins/ui-syntax-plugins/rules/track-decorator-check.ts +++ b/arkui-plugins/ui-syntax-plugins/rules/track-decorator-check.ts @@ -111,7 +111,6 @@ class TrackDecoratorCheckRule extends AbstractUISyntaxRule { message: this.messages.trackMustUsedWithObserved, fix: (trackDecorator) => { let startPosition = trackDecorator.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = trackDecorator.endPosition; return { range: [startPosition, endPosition], @@ -127,7 +126,6 @@ class TrackDecoratorCheckRule extends AbstractUISyntaxRule { message: this.messages.trackOnClassMemberOnly, fix: (node) => { let startPosition = node.startPosition; - startPosition = arkts.SourcePosition.create(startPosition.index() - 1, startPosition.line()); let endPosition = node.endPosition; return { range: [startPosition, endPosition], -- Gitee