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 f77421dd03d424af64d6cda13f80161f7d12119a..2f62ea5af878d57853d78e6e6147cbcdc2ef0bed 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 683ba3d3c697b72afa12bf58d09b40d97fe43b04..2a1d477abd09ebef56d583a9306560881e4d3070 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 837c8d85f2da7234926b5f998f12a1638e674838..9f56e39151138ad28720bd8da0b142954c699aa9 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 151ce78fba37a4bc924ea9f60ae0d3a571ca4e2d..4074a1724565be4fa891609f8cf3e592b3214d7f 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 75c0d847eafa2b4a2fc3a0d899f299631c82dd65..4cd553402652f69c1383b0f3f05055deae9e07e3 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 7d0b98c834648e5238e2352f5081c0b60ba8c0fd..5cfe3351c7a85334bf22dc4acde555dee545eab9 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 c1b3a827c4322b6210450c4319cd3996d5493478..c8a7ae084556bdd107e7b4e9a01bee8b1f7d0db8 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 92b32d50a013f9407e3b1f556fca0831fe897ac3..85e8bd8cf2f3ac63683792b8eccf039a19b01d33 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 69c7eb7ac70431e0f0a48f4b4dbc41b7a81361df..f31cfec4ad1e92cf52c584d8b9562a9f4d741bf1 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 ec80d3afd03ed13e07234b9fe0b9db6da4b4a148..e7ab4ec8da51785ea1889a3ec2d4b9b590aebf86 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],