make jslint happy

experiments/worker.js

@@ -1,3 +1,3 @@
 onmessage = function(e) {
     onmessage = new Function("e", e.data);
-}
+};

src/BackgroundTokenizer.js

@@ -45,7 +45,7 @@ ace.BackgroundTokenizer = function(tokenizer, onUpdate, onComplete) {
 
         self.onUpdate(startLine, textLines.length - 1);
         self.onComplete();
-    }
+    };
 };
 
 ace.BackgroundTokenizer.prototype.setLines = function(textLines) {

src/CursorLayer.js

@@ -10,7 +10,7 @@ ace.CursorLayer = function(parentEl) {
     this.cursor.className = "cursor";
 
     this.isVisible = false;
-}
+};
 
 ace.CursorLayer.prototype.setCursor = function(position) {
     this.position = {
@@ -47,7 +47,7 @@ ace.CursorLayer.prototype.getPixelPosition = function() {
         left : 0,
         top : 0
     };
-}
+};
 
 ace.CursorLayer.prototype.update = function(config) {
     if (!this.position)

src/Editor.js

@@ -16,7 +16,7 @@ var keys = {
         BACKSPACE : 8,
         TAB : 9,
         A : 65
-}
+    };
 
     var KeyBinding = function(element, host) {
         ace.addListener(element, "keydown", function(e) {
@@ -31,7 +31,10 @@ var KeyBinding = function(element, host) {
                     break;
 
                 case keys.UP:
-                if (e.metaKey) {
+                    if (e.metaKey && e.shiftKey) {
+                        host.selectFileStart();
+                    }
+                    else if (e.metaKey) {
                         host.navigateFileStart();
                     }
                     if (e.shiftKey) {
@@ -43,7 +46,10 @@ var KeyBinding = function(element, host) {
                     return ace.stopEvent(e);
 
                 case keys.DOWN:
-                if (e.metaKey) {
+                    if (e.metaKey && e.shiftKey) {
+                        host.selectFileEnd();
+                    }
+                    else if (e.metaKey) {
                         host.navigateFileEnd();
                     }
                     if (e.shiftKey) {
@@ -261,7 +267,7 @@ ace.Editor.prototype.onMouseDoubleClick = function(e) {
             do {
                 start--;
             }
-        while (start >= 0 && line.charAt(start).match(re))
+            while (start >= 0 && line.charAt(start).match(re));
             start++;
         }
 
@@ -321,7 +327,7 @@ ace.Editor.prototype.removeRight = function() {
             var rangeEnd = {
                 row : this.cursor.row,
                 column : this.cursor.column + 1
-        }
+            };
             if (rangeEnd.column > this.doc.getLine(this.cursor.row).length) {
                 rangeEnd.row += 1;
                 rangeEnd.column = 0;
@@ -346,7 +352,7 @@ ace.Editor.prototype.removeRight = function() {
                     var rangeStart = {
                         row : this.cursor.row,
                         column : this.cursor.column + -1
-                }
+                    };
                     if (rangeStart.column < 0) {
                         rangeStart.row -= 1;
                         rangeStart.column = this.doc
@@ -545,7 +551,7 @@ ace.Editor.prototype.getCursorPosition = function() {
         return {
             row : this.cursor.row,
             column : this.cursor.column
-    }
+        };
     };
 
     ace.Editor.prototype.hasSelection = function() {
@@ -577,13 +583,13 @@ ace.Editor.prototype.getSelectionRange = function() {
                 return {
                     start : lead,
                     end : anchor
-            }
+                };
             }
             else {
                 return {
                     start : anchor,
                     end : lead
-            }
+                };
             }
         }
     };
@@ -612,7 +618,7 @@ ace.Editor.prototype._moveSelection = function(mover) {
             this.selectionAnchor = {
                 row : this.cursor.row,
                 column : this.cursor.column
-        }
+            };
         }
 
         mover.call(this);
@@ -620,7 +626,7 @@ ace.Editor.prototype._moveSelection = function(mover) {
         this.selectionLead = {
             row : this.cursor.row,
             column : this.cursor.column
-    }
+        };
 
         if (this.selection) {
             this.renderer.removeMarker(this.selection);
@@ -676,11 +682,19 @@ ace.Editor.prototype.selectPageUp = function() {
         });
     };
 
+    ace.Editor.prototype.selectFileEnd = function() {
+        this._moveSelection(this.moveCursorFileEnd);
+    };
+
+    ace.Editor.prototype.selectFileStart = function() {
+        this._moveSelection(this.moveCursorFileStart);
+    };
+
     ace.Editor.prototype.selectCurrentLine = function() {
         this.setSelectionAnchor(this.cursor.row, 0);
         this._moveSelection(function() {
             this.moveCursorTo(this.cursor.row + 1, 0);
         });
-}
+    };
 
 })();

src/GutterLayer.js

@@ -5,7 +5,7 @@ ace.GutterLayer = function(parentEl) {
     this.element = document.createElement("div");
     this.element.className = "layer gutter-layer";
     parentEl.appendChild(this.element);
-}
+};
 
 ace.GutterLayer.prototype.update = function(config) {
     var html = [];

src/JavaScript.js

@@ -71,7 +71,7 @@ ace.JavaScript.RULES = {
                     return "keyword";
                 }
                 else {
-                return "identifier"
+                    return "identifier";
                 }
             },
             regex : "[a-zA-Z_][a-zA-Z0-9_]*\\b"

src/MarkerLayer.js

@@ -8,7 +8,7 @@ ace.MarkerLayer = function(parentEl) {
 
     this.markers = {};
     this._markerId = 1;
-}
+};
 
 ace.MarkerLayer.prototype.addMarker = function(range, clazz) {
     var id = this._markerId++;

src/TextDocument.js

@@ -6,10 +6,10 @@ ace.TextDocument = function(text) {
     this.modified = true;
 
     this.listeners = [];
-}
+};
 
 ace.TextDocument.prototype._split = function(text) {
-    return text.split(/[\n\r]/)
+    return text.split(/[\n\r]/);
 };
 
 ace.TextDocument.prototype.addChangeListener = function(listener) {
@@ -67,37 +67,6 @@ ace.TextDocument.prototype.keywords = {
     "with" : 1
 };
 
-ace.TextDocument.prototype.getLineTokens = function(row) {
-    var tokens = [];
-
-    var re = /(?:(\s+)|("[^"]*")|('[^']*')|([\[\]\(\)\{\}])|([a-zA-Z_][a-zA-Z0-9_]*)|(\/\/.*)|(.))/g
-    re.lastIndex = 0;
-
-    var match;
-    var line = this.getLine(row);
-    while (match = re.exec(line)) {
-        var token = {
-            type : "text",
-            value : match[0]
-        }
-
-        if (match[2] || match[3]) {
-            token.type = "string";
-        }
-        else if (match[5] && this.keywords[match[5]]) {
-            token.type = "keyword";
-        }
-        else if (match[6]) {
-            token.type = "comment";
-        }
-
-        tokens.push(token);
-    }
-    ;
-
-    return tokens;
-};
-
 ace.TextDocument.prototype.getLength = function() {
     return this.lines.length;
 };
@@ -148,7 +117,7 @@ ace.TextDocument.prototype._insert = function(position, text) {
         return {
             row : position.row,
             column : position.column + text.length
-        }
+        };
     }
     else {
         var line = this.lines[position.row] || "";
@@ -159,7 +128,7 @@ ace.TextDocument.prototype._insert = function(position, text) {
                 + line.substring(position.column);
 
         if (newLines.length > 2) {
-            var args = [ position.row + 1, 0 ]
+            var args = [ position.row + 1, 0 ];
             args.push.apply(args, newLines.slice(1, -1));
             this.lines.splice.apply(this.lines, args);
         }
@@ -209,4 +178,4 @@ ace.TextDocument.prototype.replace = function(range, text) {
             : undefined);
 
     return end;
-}
+};

src/TextInput.js

@@ -19,8 +19,8 @@ ace.TextInput = function(parentNode, host) {
                     host.onTextInput(text.value);
                 text.value = "";
             }
-        }, 0)
+        }, 0);
-    }
+    };
 
     var onCompositionStart = function(e) {
         inCompostion = true;
@@ -31,28 +31,28 @@ ace.TextInput = function(parentNode, host) {
 
         host.onCompositionStart();
         setTimeout(onCompositionUpdate, 0);
-    }
+    };
 
     var onCompositionUpdate = function() {
         host.onCompositionUpdate(text.value);
-    }
+    };
 
     var onCompositionEnd = function() {
         inCompostion = false;
         host.onCompositionEnd();
         onTextInput();
-    }
+    };
 
     var onCopy = function() {
         text.value = host.getCopyText();
         text.select();
-    }
+    };
 
     var onCut = function() {
         text.value = host.getCopyText();
         host.onCut();
         text.select();
-    }
+    };
 
     ace.addListener(text, "keypress", onTextInput, false);
     ace.addListener(text, "textInput", onTextInput, false);
