Skip to content

highlighter: Change the parsing approach to significantly improve performance #3127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JoeKar wants to merge 17 commits into
base: master
Choose a base branch
from
Draft

highlighter: Change the parsing approach to significantly improve performance #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
01e4817
highlight: Remove duplicated util code
JoeKar Jan 28, 2024
082084e
highlight: Move from pkg to internal source
JoeKar Mar 13, 2025
5ae7494
highlighter: Perform sliceEnd() in nested region only once
JoeKar Jan 17, 2024
3dd52a4
highlighter: Rename firstLoc/Region into nestedLoc/Region for readabi…
JoeKar Jan 17, 2024
4e8eed8
highlighter: Remove canMatchEnd since it's not really useful
JoeKar Jan 17, 2024
cee8c0d
highlighter: Combine HighlightStates and HighlightMatches to Highlight
JoeKar Jan 17, 2024
134fce5
highlighter: Remove statesOnly since it's not needed any longer
JoeKar Jan 17, 2024
29b48cd
highlighter: Rework of matching approach to speed up the processing
JoeKar Jan 25, 2024
ddff579
highlighter: Add disabled debug logs for faster analysis
JoeKar Jan 29, 2024
f2286d0
highlighter: Fix `limitGroup` behavior of regions
JoeKar Feb 23, 2024
1980ff0
highlighter: Add capability to remove already captured groups
JoeKar Feb 27, 2024
c256f3d
highlighter: Add capability to remove childrens of already captured g…
JoeKar Mar 6, 2024
02115ab
highlighter: Add capability to add already removed groups again
JoeKar Mar 7, 2024
1db6fa8
highlighter: Handle `h.lastRegion` within `h.highlight()` only
JoeKar Apr 9, 2024
5477395
highlighter: Properly handle rehighlighting within `Highlight()`
JoeKar Apr 11, 2024
f56e627
highlighter: Simplify `samePattern` logic
JoeKar Mar 16, 2025
db7581c
highlighter: Add basic syntax highlighting test
JoeKar Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/action/infocomplete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/zyedidia/micro/v2/internal/buffer"
"github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/v2/internal/highlight"
"github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/micro/v2/pkg/highlight"
)

// This file is meant (for now) for autocompletion in command mode, not
Expand Down
11 changes: 3 additions & 8 deletions internal/buffer/buffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

dmp "github.com/sergi/go-diff/diffmatchpatch"
"github.com/zyedidia/micro/v2/internal/config"
"github.com/zyedidia/micro/v2/internal/highlight"
ulua "github.com/zyedidia/micro/v2/internal/lua"
"github.com/zyedidia/micro/v2/internal/screen"
"github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/micro/v2/pkg/highlight"
"golang.org/x/text/encoding"
"golang.org/x/text/encoding/htmlindex"
"golang.org/x/text/encoding/unicode"
Expand Down Expand Up @@ -150,11 +150,7 @@ func (b *SharedBuffer) MarkModified(start, end int) {
end = util.Clamp(end, 0, len(b.lines)-1)

if b.Settings["syntax"].(bool) && b.SyntaxDef != nil {
l := -1
for i := start; i <= end; i++ {
l = util.Max(b.Highlighter.ReHighlightStates(b, i), l)
}
b.Highlighter.HighlightMatches(b, start, l)
b.Highlighter.Highlight(b, start, end)
}

for i := start; i <= end; i++ {
Expand Down Expand Up @@ -960,8 +956,7 @@ func (b *Buffer) UpdateRules() {
b.Highlighter = highlight.NewHighlighter(b.SyntaxDef)
if b.Settings["syntax"].(bool) {
go func() {
b.Highlighter.HighlightStates(b)
b.Highlighter.HighlightMatches(b, 0, b.End().Y)
b.Highlighter.Highlight(b, 0, b.End().Y)
screen.Redraw()
}()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/buffer/line_array.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"io"
"sync"

"github.com/zyedidia/micro/v2/internal/highlight"
"github.com/zyedidia/micro/v2/internal/util"
"github.com/zyedidia/micro/v2/pkg/highlight"
)

// Finds the byte index of the nth rune in a byte slice
Expand Down
Loading