author | haftmann |
Thu, 19 Jun 2025 17:15:40 +0200 | |
changeset 82734 | 89347c0cc6a3 |
parent 82625 | 0fa6759948bc |
permissions | -rw-r--r-- |
81297 | 1 |
diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/syntax/Chunk.java |
2 |
--- jedit5.7.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 2024-08-03 19:53:18.000000000 +0200 |
|
3 |
+++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 2024-10-29 11:50:54.066016546 +0100 |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
4 |
@@ -332,9 +332,9 @@ |
50306 | 5 |
//{{{ Package private members |
6 |
||
7 |
//{{{ Instance variables |
|
8 |
- SyntaxStyle style; |
|
9 |
+ public SyntaxStyle style; |
|
10 |
// set up after init() |
|
11 |
- float width; |
|
12 |
+ public float width; |
|
13 |
//}}} |
|
14 |
||
15 |
//{{{ Chunk constructor |
|
72247 | 16 |
@@ -584,8 +584,8 @@ |
17 |
// this is either style.getBackgroundColor() or |
|
48786 | 18 |
// styles[defaultID].getBackgroundColor() |
19 |
private Color background; |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
20 |
- private char[] chars; |
48786 | 21 |
- private String str; |
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
22 |
+ public char[] chars; |
48786 | 23 |
+ public String str; |
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
24 |
private GlyphData glyphData; |
50306 | 25 |
//}}} |
26 |
||
80156
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
27 |
@@ -926,6 +926,11 @@ |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
28 |
} |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
29 |
|
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
30 |
@Override |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
31 |
+ public GlyphData computeIfAbsent(GlyphKey key, java.util.function.Function<? super GlyphKey, ? extends GlyphData> f) { |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
32 |
+ synchronized (this) { return super.computeIfAbsent(key, f); } |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
33 |
+ } |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
34 |
+ |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
35 |
+ @Override |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
36 |
protected boolean removeEldestEntry(Map.Entry<GlyphKey, GlyphData> eldest) |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
37 |
{ |
70d69b081561
more robust: avoid spurious ConcurrentModificationException;
wenzelm
parents:
79012
diff
changeset
|
38 |
return size() > capacity; |
81297 | 39 |
diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/textarea/TextArea.java |
40 |
--- jedit5.7.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 2024-08-03 19:53:18.000000000 +0200 |
|
41 |
+++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 2024-10-29 11:50:54.066016546 +0100 |
|
42 |
@@ -919,6 +919,11 @@ |
|
61511 | 43 |
return chunkCache.getLineInfo(screenLine).physicalLine; |
44 |
} //}}} |
|
45 |
||
46 |
+ public Chunk getChunksOfScreenLine(int screenLine) |
|
47 |
+ { |
|
48 |
+ return chunkCache.getLineInfo(screenLine).chunks; |
|
49 |
+ } |
|
50 |
+ |
|
51 |
//{{{ getScreenLineOfOffset() method |
|
52 |
/** |
|
53 |
* Returns the screen (wrapped) line containing the specified offset. |
|
81297 | 54 |
@@ -1627,8 +1632,8 @@ |
73658 | 55 |
} |
56 |
||
57 |
// Scan backwards, trying to find a bracket |
|
58 |
- String openBrackets = "([{«‹⟨⌈⌊⦇⟦⦃⟪"; |
|
59 |
- String closeBrackets = ")]}»›⟩⌉⌋⦈⟧⦄⟫"; |
|
60 |
+ String openBrackets = "([{«‹⟨⌈⌊⦇⟦⦃⟪⦉"; |
|
61 |
+ String closeBrackets = ")]}»›⟩⌉⌋⦈⟧⦄⟫⦊"; |
|
62 |
int count = 1; |
|
63 |
char openBracket = '\0'; |
|
64 |
char closeBracket = '\0'; |
|
82181
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
65 |
@@ -4983,6 +4988,7 @@ |
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
66 |
final Point offsetXY; |
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
67 |
|
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
68 |
boolean lastLinePartial; |
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
69 |
+ public boolean isLastLinePartial() { return lastLinePartial; } |
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
70 |
|
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
71 |
boolean blink; |
a0d1d772ccab
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
81297
diff
changeset
|
72 |
//}}} |
81297 | 73 |
diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/TextUtilities.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/TextUtilities.java |
74 |
--- jedit5.7.0/jEdit/org/gjt/sp/jedit/TextUtilities.java 2024-08-03 19:53:20.000000000 +0200 |
|
75 |
+++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/TextUtilities.java 2024-10-29 11:50:54.066016546 +0100 |
|
73658 | 76 |
@@ -115,6 +115,8 @@ |
77 |
case '⦄': if (direction != null) direction[0] = false; return '⦃'; |
|
78 |
case '⟪': if (direction != null) direction[0] = true; return '⟫'; |
|
79 |
case '⟫': if (direction != null) direction[0] = false; return '⟪'; |
|
80 |
+ case '⦉': if (direction != null) direction[0] = true; return '⦊'; |
|
81 |
+ case '⦊': if (direction != null) direction[0] = false; return '⦉'; |
|
82 |
default: return '\0'; |
|
83 |
} |
|
84 |
} //}}} |