@@ -77,9 +77,9 @@ ace.TextInput = function(parentNode, host) {
 
     this.focus = function() {
         text.focus();
-    }
+    };
 
     this.blur = function() {
         this.blur();
-    }
+    };
 };

src/TextLayer.js

@@ -7,7 +7,7 @@ ace.TextLayer = function(parentEl) {
     parentEl.appendChild(this.element);
 
     this._measureSizes();
-}
+};
 
 ace.TextLayer.prototype.setTokenizer = function(tokenizer) {
     this.tokenizer = tokenizer;

src/Tokenizer.js

@@ -33,9 +33,9 @@ ace.Tokenizer.prototype.getLineTokens = function(line, startState) {
         var token = {
             type : "text",
             value : match[0]
-        }
+        };
 
-        if (re.lastIndex == lastIndex) { throw new Error("tokenizer error") }
+        if (re.lastIndex == lastIndex) { throw new Error("tokenizer error"); }
         lastIndex = re.lastIndex;
 
         // console.log(match);
@@ -71,5 +71,5 @@ ace.Tokenizer.prototype.getLineTokens = function(line, startState) {
     return {
         tokens : tokens,
         state : currentState
-    }
+    };
 };

src/VirtualRenderer.js

@@ -32,7 +32,7 @@ ace.VirtualRenderer = function(container) {
         row : 0,
         column : 0
     };
