feat: update openTextDocument API

packages/editor/src/browser/untitled-resource.ts

@@ -25,6 +25,15 @@ import { AskSaveResult, IResource, IResourceProvider, WorkbenchEditorService } f
 
 import { IEditorDocumentModelService, IEditorDocumentModelContentProvider } from './doc-model/types';
 
+@Injectable()
+export class UntitledDocumentIdCounter {
+  private _id = 1;
+
+  get id() {
+    return this._id++;
+  }
+}
+
 @Injectable()
 export class UntitledSchemeDocumentProvider implements IEditorDocumentModelContentProvider {
   @Autowired(IEditorDocumentModelService)

packages/editor/src/browser/workbench-editor.service.ts

@@ -88,6 +88,7 @@ import {
   CodeEditorDidVisibleEvent,
   RegisterEditorComponentEvent,
 } from './types';
+import { UntitledDocumentIdCounter } from './untitled-resource';
 
 @Injectable()
 export class WorkbenchEditorServiceImpl extends WithEventBus implements WorkbenchEditorService {
@@ -138,7 +139,8 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
   @Autowired(IEditorDocumentModelService)
   protected documentModelManager: IEditorDocumentModelService;
 
-  private untitledIndex = 1;
+  @Autowired()
+  private untitledIndex: UntitledDocumentIdCounter;
 
   private untitledCloseIndex: number[] = [];
 
@@ -484,7 +486,7 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
 
   private createUntitledURI() {
     // 优先从已删除的 index 中获取
-    const index = this.untitledCloseIndex.shift() || this.untitledIndex++;
+    const index = this.untitledCloseIndex.shift() || this.untitledIndex.id;
     return new URI().withScheme(Schemes.untitled).withQuery(`name=Untitled-${index}&index=${index}`);
   }
 

packages/extension/src/browser/vscode/api/main.thread.doc.ts

@@ -28,6 +28,7 @@ import {
   EditorDocumentModelOptionChangedEvent,
   EditorDocumentModelWillSaveEvent,
 } from '@opensumi/ide-editor/lib/browser';
+import { UntitledDocumentIdCounter } from '@opensumi/ide-editor/lib/browser/untitled-resource';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 
 import { ExtHostAPIIdentifier, IMainThreadDocumentsShape, IExtensionHostDocService } from '../../../common/vscode';
@@ -69,10 +70,11 @@ class ExtensionEditorDocumentProvider implements IEditorDocumentModelContentProv
 
 @Injectable({ multiple: true })
 export class MainThreadExtensionDocumentData extends WithEventBus implements IMainThreadDocumentsShape {
-  private tempDocIdCount = 0;
-
   private readonly proxy: IExtensionHostDocService;
 
+  @Autowired()
+  private tempDocIdCount: UntitledDocumentIdCounter;
+
   @Autowired(IEditorDocumentModelService)
   protected docManager: IEditorDocumentModelService;
 
@@ -218,16 +220,19 @@ export class MainThreadExtensionDocumentData extends WithEventBus implements IMa
     });
   }
 
-  async $tryCreateDocument(options: { content: string; language: string }): Promise<string> {
+  async $tryCreateDocument(options?: { content?: string; language?: string }): Promise<string> {
+    if (!options) {
+      options = {};
+    }
     const { language, content } = options;
     const docRef = await this.docManager.createModelReference(
-      new URI(`${Schemes.untitled}://temp/` + this.tempDocIdCount++),
+      new URI(`${Schemes.untitled}://temp/Untitled-` + this.tempDocIdCount.id),
       'ext-create-document',
     );
-    if (options.language) {
+    if (language) {
       docRef.instance.languageId = language;
     }
-    if (!isUndefinedOrNull(options.content)) {
+    if (!isUndefinedOrNull(content)) {
       docRef.instance.updateContent(content);
     }
     return docRef.instance.uri.toString();

packages/extension/src/common/vscode/doc.ts

@@ -44,7 +44,9 @@ export interface ExtensionDocumentDataManager extends IExtensionHostDocService {
   getDocument(resource: Uri | string): vscode.TextDocument | undefined;
   getDocumentData(resource: Uri | string): ExtHostDocumentData | undefined;
   getAllDocument(): vscode.TextDocument[];
-  openTextDocument(path: Uri | string): Promise<vscode.TextDocument | undefined>;
+  openTextDocument(
+    uriOrFileNameOrOptions?: Uri | string | { language?: string; content?: string },
+  ): Promise<vscode.TextDocument>;
   registerTextDocumentContentProvider(scheme: string, provider: vscode.TextDocumentContentProvider): IDisposable;
   onDidOpenTextDocument: Event<vscode.TextDocument>;
   onDidCloseTextDocument: Event<vscode.TextDocument>;

packages/extension/src/hosted/api/vscode/doc/doc-manager.host.ts

@@ -1,7 +1,7 @@
 import type vscode from 'vscode';
 
 import { IRPCProtocol } from '@opensumi/ide-connection';
-import { BinaryBuffer, CancellationTokenSource, Emitter, IDisposable, isUTF8 } from '@opensumi/ide-core-common';
+import { BinaryBuffer, CancellationTokenSource, Emitter, IDisposable, isUTF8, URI } from '@opensumi/ide-core-common';
 
 import {
   ExtensionDocumentDataManager,
@@ -68,13 +68,18 @@ export class ExtensionDocumentDataManagerImpl implements ExtensionDocumentDataMa
     return data ? data.document : undefined;
   }
 
-  async openTextDocument(path: Uri | string) {
+  async openTextDocument(uriOrFileNameOrOptions?: Uri | string | { language?: string; content?: string }) {
     let uri: Uri;
-
-    if (typeof path === 'string') {
-      uri = Uri.file(path);
+    const options = uriOrFileNameOrOptions as { language?: string; content?: string };
+
+    if (typeof uriOrFileNameOrOptions === 'string') {
+      uri = Uri.file(uriOrFileNameOrOptions);
+    } else if (URI.isUri(uriOrFileNameOrOptions)) {
+      uri = Uri.parse(uriOrFileNameOrOptions.toString());
+    } else if (!options || typeof options === 'object') {
+      uri = Uri.parse(await this._proxy.$tryCreateDocument(options));
     } else {
-      uri = Uri.parse(path.toString());
+      throw new Error('illegal argument -  uriOrFileNameOrOptions');
     }
 
     const doc = this._documents.get(uri.toString());