* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode [not found] <875xszm205.fsf.ref@aol.com> @ 2024-07-21 11:13 ` Ergus via Bug reports for GNU Emacs, the Swiss army knife of text editors 2024-07-22 2:25 ` Randy Taylor 2024-07-23 2:32 ` Randy Taylor 0 siblings, 2 replies; 10+ messages in thread From: Ergus via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2024-07-21 11:13 UTC (permalink / raw) To: 72228 When using cmake-ts-mode the numbers have 3 different faces: 1, 2, 100: font-lock-number-face (OK) 0 : font-lock-constant-face. The cmake-ts-mode--constants takes precedence over regex in font-lock-number-face. It is not clear that this one can be fixed. -1, -2 : Not fontified. This seems simpler to fix, the regex in font-lock-number-face is missing a `-?' before the first [[:digit:]]) In GNU Emacs 31.0.50 (build 15, x86_64-pc-linux-gnu, GTK+ Version 3.24.43, cairo version 1.18.0) of 2024-07-21 built on RTX Repository revision: cb0f25e4f966a53d52db5190d189ae85c7154d70 Repository branch: project System Description: Arch Linux Configured using: 'configure --prefix=/home/ergo/.local/ --with-mailutils --with-pgtk --with-modules --with-cairo --with-harfbuzz --with-native-compilation=aot '--program-transform-name=s/^ctags$/ctags.emacs/'' Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG LCMS2 LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER PGTK PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER WEBP XIM GTK3 ZLIB Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: CMake Minor modes in effect: windmove-mode: t global-auto-revert-mode: t electric-pair-mode: t whitespace-mode: t flyspell-mode: t completion-preview-mode: t diff-hl-margin-local-mode: t diff-hl-margin-mode: t diff-hl-mode: t corfu-terminal-mode: t global-corfu-mode: t corfu-mode: t fancy-compilation-mode: t project-multi-mode: t gtags-mode: t treesit-explore-mode: t repeat-mode: t xterm-mouse-mode: t xclip-mode: t override-global-mode: t winner-mode: t save-place-mode: t delete-selection-mode: t savehist-mode: t global-display-fill-column-indicator-mode: t display-fill-column-indicator-mode: t global-display-line-numbers-mode: t display-line-numbers-mode: t which-key-mode: t show-paren-mode: t mouse-wheel-mode: t file-name-shadow-mode: t context-menu-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t minibuffer-regexp-mode: t size-indication-mode: t column-number-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: /mnt/casa/gits/emacs_clones/cuda-mode/cuda-mode hides /home/ergo/.config/emacs/elpa/cuda-mode-20240716.1936/cuda-mode /mnt/casa/gits/emacs_clones/gtags-mode/gtags-mode hides /home/ergo/.config/emacs/elpa/gtags-mode-1.8/gtags-mode /home/ergo/.config/emacs/elpa/transient-20240713.2102/transient hides /home/ergo/.local/share/emacs/31.0.50/lisp/transient Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny rfc822 mml mml-sec epa derived epg rfc6068 epg-config gnus-util mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils re-builder jka-compr find-func time-date windmove autorevert filenotify ffap thingatpt url-parse auth-source eieio eieio-core icons password-cache json map url-vars elec-pair whitespace flyspell-correct flyspell ispell completion-preview diff-hl-margin diff-hl-dired citre-lang-fileref citre-tags citre-ctags citre-readtags citre-readtags-tables citre-backend-interface citre-common-tag citre-common-util dired-x dired dired-loaddefs diff-hl log-view pcvs-util vc-dir ewoc vc corfu-terminal popon corfu fancy-compilation compile text-property-search comint ansi-osc ansi-color comp-run comp-common project-multi-mode gtags-mode cl-macs subr-x files-x xref project vc-git diff-mode track-changes vc-dispatcher cmake-ts-mode rx treesit term/tmux term/xterm xterm init repeat cape compat use-package-ensure use-package-diminish xt-mouse xclip edmacro kmacro byte-opt gv use-package-bind-key bind-key cl-extra help-mode simple-16-theme winner ring saveplace delsel savehist easy-mmode display-fill-column-indicator display-line-numbers diminish which-key cl-seq use-package-core cl-loaddefs cl-lib bytecomp byte-compile disp-table info ac-emoji-autoloads ac-haskell-process-autoloads ac-html-autoloads arduino-cli-mode-autoloads auctex-autoloads tex-site auto-complete-autoloads avy-zap-autoloads avy-autoloads better-shell-autoloads caml-autoloads cape-autoloads citre-autoloads clang-format-autoloads cobol-mode-autoloads compile-multi-autoloads corfu-terminal-autoloads corfu-autoloads crdt-autoloads csv-mode-autoloads cuda-mode-autoloads d-mode-autoloads deadgrep-autoloads debbugs-autoloads diff-hl-autoloads diminish-autoloads dired-sidebar-autoloads dired-subtree-autoloads dired-hacks-utils-autoloads dumb-jump-autoloads e2ansi-autoloads emamux-autoloads esup-autoloads evil-collection-autoloads annalist-autoloads evil-leader-autoloads evil-autoloads face-explorer-autoloads fancy-compilation-autoloads flx-autoloads flycheck-julia-autoloads flycheck-rust-autoloads flycheck-autoloads flymake-nasm-autoloads flymake-quickdef-autoloads flyspell-correct-autoloads git-modes-autoloads git-timemachine-autoloads gnuplot-autoloads google-c-style-autoloads goto-chg-autoloads groovy-mode-autoloads gtags-mode-autoloads haskell-mode-autoloads highlight-indent-guides-autoloads i3wm-config-mode-autoloads ibuffer-sidebar-autoloads iedit-autoloads imenu-list-autoloads julia-ts-mode-autoloads julia-mode-autoloads languagetool-autoloads lice-autoloads lorem-ipsum-autoloads lua-mode-autoloads magit-autoloads git-commit-autoloads magit-section-autoloads markdown-mode-autoloads modern-cpp-font-lock-autoloads move-dup-autoloads multiple-cursors-autoloads mutt-mode-autoloads nasm-mode-autoloads neotree-autoloads nftables-mode-autoloads nginx-mode-autoloads notmuch-autoloads objed-autoloads opencl-mode-autoloads paradox-autoloads phi-search-autoloads pkg-info-autoloads epl-autoloads pkgbuild-mode-autoloads platformio-mode-autoloads async-autoloads popon-autoloads popup-autoloads projectile-autoloads projection-autoloads protobuf-mode-autoloads protobuf-ts-mode-autoloads ptemplate-templates-autoloads ptemplate-autoloads scopeline-autoloads shell-command+-autoloads slime-autoloads macrostep-autoloads sphinx-mode-autoloads f-autoloads dash-autoloads s-autoloads spinner-autoloads ssh-config-mode-autoloads string-inflection-autoloads sudo-edit-autoloads systemd-autoloads tmux-mode-autoloads transient-autoloads tsc-autoloads urgrep-autoloads vdiff-autoloads hydra-autoloads lv-autoloads vterm-toggle-autoloads vterm-autoloads vundo-autoloads with-editor-autoloads xclip-autoloads yasnippet-snippets-autoloads yasnippet-autoloads early-init rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/pgtk-win pgtk-win term/common-win touch-screen pgtk-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify dynamic-setting system-font-setting font-render-setting cairo gtk pgtk lcms2 multi-tty move-toolbar make-network-process native-compile emacs) Memory information: ((conses 16 319167 67965) (symbols 48 15478 0) (strings 32 85272 20903) (string-bytes 1 3709979) (vectors 16 40244) (vector-slots 8 377066 37168) (floats 8 172 822) (intervals 56 10668 74) (buffers 992 17)) ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-07-21 11:13 ` bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode Ergus via Bug reports for GNU Emacs, the Swiss army knife of text editors @ 2024-07-22 2:25 ` Randy Taylor 2024-07-23 2:32 ` Randy Taylor 1 sibling, 0 replies; 10+ messages in thread From: Randy Taylor @ 2024-07-22 2:25 UTC (permalink / raw) To: Ergus; +Cc: 72228 On Sunday, July 21st, 2024 at 07:13, Ergus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org> wrote: > > When using cmake-ts-mode the numbers have 3 different faces: > > 1, 2, 100: font-lock-number-face (OK) > > 0 : font-lock-constant-face. The cmake-ts-mode--constants takes > precedence over regex in font-lock-number-face. It is not clear that > this one can be fixed. > > -1, -2 : Not fontified. This seems simpler to fix, the regex in > font-lock-number-face is missing a `-?' before the first [[:digit:]]) > Thanks for the report. I'll take a look tomorrow. ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-07-21 11:13 ` bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode Ergus via Bug reports for GNU Emacs, the Swiss army knife of text editors 2024-07-22 2:25 ` Randy Taylor @ 2024-07-23 2:32 ` Randy Taylor 2024-08-07 1:00 ` Randy Taylor 1 sibling, 1 reply; 10+ messages in thread From: Randy Taylor @ 2024-07-23 2:32 UTC (permalink / raw) To: Ergus; +Cc: 72228 On Sunday, July 21st, 2024 at 07:13, Ergus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org> wrote: > > When using cmake-ts-mode the numbers have 3 different faces: > > 1, 2, 100: font-lock-number-face (OK) > > 0 : font-lock-constant-face. The cmake-ts-mode--constants takes > precedence over regex in font-lock-number-face. It is not clear that > this one can be fixed. 1 also gets font-lock-constant-face. I think we should just remove "1" and "0" from cmake-ts-mode--constants. > > -1, -2 : Not fontified. This seems simpler to fix, the regex in > font-lock-number-face is missing a `-?' before the first [[:digit:]]) > Indeed. Would you like to submit a patch for that and the above? ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-07-23 2:32 ` Randy Taylor @ 2024-08-07 1:00 ` Randy Taylor 2024-08-07 8:45 ` Andrea Corallo 0 siblings, 1 reply; 10+ messages in thread From: Randy Taylor @ 2024-08-07 1:00 UTC (permalink / raw) To: Ergus; +Cc: 72228 [-- Attachment #1: Type: text/plain, Size: 940 bytes --] On Monday, July 22nd, 2024 at 22:32, Randy Taylor <dev@rjt.dev> wrote: > > > On Sunday, July 21st, 2024 at 07:13, Ergus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" bug-gnu-emacs@gnu.org wrote: > > > When using cmake-ts-mode the numbers have 3 different faces: > > > > 1, 2, 100: font-lock-number-face (OK) > > > > 0 : font-lock-constant-face. The cmake-ts-mode--constants takes > > precedence over regex in font-lock-number-face. It is not clear that > > this one can be fixed. > > > 1 also gets font-lock-constant-face. > > I think we should just remove "1" and "0" from cmake-ts-mode--constants. > > > -1, -2 : Not fontified. This seems simpler to fix, the regex in > > font-lock-number-face is missing a `-?' before the first [[:digit:]]) > > > Indeed. Would you like to submit a patch for that and the above? I haven't heard anything back, so I've attached a patch doing so. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-Fix-cmake-ts-mode-number-fontification-Bug-72228.patch --] [-- Type: text/x-patch; name=0001-Fix-cmake-ts-mode-number-fontification-Bug-72228.patch, Size: 1379 bytes --] From 4a104bd11f56dcb0136b32852d14756e0f13c9d9 Mon Sep 17 00:00:00 2001 From: Randy Taylor <dev@rjt.dev> Date: Tue, 6 Aug 2024 20:10:52 -0400 Subject: [PATCH] Fix cmake-ts-mode number fontification (Bug#72228) * lisp/progmodes/cmake-ts-mode.el (cmake-ts-mode--constants): Remove "1" and "0". (cmake-ts-mode--font-lock-settings): Match negative numbers. --- lisp/progmodes/cmake-ts-mode.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el index b70806f4c30..854adf4ade7 100644 --- a/lisp/progmodes/cmake-ts-mode.el +++ b/lisp/progmodes/cmake-ts-mode.el @@ -73,8 +73,7 @@ cmake-ts-mode--indent-rules "Tree-sitter indent rules for `cmake-ts-mode'.") (defvar cmake-ts-mode--constants - '("1" "ON" "TRUE" "YES" "Y" "0" "OFF" "FALSE" "NO" "N" "IGNORE" - "NOTFOUND") + '("ON" "TRUE" "YES" "Y" "OFF" "FALSE" "NO" "N" "IGNORE" "NOTFOUND") "CMake constants for tree-sitter font-locking.") (defvar cmake-ts-mode--keywords @@ -164,7 +163,7 @@ cmake-ts-mode--font-lock-settings :language 'cmake :feature 'number '(((unquoted_argument) @font-lock-number-face - (:match "\\`[[:digit:]]*\\.?[[:digit:]]*\\.?[[:digit:]]+\\'" + (:match "\\`-?[[:digit:]]*\\.?[[:digit:]]*\\.?[[:digit:]]+\\'" @font-lock-number-face))) :language 'cmake -- 2.46.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 1:00 ` Randy Taylor @ 2024-08-07 8:45 ` Andrea Corallo 2024-08-07 13:14 ` Randy Taylor 0 siblings, 1 reply; 10+ messages in thread From: Andrea Corallo @ 2024-08-07 8:45 UTC (permalink / raw) To: Randy Taylor; +Cc: Ergus, 72228 Randy Taylor <dev@rjt.dev> writes: > On Monday, July 22nd, 2024 at 22:32, Randy Taylor <dev@rjt.dev> wrote: >> >> >> On Sunday, July 21st, 2024 at 07:13, Ergus via "Bug reports for GNU Emacs, the Swiss army knife of text editors" bug-gnu-emacs@gnu.org wrote: >> >> > When using cmake-ts-mode the numbers have 3 different faces: >> > >> > 1, 2, 100: font-lock-number-face (OK) >> > >> > 0 : font-lock-constant-face. The cmake-ts-mode--constants takes >> > precedence over regex in font-lock-number-face. It is not clear that >> > this one can be fixed. >> >> >> 1 also gets font-lock-constant-face. >> >> I think we should just remove "1" and "0" from cmake-ts-mode--constants. >> >> > -1, -2 : Not fontified. This seems simpler to fix, the regex in >> > font-lock-number-face is missing a `-?' before the first [[:digit:]]) >> >> >> Indeed. Would you like to submit a patch for that and the above? > > I haven't heard anything back, so I've attached a patch doing so. Hi Randy, I've installed your change. One comment: I'd suggest we start adding some tests for the mode in "test/lisp/progmodes", this would help catching future potential regressions. Ergus or Randy feel free to close if you think we are done with this bug. Thanks Andrea ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 8:45 ` Andrea Corallo @ 2024-08-07 13:14 ` Randy Taylor 2024-08-07 14:02 ` Andrea Corallo 0 siblings, 1 reply; 10+ messages in thread From: Randy Taylor @ 2024-08-07 13:14 UTC (permalink / raw) To: Andrea Corallo; +Cc: Ergus, 72228 On Wednesday, August 7th, 2024 at 04:45, Andrea Corallo <acorallo@gnu.org> wrote: > > Hi Randy, > > I've installed your change. Thank you! Could this also be installed on emacs-30? > > One comment: I'd suggest we start adding some tests for the mode in > "test/lisp/progmodes", this would help catching future potential > regressions. Indeed, it's been on my TODO list. Just need to find the motivation :). > > Ergus or Randy feel free to close if you think we are done with this > bug. > > Thanks > > Andrea ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 13:14 ` Randy Taylor @ 2024-08-07 14:02 ` Andrea Corallo 2024-08-07 14:57 ` Randy Taylor 0 siblings, 1 reply; 10+ messages in thread From: Andrea Corallo @ 2024-08-07 14:02 UTC (permalink / raw) To: Randy Taylor; +Cc: Ergus, eliz, 72228 Randy Taylor <dev@rjt.dev> writes: > On Wednesday, August 7th, 2024 at 04:45, Andrea Corallo <acorallo@gnu.org> wrote: >> >> Hi Randy, >> >> I've installed your change. > > Thank you! Could this also be installed on emacs-30? I think so, if you think the fix should be backported and you are confident we regress nothing. Are you? :) ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 14:02 ` Andrea Corallo @ 2024-08-07 14:57 ` Randy Taylor 2024-08-07 15:38 ` Andrea Corallo 0 siblings, 1 reply; 10+ messages in thread From: Randy Taylor @ 2024-08-07 14:57 UTC (permalink / raw) To: Andrea Corallo; +Cc: Ergus, eliz, 72228 On Wednesday, August 7th, 2024 at 10:02, Andrea Corallo <acorallo@gnu.org> wrote: > > Randy Taylor dev@rjt.dev writes: > > > On Wednesday, August 7th, 2024 at 04:45, Andrea Corallo acorallo@gnu.org wrote: > > > > > Hi Randy, > > > > > > I've installed your change. > > > > Thank you! Could this also be installed on emacs-30? > > > I think so, if you think the fix should be backported and you are > confident we regress nothing. Are you? :) I think it's safe enough ¯\_(ツ)_/¯. ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 14:57 ` Randy Taylor @ 2024-08-07 15:38 ` Andrea Corallo 2024-08-07 15:52 ` Randy Taylor 0 siblings, 1 reply; 10+ messages in thread From: Andrea Corallo @ 2024-08-07 15:38 UTC (permalink / raw) To: Randy Taylor; +Cc: Ergus, eliz, 72228 Randy Taylor <dev@rjt.dev> writes: > On Wednesday, August 7th, 2024 at 10:02, Andrea Corallo <acorallo@gnu.org> wrote: >> >> Randy Taylor dev@rjt.dev writes: >> >> > On Wednesday, August 7th, 2024 at 04:45, Andrea Corallo acorallo@gnu.org wrote: >> > >> > > Hi Randy, >> > > >> > > I've installed your change. >> > >> > Thank you! Could this also be installed on emacs-30? >> >> >> I think so, if you think the fix should be backported and you are >> confident we regress nothing. Are you? :) > > I think it's safe enough ¯\_(ツ)_/¯. Ok done ^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode 2024-08-07 15:38 ` Andrea Corallo @ 2024-08-07 15:52 ` Randy Taylor 0 siblings, 0 replies; 10+ messages in thread From: Randy Taylor @ 2024-08-07 15:52 UTC (permalink / raw) To: Andrea Corallo; +Cc: Ergus, eliz, 72228-done@debbugs.gnu.org On Wednesday, August 7th, 2024 at 11:38, Andrea Corallo <acorallo@gnu.org> wrote: > > > Randy Taylor dev@rjt.dev writes: > > > On Wednesday, August 7th, 2024 at 10:02, Andrea Corallo acorallo@gnu.org wrote: > > > > > Randy Taylor dev@rjt.dev writes: > > > > > > > On Wednesday, August 7th, 2024 at 04:45, Andrea Corallo acorallo@gnu.org wrote: > > > > > > > > > Hi Randy, > > > > > > > > > > I've installed your change. > > > > > > > > Thank you! Could this also be installed on emacs-30? > > > > > > I think so, if you think the fix should be backported and you are > > > confident we regress nothing. Are you? :) > > > > I think it's safe enough ¯\(ツ)/¯. > > > Ok done Thanks, closing the bug. ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-07 15:52 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <875xszm205.fsf.ref@aol.com> 2024-07-21 11:13 ` bug#72228: 31.0.50; Wrong number fontification in cmake-ts-mode Ergus via Bug reports for GNU Emacs, the Swiss army knife of text editors 2024-07-22 2:25 ` Randy Taylor 2024-07-23 2:32 ` Randy Taylor 2024-08-07 1:00 ` Randy Taylor 2024-08-07 8:45 ` Andrea Corallo 2024-08-07 13:14 ` Randy Taylor 2024-08-07 14:02 ` Andrea Corallo 2024-08-07 14:57 ` Randy Taylor 2024-08-07 15:38 ` Andrea Corallo 2024-08-07 15:52 ` Randy Taylor
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).