1919
2020import React from 'react' ;
2121import { CodeEditor } from './code_editor' ;
22- import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api ' ;
22+ import { monaco } from '@kbn/ui-shared-deps/monaco ' ;
2323import { shallow } from 'enzyme' ;
2424
2525import 'monaco-editor/esm/vs/basic-languages/html/html.contribution.js' ;
2626
2727// A sample language definition with a few example tokens
28- const simpleLogLang : monacoEditor . languages . IMonarchLanguage = {
28+ const simpleLogLang : monaco . languages . IMonarchLanguage = {
2929 tokenizer : {
3030 root : [
3131 [ / \[ e r r o r .* / , 'constant' ] ,
@@ -36,8 +36,8 @@ const simpleLogLang: monacoEditor.languages.IMonarchLanguage = {
3636 } ,
3737} ;
3838
39- monacoEditor . languages . register ( { id : 'loglang' } ) ;
40- monacoEditor . languages . setMonarchTokensProvider ( 'loglang' , simpleLogLang ) ;
39+ monaco . languages . register ( { id : 'loglang' } ) ;
40+ monaco . languages . setMonarchTokensProvider ( 'loglang' , simpleLogLang ) ;
4141
4242const logs = `
4343[Sun Mar 7 20:54:27 2004] [notice] [client xx.xx.xx.xx] This is a notice!
@@ -55,35 +55,34 @@ test('is rendered', () => {
5555
5656test ( 'editor mount setup' , ( ) => {
5757 const suggestionProvider = {
58- provideCompletionItems : (
59- model : monacoEditor . editor . ITextModel ,
60- position : monacoEditor . Position
61- ) => ( { suggestions : [ ] } ) ,
58+ provideCompletionItems : ( model : monaco . editor . ITextModel , position : monaco . Position ) => ( {
59+ suggestions : [ ] ,
60+ } ) ,
6261 } ;
6362 const signatureProvider = {
6463 provideSignatureHelp : ( ) => ( { signatures : [ ] , activeParameter : 0 , activeSignature : 0 } ) ,
6564 } ;
6665 const hoverProvider = {
67- provideHover : ( model : monacoEditor . editor . ITextModel , position : monacoEditor . Position ) => ( {
66+ provideHover : ( model : monaco . editor . ITextModel , position : monaco . Position ) => ( {
6867 contents : [ ] ,
6968 } ) ,
7069 } ;
7170
7271 const editorWillMount = jest . fn ( ) ;
7372
74- monacoEditor . languages . onLanguage = jest . fn ( ( languageId , func ) => {
73+ monaco . languages . onLanguage = jest . fn ( ( languageId , func ) => {
7574 expect ( languageId ) . toBe ( 'loglang' ) ;
7675
7776 // Call the function immediately so we can see our providers
7877 // get setup without a monaco editor setting up completely
7978 func ( ) ;
8079 } ) as any ;
8180
82- monacoEditor . languages . registerCompletionItemProvider = jest . fn ( ) ;
83- monacoEditor . languages . registerSignatureHelpProvider = jest . fn ( ) ;
84- monacoEditor . languages . registerHoverProvider = jest . fn ( ) ;
81+ monaco . languages . registerCompletionItemProvider = jest . fn ( ) ;
82+ monaco . languages . registerSignatureHelpProvider = jest . fn ( ) ;
83+ monaco . languages . registerHoverProvider = jest . fn ( ) ;
8584
86- monacoEditor . editor . defineTheme = jest . fn ( ) ;
85+ monaco . editor . defineTheme = jest . fn ( ) ;
8786
8887 const wrapper = shallow (
8988 < CodeEditor
@@ -98,21 +97,17 @@ test('editor mount setup', () => {
9897 ) ;
9998
10099 const instance = wrapper . instance ( ) as CodeEditor ;
101- instance . _editorWillMount ( monacoEditor ) ;
100+ instance . _editorWillMount ( monaco ) ;
102101
103102 // Verify our mount callback will be called
104103 expect ( editorWillMount . mock . calls . length ) . toBe ( 1 ) ;
105104
106105 // Verify our theme will be setup
107- expect ( ( monacoEditor . editor . defineTheme as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
106+ expect ( ( monaco . editor . defineTheme as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
108107
109108 // Verify our language features have been registered
110- expect ( ( monacoEditor . languages . onLanguage as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
111- expect (
112- ( monacoEditor . languages . registerCompletionItemProvider as jest . Mock ) . mock . calls . length
113- ) . toBe ( 1 ) ;
114- expect (
115- ( monacoEditor . languages . registerSignatureHelpProvider as jest . Mock ) . mock . calls . length
116- ) . toBe ( 1 ) ;
117- expect ( ( monacoEditor . languages . registerHoverProvider as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
109+ expect ( ( monaco . languages . onLanguage as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
110+ expect ( ( monaco . languages . registerCompletionItemProvider as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
111+ expect ( ( monaco . languages . registerSignatureHelpProvider as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
112+ expect ( ( monaco . languages . registerHoverProvider as jest . Mock ) . mock . calls . length ) . toBe ( 1 ) ;
118113} ) ;
0 commit comments