chore: improve code

opensumi · Oct 18, 2024 · 703bee9 · 703bee9
1 parent 0f6a89e
commit 703bee9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/.../ai-native/__test__/browser/contrib/intelligent-completions/multi-line.decoration.test.ts b/.../ai-native/__test__/browser/contrib/intelligent-completions/multi-line.decoration.test.ts
@@ -1,13 +1,13 @@
-import { ICodeEditor, IPosition } from '@opensumi/ide-monaco';
-import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
-
+import { IMultiLineDiffChangeResult } from '@opensumi/ide-ai-native/lib/browser/contrib/intelligent-completions/diff-computer';
 import {
   GHOST_TEXT,
   GHOST_TEXT_DESCRIPTION,
   MultiLineDecorationModel,
-} from '../../../../lib/browser/contrib/intelligent-completions/multi-line.decoration';
-import { IMultiLineDiffChangeResult } from '../../../../src/browser/contrib/intelligent-completions/diff-computer';
-import { EnhanceDecorationsCollection } from '../../../../src/browser/model/enhanceDecorationsCollection';
+} from '@opensumi/ide-ai-native/lib/browser/contrib/intelligent-completions/multi-line.decoration';
+import { EnhanceDecorationsCollection } from '@opensumi/ide-ai-native/lib/browser/model/enhanceDecorationsCollection';
+import { ICodeEditor, IPosition } from '@opensumi/ide-monaco';
+import { monacoApi } from '@opensumi/ide-monaco/lib/browser/monaco-api';
+
 
 describe('MultiLineDecorationModel', () => {
   let editor: ICodeEditor;

diff --git a/packages/ai-native/src/browser/contrib/intelligent-completions/lint-error.source.ts b/packages/ai-native/src/browser/contrib/intelligent-completions/lint-error.source.ts
@@ -1,23 +1,25 @@
-import { Autowired, INJECTOR_TOKEN, Injectable, Injector, Optional } from '@opensumi/di';
+import { Autowired, Injectable, Optional } from '@opensumi/di';
 import {
   CancellationToken,
   Disposable,
   IDisposable,
   IntelligentCompletionsRegistryToken,
 } from '@opensumi/ide-core-common';
-import { ICodeEditor, ICursorPositionChangedEvent, Position } from '@opensumi/ide-monaco';
-import { IPosition } from '@opensumi/ide-monaco';
+import { ICodeEditor, ICursorPositionChangedEvent, IPosition, Position } from '@opensumi/ide-monaco';
 import { URI } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { IWorkspaceService } from '@opensumi/ide-workspace';
 import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IMarkerService, MarkerSeverity } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';
-import { IMarker, IRelatedInformation } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';
+import {
+  IMarker,
+  IMarkerService,
+  IRelatedInformation,
+  MarkerSeverity,
+} from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';
 
 import { IntelligentCompletionsRegistry } from './intelligent-completions.feature.registry';
 
 import { ECodeEditsSource } from '.';
 
-
 export interface ILinterErrorData {
   relativeWorkspacePath: string;
   errors: Array<IMarkerErrorData>;
@@ -57,9 +59,6 @@ namespace MarkerErrorData {
 
 @Injectable({ multiple: true })
 export class LintErrorCodeEditsSource extends Disposable {
-  @Autowired(INJECTOR_TOKEN)
-  protected readonly injector: Injector;
-
   @Autowired(IntelligentCompletionsRegistryToken)
   private readonly intelligentCompletionsRegistry: IntelligentCompletionsRegistry;
 
@@ -81,6 +80,7 @@ export class LintErrorCodeEditsSource extends Disposable {
     let prePosition = this.monacoEditor.getPosition();
 
     this.addDispose(
+      // 仅在光标的行号发生变化时，才触发
       this.monacoEditor.onDidChangeCursorPosition((event: ICursorPositionChangedEvent) => {
         const currentPosition = event.position;
         if (prePosition && prePosition.lineNumber !== currentPosition.lineNumber) {
@@ -99,12 +99,10 @@ export class LintErrorCodeEditsSource extends Disposable {
 
     const markerService = StandaloneServices.get(IMarkerService);
     const resource = this.model.uri;
-    let markers = markerService.read({ resource });
 
-    markers = markers.filter(
-      (marker) =>
-        marker.severity === MarkerSeverity.Error && Math.abs(marker.startLineNumber - position.lineNumber) <= 1,
-    );
+    let markers = markerService.read({ resource, severities: MarkerSeverity.Error });
+    markers = markers.filter((marker) => Math.abs(marker.startLineNumber - position.lineNumber) <= 1);
+
     if (markers.length) {
       const provider = this.intelligentCompletionsRegistry.getCodeEditsProvider();
       if (provider) {