Skip to content

Tree-sitter integration for better syntax highlighting #5067

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

Open
jtyr wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Tree-sitter integration for better syntax highlighting #5067

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
573b60e
Tree-sitter integration for better syntax highlighting
jtyr Mar 14, 2026
7bec7d3
Adding missing Makefile.in and fixing installation
jtyr Mar 14, 2026
ecb2827
Auto-generate Makefile
jtyr Mar 15, 2026
f7737c5
Separating TS syntax handling
jtyr Mar 15, 2026
f00ca28
Moving to separate struct
jtyr Mar 15, 2026
d34731e
Extracting to separate m4 file
jtyr Mar 15, 2026
b8f404e
Removing TS-unrelated fixes
jtyr Mar 15, 2026
4e6eebc
Example of adding an extra language
jtyr Mar 15, 2026
36fee42
More languages
jtyr Mar 19, 2026
67616c9
Syntax matching
jtyr Mar 31, 2026
0300b64
Fixing HCL and Terraform syntax; updating grammars bundle version
jtyr Apr 2, 2026
f9bfe97
Reverting LICENSE symlink and removing block file fix
jtyr Apr 2, 2026
08c349f
Use staticly built objects from grammars repo
jtyr Apr 11, 2026
edbb4db
Implementing code review comments
jtyr Apr 15, 2026
7a12b37
New distribution model
jtyr Apr 17, 2026
94c23e5
Use different fg/bg separator
jtyr Apr 18, 2026
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ TAGS
doc/devel/
doc/html/
.deps
.dirstamp
libtool
make.log
make.clang
Expand All @@ -57,3 +58,4 @@ tests/src/editor/test-data.txt
src/vfs/extfs/helpers/usqfs
tests/src/vfs/extfs/helpers-list/data/config.sh
mc-version.h
/ts-grammars-shared/
1 change: 0 additions & 1 deletion INSTALL
View file
Open in desktop

This file was deleted.

380 changes: 380 additions & 0 deletions INSTALL
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ EXTRA_DIST =

dist_noinst_SCRIPTS = \
build-glib2.sh \
version.sh
version.sh \
scripts/ts-grammars-download.sh

dist_noinst_HEADERS = $(top_srcdir)/mc-version.h

Expand Down
1 change: 1 addition & 0 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ m4_include([m4.include/mc-with-x.m4])
m4_include([m4.include/mc-use-termcap.m4])
m4_include([m4.include/mc-with-screen.m4])
m4_include([m4.include/mc-with-internal-edit.m4])
m4_include([m4.include/mc-with-tree-sitter.m4])
m4_include([m4.include/mc-subshell.m4])
m4_include([m4.include/mc-background.m4])
m4_include([m4.include/mc-ext2fs-attr.m4])
Expand Down
11 changes: 11 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ dnl that ar cannot be found and linking via libtool will fail at a later stage
AC_CHECK_TOOLS([AR], [ar gar])

AC_PROG_CC
AC_PROG_CXX

@mc-worker mc-worker Mar 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need C++ compiler?

@jtyr jtyr Mar 15, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is needed for the SQL grammar which has a C++ scanner.


# AC_PROG_CC doesn't try enabling C99 in autoconf 2.69 and below, but
# AC_PROG_CC_C99 is deprecated in newer ones. In autoconf 2.70+ both
Expand Down Expand Up @@ -536,11 +537,19 @@ AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)

dnl ############################################################################

@mc-worker mc-worker Mar 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this to the separate m4-file.

@jtyr jtyr Mar 15, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have moved that to a separate m4 file.

dnl Syntax highlighting system selection
dnl ############################################################################

mc_WITH_TREE_SITTER

AM_CONDITIONAL(USE_NLS, [test x"$USE_NLS" = xyes])
AM_CONDITIONAL(USE_MAINTAINER_MODE, [test x"$USE_MAINTAINER_MODE" = xyes])
AM_CONDITIONAL(USE_SCREEN_SLANG, [test x"$with_screen" = xslang])
AM_CONDITIONAL(USE_INTERNAL_EDIT, [test x"$use_internal_edit" = xyes ])
AM_CONDITIONAL(USE_ASPELL, [test x"$enable_aspell" = xyes ])
AM_CONDITIONAL(USE_TREE_SITTER, [test x"$with_tree_sitter" = xyes])
AM_CONDITIONAL(TREE_SITTER_STATIC, [test x"$with_tree_sitter" = xyes -a x"$with_tree_sitter_static" = xyes])
AM_CONDITIONAL(USE_DIFF, [test -n "$use_diff"])
AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])
dnl Clarify do we really need GModule
Expand Down Expand Up @@ -582,6 +591,7 @@ misc/mc.ext.ini
src/Makefile
src/consaver/Makefile
src/editor/Makefile
src/editor/ts-grammars/Makefile
src/man2hlp/Makefile
src/subshell/Makefile
src/viewer/Makefile
Expand Down Expand Up @@ -654,6 +664,7 @@ lib/vfs/Makefile
lib/widget/Makefile

misc/syntax/Makefile
misc/syntax-ts/Makefile

doc/Makefile

Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIST_SUBDIRS = hints man hlp
SUBDIRS = hints man hlp

EXTRA_DIST = FAQ HACKING INSTALL
EXTRA_DIST = FAQ HACKING INSTALL TREE-SITTER
Loading