Skip to content

Commit 5a44ca0

Browse files
authored
Merge pull request #20 from CodinGame/update-vscode-api
Update vscode api
2 parents 71585a7 + 3ae4920 commit 5a44ca0

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"types": "dist/index.d.ts",
2121
"dependencies": {
22-
"@codingame/monaco-editor-wrapper": "^2.0.0",
22+
"@codingame/monaco-editor-wrapper": "^2.2.0",
2323
"deep-equal": "^2.0.5",
2424
"lodash.debounce": "^4.0.8"
2525
},

src/MonacoEditor.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { ForwardedRef, forwardRef, ReactElement, useEffect, useMemo, useR
22
import debounce from 'lodash.debounce'
33
import { monaco, createEditor, getMonacoLanguage, updateEditorKeybindingsMode, registerEditorOpenHandler } from '@codingame/monaco-editor-wrapper'
44
import { IEditorOptions } from 'vscode/service-override/modelEditor'
5-
import { useDeepMemo, useLastValueRef, useLastVersion, useThemeData, useUserConfiguration } from './hooks'
5+
import { useDeepMemo, useLastValueRef, useLastVersion, useThemeData } from './hooks'
66
import './style'
77

88
const STATUS_BAR_HEIGHT = 20
@@ -122,15 +122,13 @@ function MonacoEditor ({
122122
const statusBarRef = useRef<HTMLDivElement>(null)
123123
const monacoLanguage = useMemo(() => programmingLanguage != null ? getMonacoLanguage(programmingLanguage) : undefined, [programmingLanguage])
124124

125-
const userConfiguration = useUserConfiguration(monacoLanguage)
126125
const memoizedOptions = useDeepMemo(() => options, [options])
127126
const allOptions = useMemo<monaco.editor.IEditorOptions>(() => {
128127
return removeKeyBindingsManagedOptions({
129-
...userConfiguration,
130128
...memoizedOptions,
131129
automaticLayout: true
132130
}, keyBindingsMode)
133-
}, [memoizedOptions, userConfiguration, keyBindingsMode])
131+
}, [memoizedOptions, keyBindingsMode])
134132

135133
const modelUri = useMemo(() => {
136134
return fileUri != null ? monaco.Uri.parse(fileUri) : undefined

0 commit comments

Comments
 (0)