1
1
import React , { ForwardedRef , forwardRef , ReactElement , useEffect , useMemo , useRef , useState } from 'react'
2
2
import debounce from 'lodash.debounce'
3
3
import { monaco , createEditor , getMonacoLanguage , updateEditorKeybindingsMode , registerEditorOpenHandler } from '@codingame/monaco-editor-wrapper'
4
+ import { IEditorOptions } from 'vscode/service-override/modelEditor'
4
5
import { useDeepMemo , useLastValueRef , useLastVersion , useThemeData , useUserConfiguration } from './hooks'
5
6
import './style'
6
7
@@ -92,7 +93,7 @@ export interface MonacoEditorProps {
92
93
*
93
94
* Default is opening a new editor in a popup
94
95
*/
95
- onEditorOpenRequest ?: ( model : monaco . editor . ITextModel , input : monaco . extra . IResourceEditorInput , source : monaco . editor . ICodeEditor , sideBySide ?: boolean ) => Promise < monaco . editor . ICodeEditor | null >
96
+ onEditorOpenRequest ?: ( model : monaco . editor . ITextModel , options : IEditorOptions | undefined , source : monaco . editor . ICodeEditor , sideBySide ?: boolean ) => Promise < monaco . editor . ICodeEditor | null >
96
97
}
97
98
98
99
function MonacoEditor ( {
@@ -166,6 +167,7 @@ function MonacoEditor ({
166
167
modelRef . current = undefined
167
168
editorRef . current ?. setModel ( null )
168
169
}
170
+ return undefined
169
171
} , [ monacoLanguage , modelUri , valueRef , lastSaveViewState , lastRestoreViewState ] )
170
172
171
173
// Create editor
@@ -207,6 +209,7 @@ function MonacoEditor ({
207
209
editor . dispose ( )
208
210
}
209
211
}
212
+ return undefined
210
213
// eslint-disable-next-line react-hooks/exhaustive-deps
211
214
} , [ ] )
212
215
@@ -260,6 +263,7 @@ function MonacoEditor ({
260
263
monaco . editor . setModelMarkers ( model , 'customMarkers' , [ ] )
261
264
}
262
265
}
266
+ return undefined
263
267
} , [ markers ] )
264
268
265
269
// Call onChange callback
@@ -275,6 +279,7 @@ function MonacoEditor ({
275
279
didChangeModelContentDisposable . dispose ( )
276
280
}
277
281
}
282
+ return undefined
278
283
} , [ onChange ] )
279
284
280
285
useEffect ( ( ) => {
@@ -289,6 +294,7 @@ function MonacoEditor ({
289
294
disposable . dispose ( )
290
295
}
291
296
}
297
+ return undefined
292
298
} , [ onEditorOpenRequest ] )
293
299
294
300
// Compute height
0 commit comments