[codemirror] Move addon files to match how are actually imported (#41037)

* Move addon files to match how are actually imported

Also use const \ let instead of var to avoid global variables

* Remove referenced files from OTHER_FILES.txt

types/codemirror/OTHER_FILES.txt

@@ -1,13 +0,0 @@
-addon/edit/closebrackets.d.ts
-addon/edit/closetag.d.ts
-addon/edit/matchbrackets.d.ts
-addon/edit/matchtags.d.ts
-addon/scroll/scrollpastend.d.ts
-addon/search/match-highlighter.d.ts
-addon/selection/active-line.d.ts
-codemirror-comment.d.ts
-codemirror-panel.d.ts
-codemirror-runmode.d.ts
-codemirror-showhint.d.ts
-codemirror-tern.d.ts
-searchcursor.d.ts

types/codemirror/test/addon/comment/comment.ts

@@ -1,5 +1,6 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/comment/comment";
 
-/// <reference types="../../codemirror/codemirror-comment" />
 const editor = CodeMirror(document.body);
 const position: CodeMirror.Position = { ch: 0, line: 0 };
 const opt: CodeMirror.CommentOptions = {

types/codemirror/test/addon/display/panel.ts

@@ -0,0 +1,19 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/display/panel";
+
+const cm: CodeMirror.Editor = CodeMirror(document.body);
+
+const panel1 = cm.addPanel(document.body);
+
+const panel2: CodeMirror.Panel = cm.addPanel(document.body, {
+    position: "top",
+    after: panel1,
+    before: panel1,
+    replace: panel1,
+    stable: true
+});
+
+panel2.changed();
+panel2.changed(100);
+
+panel2.clear();

types/codemirror/test/addon/edit/closebrackets.ts

@@ -1,9 +1,10 @@
-/// <reference types="../../../../codemirror/addon/edit/closebrackets" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/edit/closebrackets";
 
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     autoCloseBrackets: "()[]{}''\"\""
 });
 
-var myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
     autoCloseBrackets: true
 });

types/codemirror/test/addon/edit/closetag.ts

@@ -1,6 +1,6 @@
-/// <reference types="../../../../codemirror/addon/edit/closetag" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/edit/closetag";
 
-
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     autoCloseTags: true
 });

types/codemirror/test/addon/edit/matchbrackets.ts

@@ -1,6 +1,6 @@
-/// <reference types="../../../../codemirror/addon/edit/matchbrackets" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/edit/matchbrackets";
 
-
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     matchBrackets: true
 });

types/codemirror/test/addon/edit/matchtags.ts

@@ -1,7 +1,6 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/edit/matchtags";
 
-/// <reference types="../../../../codemirror/addon/edit/matchtags" />
-
-
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     matchTags: { bothTags: true}
 });

types/codemirror/test/addon/hint/show-hint.ts

@@ -1,7 +1,8 @@
-/// <reference types="../../codemirror/codemirror-showhint" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/hint/show-hint";
 
-var cm = CodeMirror(document.body, {value: 'text'});
-var pos = new CodeMirror.Pos(2, 3);
+const cm = CodeMirror(document.body, {value: 'text'});
+const pos = new CodeMirror.Pos(2, 3);
 CodeMirror.showHint(cm);
 CodeMirror.showHint(cm, function (cm) {
     return {
@@ -31,7 +32,7 @@ CodeMirror.showHint(cm, function (cm) {
         to: pos
     };
 });
-var asyncHintFunc : CodeMirror.AsyncHintFunction =
+const asyncHintFunc : CodeMirror.AsyncHintFunction =
     (cm: CodeMirror.Editor, callback: (hints: CodeMirror.Hints) => any) => {
         callback({
             from: pos,

types/codemirror/test/addon/runmode/runmode.ts

@@ -0,0 +1,6 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/runmode/runmode";
+
+const query = "SELECT * FROM Table";
+
+CodeMirror.runMode(query, "text/x-sql", document.body);

types/codemirror/test/addon/scroll/scrollpastend.ts

@@ -1,7 +1,6 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/scroll/scrollpastend";
 
-/// <reference types="../../../../codemirror/addon/scroll/scrollpastend" />
-
-
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     scrollPastEnd: true
 });

types/codemirror/test/addon/search/match-highlighter.ts

@@ -1,7 +1,6 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/search/match-highlighter";
 
-/// <reference types="../../../../codemirror/addon/search/match-highlighter" />
-
-
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     highlightSelectionMatches: true
 });

types/codemirror/test/addon/search/searchcursor.ts

@@ -1,8 +1,8 @@
-/// <reference types="../../codemirror/searchcursor" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/search/searchcursor";
 
-
-var doc = new CodeMirror.Doc('text some string and another text match');
-var cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0), false);
+const doc = new CodeMirror.Doc('text some string and another text match');
+let cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0), false);
 cursor = doc.getSearchCursor('text', new CodeMirror.Pos(0,0));
 cursor = doc.getSearchCursor('text');
 

types/codemirror/test/addon/selection/active-line.ts

@@ -1,5 +1,6 @@
-/// <reference types="../../../../codemirror/addon/selection/active-line" />
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/selection/active-line";
 
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, {
     styleActiveLine: true
 });

types/codemirror/test/addon/tern/tern.ts

@@ -1,5 +1,8 @@
+import * as CodeMirror from "codemirror";
+import "codemirror/addon/tern/tern";
+
+const cm = CodeMirror(document.body);
 
