rsaccon / Bespin playground / changeset / 05cd558177a9

Up to file-list frontend/js/bespin/editor/actions.js:

@@ -347,6 +347,64 @@ dojo.declare("bespin.editor.Actions", nu
         var undoOperation = undoArgs;
         this.editor.undoManager.addUndoOperation(new bespin.editor.UndoItem(undoOperation, redoOperation));
     },
     lexicalIndent: function(args) {
         if (this.editor.ui.syntaxModel.indent == undefined) {
             return;
+        }
         var historyIndent = args.historyIndent || false;
         var useHistoryIndent = !!historyIndent;
         if (!historyIndent) historyIndent = new Array();
         var settings = bespin.get('settings');
         var selection = args.selection || this.editor.getSelection();
         var fakeSelection = args.fakeSelection || false;
         var startRow = selection.startPos.row;
         var endRow = selection.endPos.row;
         var endRowLength = this.cursorManager.getStringLength(this.model.getRowArray(endRow).join(""));
         var cursorRowLength = this.cursorManager.getStringLength(this.model.getRowArray(args.pos.row).join(""));
         var indents = this.editor.ui.syntaxModel.indent(startRow, endRow, this.editor.language);
         for (var y = startRow; y <= endRow; y++) {
             //console.log(y, " ", indents[y] );
             if (indents[y] > 0) {
                 var charsToInsert;
                 var tab = '';
                 if (useHistoryIndent) {
                     charsToInsert = historyIndent[y - startRow];
                 } else {
                     var tabsize = indents[y];
                     while (tabsize-- > 0) {
                         tab += " ";
+                    }
                     charsToInsert = tab;
+                }
                 this.model.insertCharacters(this.cursorManager.getModelPosition({ row: y, col: 0 }), charsToInsert);
                 historyIndent[y - startRow] = charsToInsert;
             } else if (indents[y] < 0) {
                 var charsToDelete;
                 if (useHistoryIndent) {
                      charsToDelete = historyIndent[y - startRow].length;
                      charsWidth = (historyIndent[y - startRow] == '\t' ? this.editor.getTabSize() : historyIndent[y - startRow].length);
                 } else {
                     charsToDelete = -indents[y];
+                }
                 if (charsToDelete) {
                     this.model.deleteCharacters(this.cursorManager.getModelPosition({ row: y, col: 0 }), charsToDelete);
+                }
+            }
+        }
         this.cursorManager.moveCursor({ col: args.pos.col });
         if (!fakeSelection) {
             this.editor.setSelection(selection);
+        }
         historyIndent = historyIndent ? historyIndent : newHistoryIndent;
         this.repaint();
         // TODO: undo
     },
     // NOTE: Actually, clipboard.js is taking care of this unless EditorOnly mode is set
     cutSelection: function(args) {

Up to file-list frontend/js/bespin/editor/editor.js:

@@ -724,6 +724,7 @@ dojo.declare("bespin.editor.UI", null, {
         listener.bindKeyString("", Key.ENTER, this.actions.newline);
         listener.bindKeyString("", Key.TAB, this.actions.insertTab);
         listener.bindKeyString("SHIFT", Key.TAB, this.actions.unindent);
         listener.bindKeyString("CTRL", Key.TAB, this.actions.lexicalIndent);
         listener.bindKeyString("CMD", Key.A, this.actions.selectAll);

Up to file-list frontend/js/bespin/syntax/codemirror/_base.js:

@@ -100,6 +100,19 @@ dojo.declare("bespin.syntax.codemirror.M
+        }
         return syntaxResults;
     },
     indent: function(startLine, endLine, language) {
         var indentations = {};
         if (this.language != language) {
             this.engine = this.resolver.resolve(language);
             this.language = language;
+        }
         for (var currentLine = startLine; currentLine <= endLine; currentLine++) {
             indentations[currentLine] = this.engine.indentations[currentLine];
+        }
         return indentations;
+    }
 });
@@ -164,8 +177,11 @@ dojo.declare("bespin.syntax.codemirror.B
     indentUnit: 4,
-    // the parser and its frozen state on a per line basis
+    // Each line caches the parser state
     parsers: [],
     // Each line caches the lexical correct indentation
     indentations: [],
     // the textlines (minus "\n" at line-end)
     rows: [],
@@ -507,6 +523,8 @@ dojo.declare("bespin.syntax.codemirror.B
         var self = this;
         var lineInfos = {};
         var from = firstLineToRender;
         var firstTokenContent = null;
         var firstTokenStart;
         var parser;
         for (var currentLine = firstLineToRender; currentLine <= lastLineToRender; currentLine++) {
@@ -529,8 +547,16 @@ dojo.declare("bespin.syntax.codemirror.B
         var parsed = (parser) ? parser(stream) : this.makeParser(stream);
         this.forEach.call(this, parsed, function(token){
             if ((firstTokenContent === null) && (token.type != "whitespace")) {
                  firstTokenContent = token.content;
                  firstTokenStart = token.start;
                  console.log(firstTokenContent, " ", firstTokenStart);
+            }
             if (token.value == "\n") {
                 self.parsers[token.lineNumber] = parsed.copy();
                 self.indentations[token.lineNumber] = token.indentation(firstTokenContent) - firstTokenStart;
                 firstTokenContent = null;
+            }
             if (token.lineNumber > lastLineToRender) {

commit 936:	05cd558177a9
parent 870:	ae93e926e392
branch:	default
tags:	tip

rsaccon / Bespin playground (http://rsaccon.com/)