Merge pull request #31 from CodinGame/fix-method-override

Fix method override

Author: CGNonofr

package-lock.json

@@ -71,7 +71,6 @@
     "ts-node": "10.7.0",
     "tslib": "^2.3.1",
     "typescript": "4.6.3",
-    "vscode-languageserver-protocol": "3.16.0",
     "vscode-textmate": "^6.0.0",
     "yaml": "2.0.0"
   },

package.json

@@ -19,7 +19,7 @@ export default class CGTMTokenizationSupport extends monaco.extra.TMTokenization
   }
 
   // To make "inspect tokens" work, default impl is `throw new Error('Not supported!');`
-  tokenize (line: string, hasEOL: boolean, state: monaco.languages.IState): monaco.TokenizationResult {
+  override tokenize (line: string, hasEOL: boolean, state: monaco.languages.IState): monaco.TokenizationResult {
     return monaco.languages.adaptTokenize(this.languageId, {
       tokenize: (line: string, state: monaco.languages.IState) => {
         const actualResult = this.grammar.tokenizeLine(line, state as StackElement)

src/languages/textMate/CGTMTokenizationSupport.ts

@@ -54,7 +54,7 @@ function openNewCodeEditor (model: monaco.editor.ITextModel) {
   return editor
 }
 
-export type EditorOpenHandler = (model: monaco.editor.ITextModel, input: monaco.extra.IResourceEditorInput, editor: monaco.editor.ICodeEditor, sideBySide?: boolean) => Promise<monaco.editor.ICodeEditor | null>
+export type EditorOpenHandler = (model: monaco.editor.ITextModel, input: monaco.extra.IResourceEditorInput, editor: monaco.editor.ICodeEditor | null, sideBySide?: boolean) => Promise<monaco.editor.ICodeEditor | null>
 
 export default class MultiEditorStandaloneCodeEditorServiceImpl extends monaco.extra.StandaloneCodeEditorService {
   private textModelService: monaco.extra.ITextModelService
@@ -81,11 +81,11 @@ export default class MultiEditorStandaloneCodeEditorServiceImpl extends monaco.e
     }
   }
 
-  override async openCodeEditor (input: monaco.extra.IResourceEditorInput, editor: monaco.editor.ICodeEditor, sideBySide?: boolean): Promise<monaco.editor.ICodeEditor | null> {
+  override async openCodeEditor (input: monaco.extra.IResourceEditorInput, editor: monaco.editor.ICodeEditor | null, sideBySide?: boolean): Promise<monaco.editor.ICodeEditor | null> {
     const reference = await this.textModelService.createModelReference(input.resource)
     const model = reference.object.textEditorModel
     let modelEditor: monaco.editor.ICodeEditor | undefined
-    if (editor.getModel() === model) {
+    if (editor != null && editor.getModel() === model) {
       modelEditor = editor
     }
     if (modelEditor == null) {

src/services/MultiEditorStandaloneCodeEditorService.ts

@@ -168,11 +168,11 @@ export default class TextModelService extends monaco.extra.StandaloneTextModelSe
     super(modelService)
   }
 
-  public registerTextModelContentProvider (scheme: string, provider: monaco.extra.ITextModelContentProvider): monaco.IDisposable {
+  public override registerTextModelContentProvider (scheme: string, provider: monaco.extra.ITextModelContentProvider): monaco.IDisposable {
     return this.resourceModelCollection.registerTextModelContentProvider(scheme, provider)
   }
 
-  public async createModelReference (resource: monaco.Uri): Promise<monaco.extra.IReference<monaco.extra.IResolvedTextEditorModel>> {
+  public override async createModelReference (resource: monaco.Uri): Promise<monaco.extra.IReference<monaco.extra.IResolvedTextEditorModel>> {
     const result = await this.asyncModelCollection.acquire(resource.toString())
     return result
   }

src/services/TextModelService.ts

@@ -4,6 +4,7 @@
     "strict": true,
     "baseUrl": "./app",
     "esModuleInterop": true,
+    "noImplicitOverride": true,
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "lib": [