Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

update codemirror to 5.24.0 #13116

Merged
merged 13 commits into from
Feb 28, 2017
Merged

update codemirror to 5.24.0 #13116

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cbad08e
update codemirror to 5.24.0
zaggino Feb 20, 2017
c590f02
fix unit tests because of new sticky flag
zaggino Feb 22, 2017
d447a65
update cm to 5.24.2
zaggino Feb 23, 2017
e42dcdd
fix css code hints tests
zaggino Feb 23, 2017
42e535f
fix html code hints tests
zaggino Feb 23, 2017
fdc7e17
fix html entity hinting tests
zaggino Feb 23, 2017
15b635b
fix inline color editor tests
zaggino Feb 25, 2017
447bc5c
fix preferences code hints tests
zaggino Feb 25, 2017
bd4b033
fix svg code hints tests
zaggino Feb 25, 2017
e212ea4
fix url code hinting tests
zaggino Feb 25, 2017
245fcc1
fix javascript quick edit tests
zaggino Feb 28, 2017
e26dfad
fix javascript code hints tests
zaggino Feb 28, 2017
1de6b88
fixes #13126
zaggino Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "brackets-src",
"dependencies": {
"codemirror": "5.21.0",
"codemirror": "5.24.0",
"less": "2.7.2"
}
}
13 changes: 9 additions & 4 deletions test/spec/CodeInspection-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ define(function (require, exports, module) {
};
}

// Helper functions for testing cursor position / selection range
function fixPos(pos) {
if (!("sticky" in pos)) {
pos.sticky = null;
}
}

