Changeset 131

Timestamp:

10/13/02 18:52:34 (21 years ago)

Author:

piso

Message:

Indentation.

File:

• trunk/j/src/org/armedbear/j/LispMode.java (modified) (3 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: LispMode.java,v 1.3 2002-10-13 18:21:46 piso Exp $
+ * $Id: LispMode.java,v 1.4 2002-10-13 18:52:34 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -116 +116 @@
     public int getCorrectIndentation(Line line, Buffer buffer)
     {
-        Position here = new Position(line, 0);
-        Position start = findStartOfDefun(here);
+        int depth = depth(new Position(line, 0), buffer);
+        if (depth > 0)
+            return buffer.getIndentSize() * depth;
+        return 0;
+    }
+
+    private static int depth(Position pos, Buffer buffer)
+    {
+        if (buffer.needsRenumbering())
+            buffer.renumber();
+        Position start = findStartOfDefun(pos);
         LispSyntaxIterator it = new LispSyntaxIterator(start);
         int depth = 0;
-        while (it.getPosition().isBefore(here)) {
+        while (it.getPosition().isBefore(pos)) {
             char c = it.nextChar();
             if (c == '(')
@@ -127 +136 @@
                 --depth;
         }
-        if (depth > 0)
-            return buffer.getIndentSize() * depth;
-        return 0;
+        return depth;
     }
 
-    private Position findStartOfDefun(Position pos)
+    private static Position findStartOfDefun(Position pos)
     {
         Line line = pos.getLine();