Changeset 169

Timestamp:

10/19/02 15:29:01 (21 years ago)

Author:

piso

Message:

Indentation.

Location:

trunk/j/src/org/armedbear/j

Files:

• LispMode.java (modified) (5 diffs)
• LispShellMode.java (modified) (5 diffs)

trunk/j/src/org/armedbear/j/LispMode.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: LispMode.java,v 1.8 2002-10-18 21:44:32 piso Exp $
+ * $Id: LispMode.java,v 1.9 2002-10-19 15:25:49 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -131 +131 @@
         if (modelTrim.charAt(0) == ';')
             return buffer.getIndentation(model);
-        
+
         final int indentSize = buffer.getIndentSize();
         Position pos = findContainingSexp(new Position(line, 0));
@@ -148 +148 @@
                 String token = gatherToken(it.getPosition());
                 if (token.equals("if")) {
+                    int depth = depth(line, buffer);
+                    int modelDepth = depth(model, buffer);
+                    if (pos.getLine() == model || modelDepth > depth)
+                        return buffer.getCol(pos) + indentSize * 2;
+                    else
+                        return buffer.getCol(pos) + indentSize;
+                }
+                if (token.equals("prog1")) {
                     if (pos.getLine() == model)
                         return buffer.getCol(pos) + indentSize * 2;
                     else
                         return buffer.getCol(pos) + indentSize;
-                } 
+                }
                 if (token.equals("let"))
                     return buffer.getCol(pos) + indentSize;
                 if (token.equals("while"))
+                    return buffer.getCol(pos) + indentSize;
+                if (token.equals("when"))
+                    return buffer.getCol(pos) + indentSize;
+                if (token.equals("unless"))
+                    return buffer.getCol(pos) + indentSize;
+                if (token.equals("unwind-protect"))
                     return buffer.getCol(pos) + indentSize;
                 if (token.startsWith("def"))
@@ -162 +176 @@
                 if (pos != null)
                     return buffer.getCol(pos);
-                
                 break; // Fall through.
             }
         }
 
-        int depth = depth(new Position(line, 0), buffer);
+        int depth = depth(line, buffer);
         if (depth > 0)
             return indentSize * depth;
@@ -215 +228 @@
     }
 
-    private int depth(Position pos, Buffer buffer)
+    private int depth(Line line, Buffer buffer)
     {
         if (buffer.needsRenumbering())
             buffer.renumber();
+        Position pos = new Position(line, 0);
         Position start = findStartOfDefun(pos);
         if (pos.equals(start))

trunk/j/src/org/armedbear/j/LispShellMode.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002 Peter Graves
- * $Id: LispShellMode.java,v 1.2 2002-10-15 01:32:57 piso Exp $
+ * $Id: LispShellMode.java,v 1.3 2002-10-19 15:29:01 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -35 +35 @@
         setProperty(Property.SHOW_CHANGE_MARKS, false);
         setProperty(Property.HIGHLIGHT_BRACKETS, true);
+        setProperty(Property.INDENT_SIZE, 2);
     }
 
@@ -44 +45 @@
     public Formatter getFormatter(Buffer buffer)
     {
-        return new ShellFormatter(buffer);
+        return new LispShellFormatter(buffer);
     }
 
@@ -54 +55 @@
         km.mapKey(KeyEvent.VK_P, CTRL_MASK, "shellPreviousInput");
         km.mapKey(KeyEvent.VK_N, CTRL_MASK, "shellNextInput");
-        km.mapKey(KeyEvent.VK_ENTER, 0, "shellEnter");
-        km.mapKey(KeyEvent.VK_TAB, 0, "shellTab");
+        km.mapKey(KeyEvent.VK_ENTER, 0, "LispShellMode.enter");
+        km.mapKey(KeyEvent.VK_TAB, 0, "indentLineOrRegion");
         km.mapKey(KeyEvent.VK_C, CTRL_MASK | ALT_MASK, "shellInterrupt");
         km.mapKey(KeyEvent.VK_T, CTRL_MASK, "findTag");
@@ -61 +62 @@
         km.mapKey(')', "closeParen");
     }
+
+    public static void enter()
+    {
+        CommandInterpreter.shellEnter();
+
+        final Editor editor = Editor.currentEditor();
+        final Display display = editor.getDisplay();
+        final Buffer buffer = editor.getBuffer();
+        final Mode mode = buffer.getMode();
+        if (mode != getMode()) {
+            Debug.bug();
+            return;
+        }
+
+        Line dotLine = editor.getDotLine();
+        if (dotLine.length() > 0)
+            return;
+
+        try {
+            buffer.lockWrite();
+        }
+        catch (InterruptedException e) {
+            Log.error(e);
+            return;
+        }
+        try {
+            buffer.getFormatter().parseBuffer();
+            int indent = LispMode.getMode().getCorrectIndentation(dotLine, buffer);
+            if (indent != buffer.getIndentation(dotLine)) {
+                editor.addUndo(SimpleEdit.LINE_EDIT);
+                buffer.setIndentation(dotLine, indent);
+                dotLine.setFlags(STATE_AUTOINDENT);
+                buffer.modified();
+            }
+            if (dotLine.length() > 0) {
+                editor.moveDotToIndentation();
+                editor.moveCaretToDotCol();
+            } else {
+                display.setCaretCol(indent - display.getShift());
+                if (buffer.getBooleanProperty(Property.RESTRICT_CARET))
+                    editor.fillToCaret();
+            }
+            buffer.resetUndo();
+        }
+        finally {
+            buffer.unlockWrite();
+        }
+    }
 }