Fix codemirror typing issues.

examples/console/package.json

@@ -18,7 +18,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

examples/filebrowser/package.json

@@ -22,7 +22,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

examples/notebook/package.json

@@ -23,7 +23,7 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "css-loader": "~2.1.1",
     "file-loader": "~3.0.1",
     "mini-css-extract-plugin": "~0.6.0",

packages/codemirror-extension/src/index.ts

@@ -154,8 +154,9 @@ function activateEditorCommands(
     theme = (settings.get('theme').composite as string | null) || theme;
     scrollPastEnd = settings.get('scrollPastEnd').composite as boolean | null;
     styleActiveLine =
-      (settings.get('styleActiveLine').composite as boolean | object) ||
-      styleActiveLine;
+      (settings.get('styleActiveLine').composite as
+        | boolean
+        | CodeMirror.StyleActiveLine) || styleActiveLine;
     styleSelectedText =
       (settings.get('styleSelectedText').composite as boolean) ||
       styleSelectedText;

packages/codemirror/package.json

@@ -46,7 +46,7 @@
     "react": "~16.8.4"
   },
   "devDependencies": {
-    "@types/codemirror": "~0.0.70",
+    "@types/codemirror": "~0.0.74",
     "rimraf": "~2.6.2",
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3"

packages/codemirror/src/editor.ts

@@ -1209,7 +1209,7 @@ export namespace CodeMirrorEditor {
      * CodeMirror-activeline-background, and adds the class
      * CodeMirror-activeline-gutter to the line's gutter space is enabled.
      */
-    styleActiveLine: boolean | object;
+    styleActiveLine: boolean | CodeMirror.StyleActiveLine;
 
     /**
      * Whether to causes the selected text to be marked with the CSS class
@@ -1264,7 +1264,7 @@ export namespace CodeMirrorEditor {
     name: string,
     command: (cm: CodeMirror.Editor) => void
   ) {
-    CodeMirror.commands[name] = command;
+    (CodeMirror.commands as any)[name] = command;
   }
 }
 
@@ -1289,7 +1289,7 @@ namespace Private {
       ...otherOptions
     } = config;
     let bareConfig = {
-      autoCloseBrackets: autoClosingBrackets,
+      autoCloseBrackets: autoClosingBrackets ? {} : false,
       indentUnit: tabSize,
       indentWithTabs: !insertSpaces,
       lineWrapping: lineWrap === 'off' ? false : true,

packages/codemirror/typings/codemirror/codemirror.d.ts

@@ -76,10 +76,6 @@ declare module 'codemirror' {
     head: Position;
   }
 
-  var commands: {
-    [key: string]: any;
-  };
-
   // findMode* functions are from loading the codemirror/mode/meta module
   interface modespec {
     ext?: string[];
@@ -99,14 +95,6 @@ declare module 'codemirror' {
   function findModeByFileName(name: string): modespec;
   function findModeByMIME(mime: string): modespec;
 
-  var modes: {
-    [key: string]: any;
-  };
-
-  var mimeModes: {
-    [key: string]: any;
-  };
-
   // come back to this later
   interface Context {
     state: any;

yarn.lock

@@ -1735,7 +1735,7 @@
   resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614"
   integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=
 
-"@types/codemirror@~0.0.70":
+"@types/codemirror@~0.0.74":
   version "0.0.74"
   resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.74.tgz#7ca146f7f3414166e7501000d691b2f18d978d10"
   integrity sha512-pjc14HE6KCCk3SYoC49k/gJJHkredJy4GdSK+lGRMIBfG+Uq6vT8oZiKToFH2J7pZ5pUd69UGD6CgmFG1V17wA==