beforeFirst(function () {
runs(function () {
SpecRunnerUtils.createTestWindowAndRun(this, function (w) {
Expand Down Expand Up @@ -925,8 +932,7 @@ define(function (require, exports, module) {

runs(function () {
CommandManager.execute(Commands.NAVIGATE_GOTO_FIRST_PROBLEM);

expect(EditorManager.getActiveEditor().getCursorPos()).toEqual({line: 1, ch: 3});
expect(fixPos(EditorManager.getActiveEditor().getCursorPos())).toEqual(fixPos({line: 1, ch: 3}));
});
});

Expand Down Expand Up @@ -956,9 +962,8 @@ define(function (require, exports, module) {

runs(function () {
CommandManager.execute(Commands.NAVIGATE_GOTO_FIRST_PROBLEM);

// 'first' error is in order of linter registration, not in line number order
expect(EditorManager.getActiveEditor().getCursorPos()).toEqual({line: 1, ch: 3});
expect(fixPos(EditorManager.getActiveEditor().getCursorPos())).toEqual(fixPos({line: 1, ch: 3}));
});
});

Expand Down
72 changes: 48 additions & 24 deletions test/spec/Document-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ define(function (require, exports, module) {
initialContentLines[2] = "new content";
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(1);
expect(result[0].start).toEqual({line: 2, ch: 11}); // end of "new content"
expect(result[0].end).toEqual({line: 2, ch: 11});
expect(result[0].start.line).toEqual(2);
expect(result[0].start.ch).toEqual(11); // end of "new content"
expect(result[0].end.line).toEqual(2);
expect(result[0].end.ch).toEqual(11);
expect(result[0].reversed).toBe(true);
});

Expand All @@ -83,8 +85,10 @@ define(function (require, exports, module) {
initialContentLines[2] = "new content";
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(1);
expect(result[0].start).toEqual({line: 2, ch: 4});
expect(result[0].end).toEqual({line: 2, ch: 4});
expect(result[0].start.line).toEqual(2);
expect(result[0].start.ch).toEqual(4);
expect(result[0].end.line).toEqual(2);
expect(result[0].end.ch).toEqual(4);
expect(result[0].reversed).toBe(true);
});

Expand All @@ -101,11 +105,15 @@ define(function (require, exports, module) {
initialContentLines.splice(3, 0, "");
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(2);
expect(result[0].start).toEqual({line: 3, ch: 0}); // pushed to end of modified text
expect(result[0].end).toEqual({line: 3, ch: 0});
expect(result[0].start.line).toEqual(3);
expect(result[0].start.ch).toEqual(0); // pushed to end of modified text
expect(result[0].end.line).toEqual(3);
expect(result[0].end.ch).toEqual(0);
expect(result[0].primary).toBe(true);
expect(result[1].start).toEqual({line: 6, ch: 0}); // pushed to end of modified text and updated for both edits
expect(result[1].end).toEqual({line: 6, ch: 0});
expect(result[1].start.line).toEqual(6);
expect(result[1].start.ch).toEqual(0); // pushed to end of modified text and updated for both edits
expect(result[1].end.line).toEqual(6);
expect(result[1].end.ch).toEqual(0);
expect(result[1].reversed).toBe(true);
});

Expand All @@ -122,11 +130,15 @@ define(function (require, exports, module) {
initialContentLines.splice(3, 0, "");
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(2);
expect(result[0].start).toEqual({line: 2, ch: 4}); // not modified since it's above the other edit
expect(result[0].end).toEqual({line: 2, ch: 4});
expect(result[0].start.line).toEqual(2);
expect(result[0].start.ch).toEqual(4); // not modified since it's above the other edit
expect(result[0].end.line).toEqual(2);
expect(result[0].end.ch).toEqual(4);
expect(result[0].primary).toBe(true);
expect(result[1].start).toEqual({line: 5, ch: 4}); // not pushed to end of modified text, but updated for previous edit
expect(result[1].end).toEqual({line: 5, ch: 4});
expect(result[1].start.line).toEqual(5);
expect(result[1].start.ch).toEqual(4); // not pushed to end of modified text, but updated for previous edit
expect(result[1].end.line).toEqual(5);
expect(result[1].end.ch).toEqual(4);
expect(result[1].reversed).toBe(true);
});

Expand All @@ -146,14 +158,20 @@ define(function (require, exports, module) {
initialContentLines.splice(3, 0, "");
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(3);
expect(result[0].start).toEqual({line: 1, ch: 15}); // pushed to end of first modified text
expect(result[0].end).toEqual({line: 1, ch: 15});
expect(result[0].start.line).toEqual(1);
expect(result[0].start.ch).toEqual(15); // pushed to end of first modified text
expect(result[0].end.line).toEqual(1);
expect(result[0].end.ch).toEqual(15);
expect(result[0].primary).toBeFalsy();
expect(result[1].start).toEqual({line: 3, ch: 0}); // pushed to end of second modified text
expect(result[1].end).toEqual({line: 3, ch: 0});
expect(result[1].start.line).toEqual(3);
expect(result[1].start.ch).toEqual(0); // pushed to end of second modified text
expect(result[1].end.line).toEqual(3);
expect(result[1].end.ch).toEqual(0);
expect(result[1].primary).toBe(true);
expect(result[2].start).toEqual({line: 6, ch: 0}); // pushed to end of third modified text and updated for both edits
expect(result[2].end).toEqual({line: 6, ch: 0});
expect(result[2].start.line).toEqual(6);
expect(result[2].start.ch).toEqual(0); // pushed to end of third modified text and updated for both edits
expect(result[2].end.line).toEqual(6);
expect(result[2].end.ch).toEqual(0);
expect(result[2].reversed).toBe(true);
});

Expand All @@ -173,14 +191,20 @@ define(function (require, exports, module) {
initialContentLines.splice(3, 0, "");
expect(myDocument.getText()).toEqual(initialContentLines.join("\n"));
expect(result.length).toBe(3);
expect(result[0].start).toEqual({line: 1, ch: 4}); // not fixed up
expect(result[0].end).toEqual({line: 1, ch: 4});
expect(result[0].start.line).toEqual(1);
expect(result[0].start.ch).toEqual(4); // not fixed up
expect(result[0].end.line).toEqual(1);
expect(result[0].end.ch).toEqual(4);
expect(result[0].primary).toBeFalsy();
expect(result[1].start).toEqual({line: 2, ch: 4}); // not fixed up, no need to adjust for first edit
expect(result[1].end).toEqual({line: 2, ch: 4});
expect(result[1].start.line).toEqual(2);
expect(result[1].start.ch).toEqual(4); // not fixed up, no need to adjust for first edit
expect(result[1].end.line).toEqual(2);
expect(result[1].end.ch).toEqual(4);
expect(result[1].primary).toBe(true);
expect(result[2].start).toEqual({line: 5, ch: 4}); // not pushed to end of modified text, but updated for previous edit
expect(result[2].end).toEqual({line: 5, ch: 4});
expect(result[2].start.line).toEqual(5);
expect(result[2].start.ch).toEqual(4); // not pushed to end of modified text, but updated for previous edit
expect(result[2].end.line).toEqual(5);
expect(result[2].end.ch).toEqual(4);
expect(result[2].reversed).toBe(true);
});

Expand Down
23 changes: 22 additions & 1 deletion test/spec/DocumentCommandHandlers-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,27 @@ define(function (require, exports, module) {
});
});

// Helper functions for testing cursor position / selection range
function fixPos(pos) {
if (!("sticky" in pos)) {
pos.sticky = null;
}
return pos;
}
function fixSel(sel) {
fixPos(sel.start);
fixPos(sel.end);
if (!("reversed" in sel)) {
sel.reversed = false;
}
return sel;
}
function fixSels(sels) {
sels.forEach(function (sel) {
fixSel(sel);
});
return sels;
}

/** Expect a file to exist (failing test if not) and then delete it */
function expectAndDelete(fullPath) {
Expand Down Expand Up @@ -974,7 +995,7 @@ define(function (require, exports, module) {
var currentDocument = DocumentManager.getCurrentDocument(),
currentEditor = EditorManager.getActiveEditor();
expect(currentDocument.file.fullPath).toEqual(newFilePath);
expect(currentEditor.getSelections()).toEqual(selections);
expect(fixSels(currentEditor.getSelections())).toEqual(fixSels(selections));
});

runs(function () {
Expand Down
Loading