Add line numbers support #2062

guanglinn · 2023-06-05T15:18:03Z

Add line numbers support for Edit mode and code blocks in View mode;
Update Prism from v1.17.1 to v1.29.0.

gsantner · 2023-06-05T21:42:09Z

app/src/main/java/net/gsantner/markor/model/AppSettings.java

@@ -490,6 +498,11 @@ public boolean getDocumentHighlightState(final String path, final CharSequence c
        return getBool(PREF_PREFIX_HIGHLIGHT_STATE + path, lengthOk && isHighlightingEnabled());
    }

+    public boolean getEditorLineNumbersState(final CharSequence chars) {
+        final boolean lengthOk = chars != null && chars.length() < (_isDeviceGoodHardware ? 100000 : 35000);


I see you used some performance related values here... How well is performance overall, does it greatly impact i.e. scrolling or loading speed? Last time I visited this, it made everything horribly slow

Sorry, I didn't do enough testing. It is important but I'm not good at testing, could you have a test for it.

Have a moderate to big textfile and scroll a bit. You will immediately notice when it's slow.

We should only draw line numbers for the visible lines +- 2 pages.

The highlighter class does this. We can look at it / reuse some code imo.

First, the algorithm or method for displaying line numbers is still worth optimizing. Second, the editor's loading strategy for large files may also need to be optimized, such as just loading nearby 1000 lines at a time, which can gracefully load large files. I could try to optimize it if I'm free.

@guang-lin Note that Incrementally loading files with Android can be a pain as the underlying file system is unreliable. Our current system (trying to save multiple times etc) is hacky but prevents data loss 99.99% of the time.

app/src/main/res/xml/preferences_master.xml

app/thirdparty/assets/prism/Prism v1.29.0

app/thirdparty/assets/prism/index.html

app/thirdparty/java/other/flexmark/ext/codeblocks/LineNumbersAttributeProvider.java

gsantner

Thank you very much for your help! I looked through and added my thoughts

k3b

From my point of view the code looks good

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

app/src/main/res/values-zh-rCN/strings.xml

k3b · 2023-06-07T04:46:11Z

Note: Today i go on holyday for 3 weeks where i have no computer so i cannot do any code reviews in this time

guanglinn · 2023-06-07T06:10:14Z

Note: Today i go on holyday for 3 weeks where i have no computer so i cannot do any code reviews in this time

Fine, have a good holiday!

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

k3b · 2023-06-26T15:53:42Z

From my point of view every thing else looks good

harshad1 · 2023-07-08T04:46:04Z

What is the status here? Any way I can help move this along?

harshad1 · 2023-07-08T04:52:54Z

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

+        for (int i = 1; i < count; i++) {
+            if (text.charAt(layout.getLineStart(i) - 1) == '\n') {
+                number++;
+                y = layout.getLineTop(i);


How does this look in todo.txt where we add extra padding to the top of the line?

Here is the screenshot, not bad.

with the todo.txt improvement I pushed

It looks better 😊

guanglinn · 2023-07-08T09:49:58Z

What is the status here? Any way I can help move this along?

I think the status is stable. It can be better improved, if there are better ideas in the future.

gsantner · 2023-07-08T12:19:56Z

Hello, I try to find some time on this (hot) weekend to review again and hopefully merge this week.

Regarding todo.txt, would it be possible to add a offset at the number so it better fits (vertical center/middle) to the line? That offset can be conditionally activated by checking the format

harshad1 · 2023-07-08T23:33:30Z

Hello, I try to find some time on this (hot) weekend

You're in Austria Right? I was in Germany a few weeks ago and it was quite warm :)

Regarding todo.txt, would it be possible to add a offset

I think we can look at Font Metrics and align the bottom of the number to the line's baseline. This will be uniform in all cases and will not require special a case for Todo.

gsantner · 2023-07-09T03:06:51Z

Yes!

Hm, I think at the end it would be the best solution if the text is vertical-centered to the (full) line. Especially also when it's multiline (regarding line wrapping)

harshad1 · 2023-07-09T16:19:55Z

Hm, I think at the end it would be the best solution if the text is vertical-centered to the (full) line

I have to disagree. Vim and VsCode both align the bottom of the0 number to bottom of the first letter in the line. I think this is now it should go.

…rmance improvements.

guanglinn · 2023-07-15T01:10:11Z

I have aligned line numbers text to the right.

gsantner · 2023-08-05T13:34:52Z

@guang-lin
Thanks for additional improvements. Do you think it's ready to merge now?

guanglinn · 2023-08-05T14:23:30Z

@guang-lin Thanks for additional improvements. Do you think it's ready to merge now?

I think yes. It's my pleasure to contribute to this project. 😊

harshad1 · 2023-08-06T06:39:59Z

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // If line numbers can be drawn
+        if (_nuEnabled && _maxLineNumber < (AppSettings._isDeviceGoodHardware ? 5000 : 3000)) {


As line numbers have to be enabled manually, perhaps we should just issue a toast warning instead of hard blocking on isDeviceGoodHardware

We should also just try to make line numbers dynamic (draw them only for visible lines). That will avoid this completely. Lets remove this test for the line count at first and then I can help with the dynamic line numbers...

…e line

guanglinn · 2023-08-08T11:33:16Z

Now support iterating from the first visible line rather than the second line when the view is not scrolling, even at around 30,000th line.

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

gsantner · 2023-08-14T22:41:57Z

Changed the branch to linenumbers branch. Merging this PR and improvements can be continued via additional PRs to linenumbers branch. Then we can merge it to master when you think it's fine.

Thanks for the contribution!

gsantner linked an issue Jun 5, 2023 that may be closed by this pull request

How to Show Line Numbers? #2057

Closed

4 tasks

gsantner assigned guanglinn Jun 5, 2023

This was linked to issues Jun 5, 2023

Add Line number #1257

Closed

Show line numbers in editor #94

Closed

Please add option to enable line numbers in editor #1349

Closed

gsantner reviewed Jun 5, 2023

View reviewed changes

app/src/main/res/xml/preferences_master.xml Outdated Show resolved Hide resolved

gsantner reviewed Jun 5, 2023

View reviewed changes

app/thirdparty/assets/prism/Prism v1.29.0 Outdated Show resolved Hide resolved

gsantner reviewed Jun 5, 2023

View reviewed changes

app/thirdparty/assets/prism/index.html Show resolved Hide resolved

gsantner reviewed Jun 5, 2023

View reviewed changes

app/thirdparty/java/other/flexmark/ext/codeblocks/LineNumbersAttributeProvider.java Show resolved Hide resolved

gsantner reviewed Jun 5, 2023

View reviewed changes

k3b reviewed Jun 6, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Show resolved Hide resolved

app/src/main/res/values-zh-rCN/strings.xml Outdated Show resolved Hide resolved

harshad1 reviewed Jun 22, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

harshad1 reviewed Jun 22, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

harshad1 reviewed Jun 22, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Show resolved Hide resolved

harshad1 reviewed Jun 22, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

harshad1 reviewed Jun 22, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

gsantner added the feature label Jun 25, 2023

k3b suggested changes Jun 26, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

guanglinn force-pushed the line_numbers_support branch from 031eb51 to 64fd499 Compare June 27, 2023 12:17

harshad1 reviewed Jul 8, 2023

View reviewed changes

guanglinn and others added 9 commits July 15, 2023 08:09

Optimized code

488f476

Bugfix: Line numbers cannot behave well with bigger headings enabled

3dd82a4

perf(line numbers): drawing line numbers only near the visible area

e5069a5

fix(line numbers): ClassCastException when disable line wrapping

a0579cc

rework line number settings

289cfb8

automatic code reformat, add license notice for flexmark extension

e118cd0

supress lint due checked with getLineCount

d480f9a

todo.txt improvement

40077ac

feat(line numbers): align line numbers text to the right; minor perfo…

a7fdd30

…rmance improvements.

guanglinn force-pushed the line_numbers_support branch from e7871c0 to a7fdd30 Compare July 15, 2023 00:47

guanglinn added 4 commits July 17, 2023 09:00

refactor(line numbers): minor improvements

bc83846

perf(line numbers): performance improvements

dbe456b

refactor(line numbers): minor improvements

57d5935

refactor(line numbers): minor improvements

4cbee78

refactor(line numbers): minor improvements

c899628

harshad1 reviewed Aug 6, 2023

View reviewed changes

perf(line numbers): added support for iterating from the first visibl…

b75fdfb

…e line

harshad1 reviewed Aug 11, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

harshad1 reviewed Aug 11, 2023

View reviewed changes

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java Outdated Show resolved Hide resolved

refactor(line numbers): minor improvements

dae44c0

gsantner changed the base branch from master to linenumbers August 14, 2023 22:40

gsantner merged commit 667b5d7 into gsantner:linenumbers Aug 14, 2023
1 check passed

gsantner mentioned this pull request Aug 15, 2023

Line numbers improvements #2090

Merged

guanglinn deleted the line_numbers_support branch December 25, 2023 07:49

guanglinn mentioned this pull request Feb 7, 2024

Consider making "File settings" options global #2212

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add line numbers support #2062

Add line numbers support #2062

guanglinn commented Jun 5, 2023

gsantner Jun 5, 2023

guanglinn Jun 6, 2023

gsantner Jun 25, 2023

harshad1 Jun 26, 2023

guanglinn Jun 26, 2023

harshad1 Jun 26, 2023

gsantner left a comment

k3b left a comment

k3b commented Jun 7, 2023

guanglinn commented Jun 7, 2023

k3b commented Jun 26, 2023

harshad1 commented Jul 8, 2023

harshad1 Jul 8, 2023

guanglinn Jul 8, 2023

gsantner Jul 9, 2023

guanglinn Jul 10, 2023

guanglinn commented Jul 8, 2023

gsantner commented Jul 8, 2023 •

edited

harshad1 commented Jul 8, 2023

gsantner commented Jul 9, 2023 •

edited

harshad1 commented Jul 9, 2023

guanglinn commented Jul 15, 2023

gsantner commented Aug 5, 2023

guanglinn commented Aug 5, 2023

harshad1 Aug 6, 2023

harshad1 Aug 6, 2023

guanglinn commented Aug 8, 2023 •

edited

gsantner commented Aug 14, 2023

Add line numbers support #2062

Add line numbers support #2062

Conversation

guanglinn commented Jun 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gsantner left a comment

Choose a reason for hiding this comment

k3b left a comment

Choose a reason for hiding this comment

k3b commented Jun 7, 2023

guanglinn commented Jun 7, 2023

k3b commented Jun 26, 2023

harshad1 commented Jul 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guanglinn commented Jul 8, 2023

gsantner commented Jul 8, 2023 • edited

harshad1 commented Jul 8, 2023

gsantner commented Jul 9, 2023 • edited

harshad1 commented Jul 9, 2023

guanglinn commented Jul 15, 2023

gsantner commented Aug 5, 2023

guanglinn commented Aug 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guanglinn commented Aug 8, 2023 • edited

gsantner commented Aug 14, 2023

gsantner commented Jul 8, 2023 •

edited

gsantner commented Jul 9, 2023 •

edited

guanglinn commented Aug 8, 2023 •

edited