-/// <reference types="../../codemirror/codemirror-tern" />
 const options: CodeMirror.TernOptions = {
 
     completionTip: (data) => {

types/codemirror/test/index.ts

@@ -1,8 +1,8 @@
 import CodeMirror = require('codemirror');
 
-var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body);
+const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body);
 
-var myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
     value: "function myScript(){return 100;}\n",
     mode: "javascript",
     extraKeys: {
@@ -12,34 +12,34 @@ var myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
 });
 
 // $ExpectError
-var myCodeMirror2_1: CodeMirror.Editor = CodeMirror(document.body, {
+const myCodeMirror2_1: CodeMirror.Editor = CodeMirror(document.body, {
     extraKeys: {
         "Shift-Enter": (cm) => { return 42; }  // not a valid return value
     }
 });
 
-var range = myCodeMirror2.findWordAt(CodeMirror.Pos(0, 2));
-var anchor = range.anchor;
-var head = range.head;
-var from = range.from();
-var to = range.to();
+const range = myCodeMirror2.findWordAt(CodeMirror.Pos(0, 2));
+const anchor = range.anchor;
+const head = range.head;
+const from = range.from();
+const to = range.to();
 
-var myTextArea: HTMLTextAreaElement = undefined!;
-var myCodeMirror3: CodeMirror.Editor = CodeMirror(function (elt) {
+const myTextArea: HTMLTextAreaElement = undefined!;
+const myCodeMirror3: CodeMirror.Editor = CodeMirror(function (elt) {
     myTextArea.parentNode!.replaceChild(elt, myTextArea);
 }, { value: myTextArea.value });
 
-var myCodeMirror4: CodeMirror.Editor = CodeMirror.fromTextArea(myTextArea);
+const myCodeMirror4: CodeMirror.Editor = CodeMirror.fromTextArea(myTextArea);
 
-var doc: CodeMirror.Doc = new CodeMirror.Doc('text');
-var doc2: CodeMirror.Doc = CodeMirror(document.body).getDoc();
+const doc: CodeMirror.Doc = new CodeMirror.Doc('text');
+const doc2: CodeMirror.Doc = CodeMirror(document.body).getDoc();
 
-var lintStateOptions: CodeMirror.LintStateOptions = {
+const lintStateOptions: CodeMirror.LintStateOptions = {
     async: true,
     hasGutters: true
 };
 
-var asyncLintOptions: CodeMirror.LintOptions = {
+const asyncLintOptions: CodeMirror.LintOptions = {
     async: true,
     hasGutters: true,
     getAnnotations: (content: string,
@@ -48,7 +48,7 @@ var asyncLintOptions: CodeMirror.LintOptions = {
                      codeMirror: CodeMirror.Editor) => {}
 };
 
-var syncLintOptions: CodeMirror.LintOptions = {
+const syncLintOptions: CodeMirror.LintOptions = {
     async: false,
     hasGutters: true,
     getAnnotations: (content: string,
@@ -56,10 +56,10 @@ var syncLintOptions: CodeMirror.LintOptions = {
                      codeMirror: CodeMirror.Editor): CodeMirror.Annotation[] => { return []; }
 };
 
-var updateLintingCallback: CodeMirror.UpdateLintingCallback = (codeMirror: CodeMirror.Editor,
+const updateLintingCallback: CodeMirror.UpdateLintingCallback = (codeMirror: CodeMirror.Editor,
                                                                annotations: CodeMirror.Annotation[]) => {};
 
-var annotation: CodeMirror.Annotation = {
+const annotation: CodeMirror.Annotation = {
     from: {
         ch: 0,
         line: 0

types/codemirror/test/panel.ts

@@ -1,17 +0,0 @@
-/// <reference types="../../codemirror/codemirror-panel" />
-var cm: CodeMirror.Editor = CodeMirror(document.body);
-
-var panel1 = cm.addPanel(document.body);
-
-var panel2: CodeMirror.Panel = cm.addPanel(document.body, {
-    position: "top",
-    after: panel1,
-    before: panel1,
-    replace: panel1,
-    stable: true
-});
-
-panel2.changed();
-panel2.changed(100);
-
-panel2.clear();

types/codemirror/test/runmode.ts

@@ -1,5 +0,0 @@
-/// <reference types="../../codemirror/codemirror-runmode" />
-
-var query = "SELECT * FROM Table";
-
-CodeMirror.runMode(query, "text/x-sql", document.body);

types/codemirror/tsconfig.json

@@ -19,19 +19,19 @@
     },
     "files": [
         "index.d.ts",
-        "test/comment.ts",
         "test/index.ts",
-        "test/panel.ts",
-        "test/runmode.ts",
-        "test/searchcursor.ts",
-        "test/showhint.ts",
-        "test/tern.ts",
+        "test/addon/comment/comment.ts",
+        "test/addon/display/panel.ts",
         "test/addon/edit/closebrackets.ts",
         "test/addon/edit/closetag.ts",
         "test/addon/edit/matchbrackets.ts",
         "test/addon/edit/matchtags.ts",
+        "test/addon/hint/show-hint.ts",
+        "test/addon/runmode/runmode.ts",
         "test/addon/scroll/scrollpastend.ts",
         "test/addon/search/match-highlighter.ts",
-        "test/addon/selection/active-line.ts"
+        "test/addon/search/searchcursor.ts",
+        "test/addon/selection/active-line.ts",
+        "test/addon/tern/tern.ts"
     ]
 }