-}
+};
 
 ace.VirtualRenderer.prototype.setDocument = function(doc) {
     this.lines = doc.lines;
@@ -63,7 +63,7 @@ ace.VirtualRenderer.prototype.updateLines = function(firstRow, lastRow) {
 
     // if the last row is unknow -> redraw everything
     if (lastRow === undefined) {
-        this.draw()
+        this.draw();
         return;
     }
 
@@ -108,7 +108,7 @@ ace.VirtualRenderer.prototype.draw = function() {
     this.gutterLayer.element.style.marginTop = (-offset) + "px";
     this.gutterLayer.element.style.height = minHeight + "px";
     this.gutterLayer.update(layerConfig);
-}
+};
 
 ace.VirtualRenderer.prototype.addMarker = function(range, clazz) {
     return this.markerLayer.addMarker(range, clazz);
@@ -134,7 +134,7 @@ ace.VirtualRenderer.prototype.showCursor = function() {
 ace.VirtualRenderer.prototype.scrollCursorIntoView = function() {
     var pos = this.cursorLayer.getPixelPosition();
 
-    var left = pos.left
+    var left = pos.left;
     var top = pos.top;
 
     if (this.getScrollTop() > top) {
@@ -163,7 +163,7 @@ ace.VirtualRenderer.prototype.getScrollTop = function() {
 
 ace.VirtualRenderer.prototype.scrollToRow = function(row) {
     this.scrollToY(row * this.lineHeight);
-}
+};
 
 ace.VirtualRenderer.prototype.scrollToY = function(scrollTop) {
     var maxHeight = this.lines.length * this.lineHeight
@@ -187,7 +187,7 @@ ace.VirtualRenderer.prototype.screenToTextCoordinates = function(pageX, pageY) {
     return {
         row : row,
         column : col
-    }
+    };
 };
 
 ace.VirtualRenderer.prototype.visualizeFocus = function() {

src/lib.js

@@ -10,11 +10,11 @@ ace.addListener = function(elem, type, callback) {
         if (elem.attachEvent) {
             var wrapper = function() {
                 callback(window.event);
-        }
+            };
             callback.$$wrapper = wrapper;
             elem.attachEvent("on" + type, wrapper);
         }
-}
+    };
 
     ace.removeListener = function(elem, type, callback) {
         if (elem.removeEventListener) { return elem
@@ -22,7 +22,7 @@ ace.removeListener = function(elem, type, callback) {
         if (elem.detachEvent) {
             elem.detachEvent("on" + type, callback.$$wrapper || callback);
         }
-}
+    };
 
     ace.setText = function(elem, text) {
         if (elem.innerText !== undefined) {
@@ -31,27 +31,27 @@ ace.setText = function(elem, text) {
         if (elem.textContent !== undefined) {
             elem.textContent = text;
         }
-}
+    };
 
     ace.stopEvent = function(e) {
         ace.stopPropagation(e);
         ace.preventDefault(e);
         return false;
-}
+    };
 
     ace.stopPropagation = function(e) {
         if (e.stopPropagation)
             e.stopPropagation();
         else
             e.cancelBubble = true;
-}
+    };
 
     ace.preventDefault = function(e) {
         if (e.preventDefault)
             e.preventDefault();
         else
             e.returnValue = false;
-}
+    };
 
     ace.inherits = function(ctor, superCtor) {
         var tempCtor = function() {
@@ -79,7 +79,7 @@ ace.computedStyle = function(element, style) {
         else {
             return element.currentStyle[style];
         }
-}
+    };
 
     ace.scrollbarHeight = function() {
         var el = document.createElement("div");
@@ -95,13 +95,13 @@ ace.scrollbarHeight = function() {
         document.body.removeChild(el);
 
         return height;
-}
+    };
 
     ace.bind = function(fcn, context) {
         return function() {
             return fcn.apply(context, arguments);
-    }
+        };
-}
+    };
 
     ace.capture = function(el, eventHandler, releaseCaptureHandler) {
         function onMouseMove(e) {
@@ -121,14 +121,14 @@ ace.capture = function(el, eventHandler, releaseCaptureHandler) {
 
         document.addEventListener("mousemove", onMouseMove, true);
         document.addEventListener("mouseup", onMouseUp, true);
-}
+    };
 
     ace.addMouseWheelListener = function(el, callback) {
         var listener = function(e) {
             e.wheel = (e.wheelDelta) ? e.wheelDelta / 120
                     : -(e.detail || 0) / 3;
             callback(e);
-    }
+        };
         ace.addListener(el, "DOMMouseScroll", listener);
         ace.addListener(el, "mousewheel", listener);
     };
@@ -138,7 +138,7 @@ ace.autoremoveListener = function(el, type, callback, timeout) {
             clearTimeout(timeoutId);
             remove();
             callback(e);
-    }
+        };
 
         var remove = function() {
             ace.removeListener(el, type, listener);
@@ -146,7 +146,7 @@ ace.autoremoveListener = function(el, type, callback, timeout) {
 
         ace.addListener(el, type, listener);
         var timeoutId = setTimeout(remove, timeout);
-}
+    };
 
     ace.addTripleClickListener = function(el, callback) {
         ace.addListener(el, "mousedown", function() {
@@ -154,6 +154,6 @@ ace.addTripleClickListener = function(el, callback) {
                 ace.autoremoveListener(el, "mousedown", callback, 300);
             }, 300);
         });
-}
+    };
 
 })();

