Changeset 4734

Timestamp:

11/14/03 13:32:57 (18 years ago)

Author:

piso

Message:

foldNearLine(): XML mode.

File:

• trunk/j/src/org/armedbear/j/Editor.java (modified) (5 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2003 Peter Graves
- * $Id: Editor.java,v 1.117 2003-10-13 23:56:03 piso Exp $
+ * $Id: Editor.java,v 1.118 2003-11-14 13:32:57 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -7261 +7261 @@
             next = next.next();
         if (next != null) {
+            final String trim = line.trim();
             switch (getModeId()) {
                 case JAVA_MODE:
@@ -7268 +7269 @@
                 case PERL_MODE:
                 case PHP_MODE:
-                    if (line.trim().endsWith("{")) {
+                    if (trim.endsWith("{")) {
                         if (!next.isHidden()) {
                             fold(next);
@@ -7274 +7275 @@
                         }
                     }
-                    if (line.trim().startsWith("}")) {
+                    if (trim.startsWith("}")) {
                         // We're at the end of a code block. Find the start of
                         // the block and fold from there.
@@ -7304 +7305 @@
                     }
                     break;
+                case XML_MODE: {
+                    if (trim.startsWith("/>") || trim.startsWith("</")) {
+                        Line prev = line.previous();
+                        while (prev != null && prev.isBlank())
+                            prev = prev.previous();
+                        if (prev != null) {
+                            int indent =
+                                buffer.getCol(line, line.getIndentation());
+                            int prevIndent =
+                                buffer.getCol(prev, prev.getIndentation());
+                            if (indent < prevIndent) {
+                                fold(prev);
+                                return;
+                            }
+                        }
+                    } else if (trim.startsWith("<")) {
+                        int indent =
+                            buffer.getCol(line, line.getIndentation());
+                        int nextIndent =
+                            buffer.getCol(next, next.getIndentation());
+                        if (indent < nextIndent) {
+                            fold(next);
+                            return;
+                        }
+                    }
+                }
                 default:
                     break;