Code review changes

Author: Marcel Gerber

src/extensions/default/InlineColorEditor/InlineColorEditor.js

@@ -150,6 +150,7 @@ define(function (require, exports, module) {
                     self.hostEditor.setSelection(range.start, range.end); // workaround for #2805
                     self.hostEditor.document.replaceRange(colorString, range.start, range.end, self._origin);
                     self.hostEditor.setSelection(range.start, endPos);
+                    self._marker.clear();
                     self._marker = self.hostEditor._codeMirror.markText(range.start, endPos);
                 });
                 this._isOwnChange = false;

src/extensions/default/InlineColorEditor/unittests.js

@@ -242,12 +242,12 @@ define(function (require, exports, module) {
                     });
                 });
 
-                it("should close itself if edit is made that destroys end bookmark and leaves color invalid", function () {
+                it("should close itself if edit is made that destroys end textmark and leaves color invalid", function () {
                     makeColorEditor({line: 1, ch: 18});
                     runs(function () {
                         spyOn(inline, "close");
 
-                        // Replace everything including the semicolon, so it crosses the bookmark boundary.
+                        // Replace everything including the semicolon, so it crosses the textmark boundary.
                         testDocument.replaceRange("rgb(255, 25", {line: 1, ch: 16}, {line: 1, ch: 24});
                         expect(inline.close).toHaveBeenCalled();
                     });
@@ -266,7 +266,7 @@ define(function (require, exports, module) {
                     });
                 });
 
-                it("should not update the end bookmark and the color shown to a shorter valid match if the bookmark still exists and the color becomes invalid", function () {
+                it("should not update the end textmark and the color shown to a shorter valid match if the marker still exists and the color becomes invalid", function () {
                     makeColorEditor({line: 1, ch: 18});
                     runs(function () {
                         testDocument.replaceRange("", {line: 1, ch: 22}, {line: 1, ch: 23});
@@ -275,7 +275,7 @@ define(function (require, exports, module) {
                     });
                 });
 
-                it("should not update the end bookmark and the color shown to a shorter valid match if the bookmark no longer exists and the color becomes invalid", function () {
+                it("should not update the end textmark and the color shown to a shorter valid match if the marker no longer exists and the color becomes invalid", function () {
                     makeColorEditor({line: 1, ch: 18});
                     runs(function () {
                         testDocument.replaceRange("", {line: 1, ch: 22}, {line: 1, ch: 24});