diff --git a/types/codemirror/OTHER_FILES.txt b/types/codemirror/OTHER_FILES.txt index bfcf77bd56..e69de29bb2 100644 --- a/types/codemirror/OTHER_FILES.txt +++ b/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 \ No newline at end of file diff --git a/types/codemirror/codemirror-comment.d.ts b/types/codemirror/addon/comment/comment.d.ts similarity index 100% rename from types/codemirror/codemirror-comment.d.ts rename to types/codemirror/addon/comment/comment.d.ts diff --git a/types/codemirror/codemirror-panel.d.ts b/types/codemirror/addon/display/panel.d.ts similarity index 100% rename from types/codemirror/codemirror-panel.d.ts rename to types/codemirror/addon/display/panel.d.ts diff --git a/types/codemirror/codemirror-showhint.d.ts b/types/codemirror/addon/hint/show-hint.d.ts similarity index 100% rename from types/codemirror/codemirror-showhint.d.ts rename to types/codemirror/addon/hint/show-hint.d.ts diff --git a/types/codemirror/codemirror-runmode.d.ts b/types/codemirror/addon/runmode/runmode.d.ts similarity index 100% rename from types/codemirror/codemirror-runmode.d.ts rename to types/codemirror/addon/runmode/runmode.d.ts diff --git a/types/codemirror/searchcursor.d.ts b/types/codemirror/addon/search/searchcursor.d.ts similarity index 100% rename from types/codemirror/searchcursor.d.ts rename to types/codemirror/addon/search/searchcursor.d.ts diff --git a/types/codemirror/codemirror-tern.d.ts b/types/codemirror/addon/tern/tern.d.ts similarity index 100% rename from types/codemirror/codemirror-tern.d.ts rename to types/codemirror/addon/tern/tern.d.ts diff --git a/types/codemirror/test/comment.ts b/types/codemirror/test/addon/comment/comment.ts similarity index 85% rename from types/codemirror/test/comment.ts rename to types/codemirror/test/addon/comment/comment.ts index 397c8f0092..785b3439fe 100644 --- a/types/codemirror/test/comment.ts +++ b/types/codemirror/test/addon/comment/comment.ts @@ -1,5 +1,6 @@ +import * as CodeMirror from "codemirror"; +import "codemirror/addon/comment/comment"; -/// const editor = CodeMirror(document.body); const position: CodeMirror.Position = { ch: 0, line: 0 }; const opt: CodeMirror.CommentOptions = { diff --git a/types/codemirror/test/addon/display/panel.ts b/types/codemirror/test/addon/display/panel.ts new file mode 100644 index 0000000000..f03696d296 --- /dev/null +++ b/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(); diff --git a/types/codemirror/test/addon/edit/closebrackets.ts b/types/codemirror/test/addon/edit/closebrackets.ts index b614ca61b4..013117c229 100644 --- a/types/codemirror/test/addon/edit/closebrackets.ts +++ b/types/codemirror/test/addon/edit/closebrackets.ts @@ -1,9 +1,10 @@ -/// +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 }); diff --git a/types/codemirror/test/addon/edit/closetag.ts b/types/codemirror/test/addon/edit/closetag.ts index 6a46b7235e..ffc3dbd508 100644 --- a/types/codemirror/test/addon/edit/closetag.ts +++ b/types/codemirror/test/addon/edit/closetag.ts @@ -1,6 +1,6 @@ -/// +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 }); diff --git a/types/codemirror/test/addon/edit/matchbrackets.ts b/types/codemirror/test/addon/edit/matchbrackets.ts index 6a41b791b2..31d679ca58 100644 --- a/types/codemirror/test/addon/edit/matchbrackets.ts +++ b/types/codemirror/test/addon/edit/matchbrackets.ts @@ -1,6 +1,6 @@ -/// +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 }); diff --git a/types/codemirror/test/addon/edit/matchtags.ts b/types/codemirror/test/addon/edit/matchtags.ts index b993ebaa3b..316f13094f 100644 --- a/types/codemirror/test/addon/edit/matchtags.ts +++ b/types/codemirror/test/addon/edit/matchtags.ts @@ -1,7 +1,6 @@ +import * as CodeMirror from "codemirror"; +import "codemirror/addon/edit/matchtags"; -/// - - -var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { +const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { matchTags: { bothTags: true} }); diff --git a/types/codemirror/test/showhint.ts b/types/codemirror/test/addon/hint/show-hint.ts similarity index 79% rename from types/codemirror/test/showhint.ts rename to types/codemirror/test/addon/hint/show-hint.ts index d9aca693cf..3bbc073736 100644 --- a/types/codemirror/test/showhint.ts +++ b/types/codemirror/test/addon/hint/show-hint.ts @@ -1,7 +1,8 @@ -/// +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, diff --git a/types/codemirror/test/addon/runmode/runmode.ts b/types/codemirror/test/addon/runmode/runmode.ts new file mode 100644 index 0000000000..8e7807c9f1 --- /dev/null +++ b/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); diff --git a/types/codemirror/test/addon/scroll/scrollpastend.ts b/types/codemirror/test/addon/scroll/scrollpastend.ts index 8dc3d96149..c725d6022f 100644 --- a/types/codemirror/test/addon/scroll/scrollpastend.ts +++ b/types/codemirror/test/addon/scroll/scrollpastend.ts @@ -1,7 +1,6 @@ +import * as CodeMirror from "codemirror"; +import "codemirror/addon/scroll/scrollpastend"; -/// - - -var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { +const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { scrollPastEnd: true }); diff --git a/types/codemirror/test/addon/search/match-highlighter.ts b/types/codemirror/test/addon/search/match-highlighter.ts index 970384bd45..2fb0c780f1 100644 --- a/types/codemirror/test/addon/search/match-highlighter.ts +++ b/types/codemirror/test/addon/search/match-highlighter.ts @@ -1,7 +1,6 @@ +import * as CodeMirror from "codemirror"; +import "codemirror/addon/search/match-highlighter"; -/// - - -var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { +const myCodeMirror: CodeMirror.Editor = CodeMirror(document.body, { highlightSelectionMatches: true }); diff --git a/types/codemirror/test/searchcursor.ts b/types/codemirror/test/addon/search/searchcursor.ts similarity index 53% rename from types/codemirror/test/searchcursor.ts rename to types/codemirror/test/addon/search/searchcursor.ts index 3f23c894e4..2b733f31e6 100644 --- a/types/codemirror/test/searchcursor.ts +++ b/types/codemirror/test/addon/search/searchcursor.ts @@ -1,8 +1,8 @@ -/// +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'); diff --git a/types/codemirror/test/addon/selection/active-line.ts b/types/codemirror/test/addon/selection/active-line.ts index aa1aba3de3..a8ef46a117 100644 --- a/types/codemirror/test/addon/selection/active-line.ts +++ b/types/codemirror/test/addon/selection/active-line.ts @@ -1,5 +1,6 @@ -/// +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 }); diff --git a/types/codemirror/test/tern.ts b/types/codemirror/test/addon/tern/tern.ts similarity index 78% rename from types/codemirror/test/tern.ts rename to types/codemirror/test/addon/tern/tern.ts index 223def12cb..cb46ac8d3e 100644 --- a/types/codemirror/test/tern.ts +++ b/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); -/// const options: CodeMirror.TernOptions = { completionTip: (data) => { diff --git a/types/codemirror/test/index.ts b/types/codemirror/test/index.ts index 3bd4168355..2bcc5e9d89 100644 --- a/types/codemirror/test/index.ts +++ b/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 diff --git a/types/codemirror/test/panel.ts b/types/codemirror/test/panel.ts deleted file mode 100644 index a329359bd9..0000000000 --- a/types/codemirror/test/panel.ts +++ /dev/null @@ -1,17 +0,0 @@ -/// -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(); diff --git a/types/codemirror/test/runmode.ts b/types/codemirror/test/runmode.ts deleted file mode 100644 index 32f9ac7fa8..0000000000 --- a/types/codemirror/test/runmode.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// - -var query = "SELECT * FROM Table"; - -CodeMirror.runMode(query, "text/x-sql", document.body); diff --git a/types/codemirror/tsconfig.json b/types/codemirror/tsconfig.json index 2e210b3668..08de263458 100644 --- a/types/codemirror/tsconfig.json +++ b/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" ] } \ No newline at end of file