src/Tools/jEdit/patches/folding
author wenzelm
Sat, 18 Oct 2014 22:02:10 +0200
changeset 58702 39866de9d988
child 59571 1081f91c0662
permissions -rw-r--r--
always apply precedingFoldLevels, avoid unclear shortcuts; updated Console.jar 5.1.4;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58702
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     1
diff -ru jEdit/org/gjt/sp/jedit/buffer/JEditBuffer.java jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     2
--- jEdit/org/gjt/sp/jedit/buffer/JEditBuffer.java	2013-07-28 19:03:27.000000000 +0200
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     3
+++ jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java	2014-10-18 21:35:15.946285279 +0200
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     4
@@ -1945,29 +1945,23 @@
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     5
 			{
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     6
 				Segment seg = new Segment();
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     7
 				newFoldLevel = foldHandler.getFoldLevel(this,i,seg);
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     8
-				if(newFoldLevel != lineMgr.getFoldLevel(i))
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
     9
+				if(Debug.FOLD_DEBUG)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    10
+					Log.log(Log.DEBUG,this,i + " fold level changed");
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    11
+				changed = true;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    12
+				// Update preceding fold levels if necessary
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    13
+				List<Integer> precedingFoldLevels =
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    14
+					foldHandler.getPrecedingFoldLevels(
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    15
+						this,i,seg,newFoldLevel);
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    16
+				if (precedingFoldLevels != null)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    17
 				{
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    18
-					if(Debug.FOLD_DEBUG)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    19
-						Log.log(Log.DEBUG,this,i + " fold level changed");
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    20
-					changed = true;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    21
-					// Update preceding fold levels if necessary
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    22
-					if (i == firstInvalidFoldLevel)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    23
+					int j = i;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    24
+					for (Integer foldLevel: precedingFoldLevels)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    25
 					{
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    26
-						List<Integer> precedingFoldLevels =
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    27
-							foldHandler.getPrecedingFoldLevels(
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    28
-								this,i,seg,newFoldLevel);
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    29
-						if (precedingFoldLevels != null)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    30
-						{
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    31
-							int j = i;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    32
-							for (Integer foldLevel: precedingFoldLevels)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    33
-							{
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    34
-								j--;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    35
-								lineMgr.setFoldLevel(j,foldLevel.intValue());
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    36
-							}
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    37
-							if (j < firstUpdatedFoldLevel)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    38
-								firstUpdatedFoldLevel = j;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    39
-						}
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    40
+						j--;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    41
+						lineMgr.setFoldLevel(j,foldLevel.intValue());
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    42
 					}
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    43
+					if (j < firstUpdatedFoldLevel)
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    44
+						firstUpdatedFoldLevel = j;
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    45
 				}
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    46
 				lineMgr.setFoldLevel(i,newFoldLevel);
39866de9d988 always apply precedingFoldLevels, avoid unclear shortcuts;
wenzelm
parents:
diff changeset
    47
 			}