test/MockRenderer.js

@@ -3,14 +3,14 @@ MockRenderer = function() {
     this.cursor = {
         row : 0,
         column : 0
-    }
+    };
 
     this.visibleRowCount = 20;
 
     this.layerConfig = {
         firstVisibleRow : 0,
-        lastVisibleRow: this.visibleRowCount,
+        lastVisibleRow : this.visibleRowCount
-    }
+    };
 };
 
 
@@ -41,18 +41,22 @@ MockRenderer.prototype.updateCursor = function(position) {
 MockRenderer.prototype.scrollCursorIntoView = function() {
     if (this.cursor.row < this.layerConfig.firstVisibleRow) {
         this.scrollToRow(this.cursor.row);
-    } else if (this.cursor.row > this.layerConfig.lastVisibleRow) {
+    }
+    else if (this.cursor.row > this.layerConfig.lastVisibleRow) {
         this.scrollToRow(this.cursor.row);
     }
 };
 
 MockRenderer.prototype.scrollToRow = function(row) {
-    var row = Math.min(this.lines.length - this.visibleRowCount, Math.max(0, row));
+    var row = Math.min(this.lines.length - this.visibleRowCount, Math.max(0,
+                                                                          row));
     this.layerConfig.firstVisibleRow = row;
     this.layerConfig.lastVisibleRow = row + this.visibleRowCount;
-}
+};
 
 
 MockRenderer.prototype.draw = function() {
 };
 
+MockRenderer.prototype.addMarker = function() {
+};

test/NavigationTest.js

@@ -47,5 +47,37 @@ var NavigationTest = TestCase("NavigationTest", {
         editor.navigateFileStart();
         
         assertEquals(0, editor.getFirstVisibleRow());
+    },
+    
+    "test: move selection lead to end of file" : function() {
+        var editor = new ace.Editor(this.createTextDocument(200, 10),
+                                    new MockRenderer());
+        
+        editor.moveCursorTo(100, 5);
+        editor.selectFileEnd();
+        
+        var selection = editor.getSelectionRange();
+        
+        assertEquals(100, selection.start.row);        
+        assertEquals(5, selection.start.column); 
+        
+        assertEquals(199, selection.end.row);        
+        assertEquals(10, selection.end.column);        
+    },
+    
+    "test: move selection lead to start of file" : function() {
+        var editor = new ace.Editor(this.createTextDocument(200, 10),
+                                    new MockRenderer());
+        
+        editor.moveCursorTo(100, 5);
+        editor.selectFileStart();
+        
+        var selection = editor.getSelectionRange();
+                
+        assertEquals(0, selection.start.row);        
+        assertEquals(0, selection.start.column);        
+
+        assertEquals(100, selection.end.row);        
+        assertEquals(5, selection.end.column); 
     }    
 });