fix: Make getFileContent directly return a model

Author: CGNonofr

src/infrastructure.ts

@@ -35,11 +35,11 @@ export interface Infrastructure {
    */
   saveFileContent? (document: TextDocument, reason: TextDocumentSaveReason, languageClient: LanguageClientManager): Promise<void>
   /**
-   * Get a text file content
+   * Get a text file content as a model
    * @param resource the Uri of the file
    * @param languageClient The languageclient we're trying to get the file from
    */
-  getFileContent (resource: monaco.Uri, languageClient: LanguageClientManager): Promise<string | null>
+  getFileContent (resource: monaco.Uri, languageClient: LanguageClientManager): Promise<monaco.editor.ITextModel | null>
 
   /**
    * Open a connection to the language server
@@ -100,9 +100,10 @@ export abstract class CodinGameInfrastructure implements Infrastructure {
     }
   }
 
-  public async getFileContent (resource: monaco.Uri, languageClient: LanguageClientManager): Promise<string | null> {
+  public async getFileContent (resource: monaco.Uri, languageClient: LanguageClientManager): Promise<monaco.editor.ITextModel | null> {
     try {
-      return (await getFile(resource.toString(true), languageClient)).text
+      const content = (await getFile(resource.toString(true), languageClient)).text
+      return monaco.editor.createModel(content, undefined, resource)
     } catch (error) {
       console.error('File not found', resource.toString())
       return null

src/languageClient.ts

@@ -289,8 +289,7 @@ function createLanguageClientManager (
 
   disposableCollection.push(registerTextModelContentProvider('file', {
     async provideTextContent (resource: Uri): Promise<monaco.editor.ITextModel | null> {
-      const content = await infrastructure.getFileContent(resource, languageClientManager)
-      return content != null ? monaco.editor.createModel(content, undefined, resource) : null
+      return await infrastructure.getFileContent(resource, languageClientManager)
     }
   }))
   disposableCollection.push(getServices().workspace.registerSaveDocumentHandler({

src/tests/tools.ts

@@ -6,6 +6,7 @@ import {
   _Connection,
   _
 } from 'vscode-languageserver/lib/common/api'
+import { monaco } from '@codingame/monaco-editor-wrapper'
 import { getFile, updateFile } from '../customRequests'
 import { Infrastructure, LanguageClientManager, TextDocument, TextDocumentSaveReason } from '../'
 
@@ -131,9 +132,10 @@ export class TestInfrastructure implements Infrastructure {
   }
 
   // use same method as CodinGameInfrastructure to be able to simply catch it
-  async getFileContent (resource: Uri, languageClient: LanguageClientManager): Promise<string | null> {
+  async getFileContent (resource: Uri, languageClient: LanguageClientManager): Promise<monaco.editor.ITextModel | null> {
     try {
-      return (await getFile(resource.toString(true), languageClient)).text
+      const content = (await getFile(resource.toString(true), languageClient)).text
+      return monaco.editor.createModel(content, undefined, resource)
     } catch (error) {
       console.error('File not found', resource.toString())
       return null