From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#60961: 29.0.60; Compiling emacs-29 without treesitter outputs warnings Date: Sat, 21 Jan 2023 13:24:12 +0100 Message-ID: <87edrohy8j.fsf@thornhill.no> References: <878rhx1os6.fsf@gmail.com> <831qnpnx9g.fsf@gnu.org> <87o7qtuxgh.fsf@thornhill.no> <83tu0lmgv6.fsf@gnu.org> <87h6wll10q.fsf@thornhill.no> <83r0vpme0t.fsf@gnu.org> <8A47E6B6-BE4F-44F4-9BC5-55B6051CDCD4@thornhill.no> <83edromses.fsf@gnu.org> Reply-To: Theodor Thornhill Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13678"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, 60961@debbugs.gnu.org To: Eli Zaretskii , Yuan Fu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jan 21 13:25:17 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pJCvt-0003LF-9N for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 21 Jan 2023 13:25:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJCvf-0007hP-Bd; Sat, 21 Jan 2023 07:25:03 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJCve-0007h2-0j for bug-gnu-emacs@gnu.org; Sat, 21 Jan 2023 07:25:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJCvd-0003Nc-Oz for bug-gnu-emacs@gnu.org; Sat, 21 Jan 2023 07:25:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJCvd-0002qt-KP for bug-gnu-emacs@gnu.org; Sat, 21 Jan 2023 07:25:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Theodor Thornhill Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 21 Jan 2023 12:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60961 X-GNU-PR-Package: emacs Original-Received: via spool by 60961-submit@debbugs.gnu.org id=B60961.167430386310913 (code B ref 60961); Sat, 21 Jan 2023 12:25:01 +0000 Original-Received: (at 60961) by debbugs.gnu.org; 21 Jan 2023 12:24:23 +0000 Original-Received: from localhost ([127.0.0.1]:48228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJCuz-0002pw-Jw for submit@debbugs.gnu.org; Sat, 21 Jan 2023 07:24:23 -0500 Original-Received: from out2.migadu.com ([188.165.223.204]:39926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJCuw-0002pl-Ll for 60961@debbugs.gnu.org; Sat, 21 Jan 2023 07:24:21 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1674303856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pimPxQDfIdGKSpUIEzUKc12/mSQZyigawWqXKDWuf00=; b=0rrIdj+P491z3B1ra+RRtGjJv2KAk+vRKVdM619+WsvRVxWFXqvgRtCCDlf2IbikCc7Wui alnolhMp6bAFPFjGNQZr/+16M9s1LKVCtwz4uIRZejNI4XM3KW+jTsN0nnLGDtNWGJ6CYz BFnjJN7y12jd09MNEEGn8uaWE+d5DFeZWfpiaD/Wdss96RVYk8kTC8+r8vlivlPaU2tmt/ F9syyL63iipBlwcMaLtA93MXcBw6veeFQ2e07GVS/bmk538mBkgfhQarIvj6XfOhKRdH6n qtaMC7qHFZpqZm5ZohGhh7HP41f6Rf20OF6ssKABN1QiFK32QKEUoQz1nHiHJQ== In-Reply-To: <83edromses.fsf@gnu.org> X-Migadu-Flow: FLOW_OUT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:253855 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Eli Zaretskii writes: >> From: Yuan Fu >> Date: Fri, 20 Jan 2023 14:11:44 -0800 >> Cc: Eli Zaretskii , >> rpluim@gmail.com, >> 60961@debbugs.gnu.org >>=20 >> I=E2=80=99d prefer c-ts-common.el over treesit.el, since they only apply= to C-like languages. There is no harm putting them in a separate file, rig= ht? I wrote some commentary in c-ts-mode, which notes all the shared functi= ons and variables.=20 > > c-ts-common.el SGTM, thanks. Something like this? I get no warnings on tree-sitter-less build on emacs-29 now. Do we need anything in NEWS or anywhere else? Theo --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-Move-c-like-common-utils-into-own-library-bug-60961.patch Content-Transfer-Encoding: quoted-printable >From b7f7b135cf42d9de73c83ba953e3e149dde19f0f Mon Sep 17 00:00:00 2001 From: Theodor Thornhill Date: Sat, 21 Jan 2023 12:24:55 +0100 Subject: [PATCH] Move c-like common utils into own library (bug#60961) * lisp/progmodes/c-ts-common.el: New file. * lisp/progmodes/c-ts-mode.el (treesit-induce-sparse-tree): Remove unused declaration. (c-ts-mode--indent-styles): Refer to the new library. (c-ts-mode--looking-at-star, c-ts-mode--comment-start-after-first-star, c-ts-mode--comment-2nd-line-matcher, c-ts-mode--comment-2nd-line-anchor, c-ts-mode--comment-regexp, c-ts-mode--fill-paragraph, c-ts-mode--fill-block-comment): Move to c-ts-common and expose as public. (c-ts-mode-comment-setup): Move to c-ts-common. * lisp/progmodes/csharp-mode.el (c-ts-common): Require new library. (csharp-ts-mode--indent-rules): Refer to the new symbols. (csharp-ts-mode): Use new function. * lisp/progmodes/java-ts-mode.el (c-ts-common): Require new library. (java-ts-mode--indent-rules): Refer to the new symbols. (java-ts-mode): Use new function. * lisp/progmodes/js.el (c-ts-common): Require new library. (js--treesit-indent-rules): Refer to the new symbols. (js-ts-mode): Use new function. * lisp/progmodes/rust-ts-mode.el (c-ts-common): Require new library. (rust-ts-mode--indent-rules): Refer to the new symbols. (rust-ts-mode): Use new function. * lisp/progmodes/typescript-ts-mode.el (c-ts-common): Require new library. (typescript-ts-mode--indent-rules): Refer to the new symbols. (typescript-ts-base-mode): Use new function. --- lisp/progmodes/c-ts-common.el | 247 +++++++++++++++++++++++++++ lisp/progmodes/c-ts-mode.el | 228 +------------------------ lisp/progmodes/csharp-mode.el | 8 +- lisp/progmodes/java-ts-mode.el | 8 +- lisp/progmodes/js.el | 8 +- lisp/progmodes/rust-ts-mode.el | 8 +- lisp/progmodes/typescript-ts-mode.el | 8 +- 7 files changed, 275 insertions(+), 240 deletions(-) create mode 100644 lisp/progmodes/c-ts-common.el diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el new file mode 100644 index 0000000000..6671d4be5b --- /dev/null +++ b/lisp/progmodes/c-ts-common.el @@ -0,0 +1,247 @@ +;;; c-ts-common.el --- Utilities for C like Languages -*- lexical-binding= : t; -*- + +;; Copyright (C) 2023 Free Software Foundation, Inc. + +;; Author : =E4=BB=98=E7=A6=B9=E5=AE=89 (Yuan Fu) +;; Keywords : c c++ java javascript rust languages tree-sitter + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary: +;; +;; For C-like language major modes: +;; +;; - Use `c-ts-common-comment-setup' to setup comment variables and +;; filling. +;; +;; - Use simple-indent matcher `c-ts-common-looking-at-star' and +;; anchor `c-ts-common-comment-start-after-first-star' for indenting +;; block comments. See `c-ts-mode--indent-styles' for example. + +;;; Code: + +(require 'treesit) +(eval-when-compile (require 'rx)) + +(declare-function treesit-node-start "treesit.c") +(declare-function treesit-node-end "treesit.c") +(declare-function treesit-node-type "treesit.c") + +(defun c-ts-common-looking-at-star (_n _p bol &rest _) + "A tree-sitter simple indent matcher. +Matches if there is a \"*\" after BOL." + (eq (char-after bol) ?*)) + +(defun c-ts-common-comment-start-after-first-star (_n parent &rest _) + "A tree-sitter simple indent anchor. +Finds the \"/*\" and returns the point after the \"*\". +Assumes PARENT is a comment node." + (save-excursion + (goto-char (treesit-node-start parent)) + (if (looking-at (rx "/*")) + (match-end 0) + (point)))) + +(defun c-ts-common-comment-2nd-line-matcher (_n parent &rest _) + "Matches if point is at the second line of a block comment. +PARENT should be a comment node." + (and (equal (treesit-node-type parent) "comment") + (save-excursion + (forward-line -1) + (back-to-indentation) + (eq (point) (treesit-node-start parent))))) + +(defun c-ts-common-comment-2nd-line-anchor (_n _p bol &rest _) + "Return appropriate anchor for the second line of a comment. + +If the first line is /* alone, return the position right after +the star; if the first line is /* followed by some text, return +the position right before the text minus 1. + +Use an offset of 1 with this anchor. BOL is the beginning of +non-whitespace characters of the current line." + (save-excursion + (forward-line -1) + (back-to-indentation) + (when (looking-at comment-start-skip) + (goto-char (match-end 0)) + (if (looking-at (rx (* (or " " "\t")) eol)) + ;; Only /* at the first line. + (progn (skip-chars-backward " \t") + (if (save-excursion + (goto-char bol) + (looking-at (rx "*"))) + ;; The common case. Checked by "Multiline Block + ;; Comments 4". + (point) + ;; The "Multiline Block Comments 2" test in + ;; c-ts-common-resources/indent.erts checks this. + (1- (point)))) + ;; There is something after /* at the first line. The + ;; "Multiline Block Comments 3" test checks this. + (1- (point)))))) + +(defvar c-ts-common--comment-regexp + ;; These covers C/C++, Java, JavaScript, TypeScript, Rust, C#. + (rx (or "comment" "line_comment" "block_comment")) + "Regexp pattern that matches a comment in C-like languages.") + +(defun c-ts-common--fill-paragraph (&optional arg) + "Fillling function for `c-ts-common'. +ARG is passed to `fill-paragraph'." + (interactive "*P") + (save-restriction + (widen) + (let ((node (treesit-node-at (point)))) + (when (string-match-p c-ts-common--comment-regexp + (treesit-node-type node)) + (if (save-excursion + (goto-char (treesit-node-start node)) + (looking-at "//")) + (fill-comment-paragraph arg) + (c-ts-common--fill-block-comment arg))) + ;; Return t so `fill-paragraph' doesn't attempt to fill by + ;; itself. + t))) + +(defun c-ts-common--fill-block-comment (&optional arg) + "Fillling function for block comments. +ARG is passed to `fill-paragraph'. Assume point is in a block +comment." + (let* ((node (treesit-node-at (point))) + (start (treesit-node-start node)) + (end (treesit-node-end node)) + ;; Bind to nil to avoid infinite recursion. + (fill-paragraph-function nil) + (orig-point (point-marker)) + (start-marker (point-marker)) + (end-marker nil) + (end-len 0)) + (move-marker start-marker start) + ;; We mask "/*" and the space before "*/" like + ;; `c-fill-paragraph' does. + (atomic-change-group + ;; Mask "/*". + (goto-char start) + (when (looking-at (rx (* (syntax whitespace)) + (group "/") "*")) + (goto-char (match-beginning 1)) + (move-marker start-marker (point)) + (replace-match " " nil nil nil 1)) + ;; Include whitespaces before /*. + (goto-char start) + (beginning-of-line) + (setq start (point)) + ;; Mask spaces before "*/" if it is attached at the end + ;; of a sentence rather than on its own line. + (goto-char end) + (when (looking-back (rx (not (syntax whitespace)) + (group (+ (syntax whitespace))) + "*/") + (line-beginning-position)) + (goto-char (match-beginning 1)) + (setq end-marker (point-marker)) + (setq end-len (- (match-end 1) (match-beginning 1))) + (replace-match (make-string end-len ?x) + nil nil nil 1)) + ;; If "*/" is on its own line, don't included it in the + ;; filling region. + (when (not end-marker) + (goto-char end) + (when (looking-back (rx "*/") 2) + (backward-char 2) + (skip-syntax-backward "-") + (setq end (point)))) + ;; Let `fill-paragraph' do its thing. + (goto-char orig-point) + (narrow-to-region start end) + ;; We don't want to fill the region between START and + ;; START-MARKER, otherwise the filling function might delete + ;; some spaces there. + (fill-region start-marker end arg) + ;; Unmask. + (when start-marker + (goto-char start-marker) + (delete-char 1) + (insert "/")) + (when end-marker + (goto-char end-marker) + (delete-region (point) (+ end-len (point))) + (insert (make-string end-len ?\s)))))) + +(defun c-ts-common-comment-setup () + "Set up local variables for C-like comment. + +Set up: + - `comment-start' + - `comment-end' + - `comment-start-skip' + - `comment-end-skip' + - `adaptive-fill-mode' + - `adaptive-fill-first-line-regexp' + - `paragraph-start' + - `paragraph-separate' + - `fill-paragraph-function'" + (setq-local comment-start "// ") + (setq-local comment-end "") + (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) + (seq "/" (+ "*"))) + (* (syntax whitespace)))) + (setq-local comment-end-skip + (rx (* (syntax whitespace)) + (group (or (syntax comment-end) + (seq (+ "*") "/"))))) + (setq-local adaptive-fill-mode t) + ;; This matches (1) empty spaces (the default), (2) "//", (3) "*", + ;; but do not match "/*", because we don't want to use "/*" as + ;; prefix when filling. (Actually, it doesn't matter, because + ;; `comment-start-skip' matches "/*" which will cause + ;; `fill-context-prefix' to use "/*" as a prefix for filling, that's + ;; why we mask the "/*" in `c-ts-common--fill-paragraph'.) + (setq-local adaptive-fill-regexp + (concat (rx (* (syntax whitespace)) + (group (or (seq "/" (+ "/")) (* "*")))) + adaptive-fill-regexp)) + ;; Note the missing * comparing to `adaptive-fill-regexp'. The + ;; reason for its absence is a bit convoluted to explain. Suffice + ;; to say that without it, filling a single line paragraph that + ;; starts with /* doesn't insert * at the beginning of each + ;; following line, and filling a multi-line paragraph whose first + ;; two lines start with * does insert * at the beginning of each + ;; following line. If you know how does adaptive filling works, you + ;; know what I mean. + (setq-local adaptive-fill-first-line-regexp + (rx bos + (seq (* (syntax whitespace)) + (group (seq "/" (+ "/"))) + (* (syntax whitespace))) + eos)) + ;; Same as `adaptive-fill-regexp'. + (setq-local paragraph-start + (rx (or (seq (* (syntax whitespace)) + (group (or (seq "/" (+ "/")) (* "*"))) + (* (syntax whitespace)) + ;; Add this eol so that in + ;; `fill-context-prefix', `paragraph-start' + ;; doesn't match the prefix. + eol) + "\f"))) + (setq-local paragraph-separate paragraph-start) + (setq-local fill-paragraph-function #'c-ts-common--fill-paragraph)) + +(provide 'c-ts-common) + +;;; c-ts-common.el ends here diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el index 8ddd622a05..03793d61ba 100644 --- a/lisp/progmodes/c-ts-mode.el +++ b/lisp/progmodes/c-ts-mode.el @@ -64,26 +64,18 @@ ;; files, provided that you have the corresponding parser grammar ;; libraries installed. ;; -;; For C-like language major modes: -;; -;; - Use `c-ts-mode-comment-setup' to setup comment variables and -;; filling. -;; -;; - Use simple-indent matcher `c-ts-mode--looking-at-star' and anchor -;; `c-ts-mode--comment-start-after-first-star' for indenting block -;; comments. See `c-ts-mode--indent-styles' for example. -;; ;; - Use variable `c-ts-mode-indent-block-type-regexp' with indent ;; offset c-ts-mode--statement-offset for indenting statements. ;; Again, see `c-ts-mode--indent-styles' for example. +;; =20 ;;; Code: =20 (require 'treesit) +(require 'c-ts-common) (eval-when-compile (require 'rx)) =20 (declare-function treesit-parser-create "treesit.c") -(declare-function treesit-induce-sparse-tree "treesit.c") (declare-function treesit-node-parent "treesit.c") (declare-function treesit-node-start "treesit.c") (declare-function treesit-node-end "treesit.c") @@ -173,12 +165,12 @@ c-ts-mode--indent-styles ((node-is "else") parent-bol 0) ((node-is "case") parent-bol 0) ((node-is "preproc_arg") no-indent) - ;; `c-ts-mode--looking-at-star' has to come before - ;; `c-ts-mode--comment-2nd-line-matcher'. + ;; `c-ts-common-looking-at-star' has to come before + ;; `c-ts-common-comment-2nd-line-matcher'. ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) - (c-ts-mode--comment-2nd-line-matcher - c-ts-mode--comment-2nd-line-anchor + c-ts-common-comment-start-after-first-star -1) + (c-ts-common-comment-2nd-line-matcher + c-ts-common-comment-2nd-line-anchor 1) ((parent-is "comment") prev-adaptive-prefix 0) =20 @@ -333,60 +325,6 @@ c-ts-mode--close-bracket-offset (- (c-ts-mode--statement-offset node parent) c-ts-mode-indent-offset)) =20 -(defun c-ts-mode--looking-at-star (_n _p bol &rest _) - "A tree-sitter simple indent matcher. -Matches if there is a \"*\" after BOL." - (eq (char-after bol) ?*)) - -(defun c-ts-mode--comment-start-after-first-star (_n parent &rest _) - "A tree-sitter simple indent anchor. -Finds the \"/*\" and returns the point after the \"*\". -Assumes PARENT is a comment node." - (save-excursion - (goto-char (treesit-node-start parent)) - (if (looking-at (rx "/*")) - (match-end 0) - (point)))) - -(defun c-ts-mode--comment-2nd-line-matcher (_n parent &rest _) - "Matches if point is at the second line of a block comment. -PARENT should be a comment node." - (and (equal (treesit-node-type parent) "comment") - (save-excursion - (forward-line -1) - (back-to-indentation) - (eq (point) (treesit-node-start parent))))) - -(defun c-ts-mode--comment-2nd-line-anchor (_n _p bol &rest _) - "Return appropriate anchor for the second line of a comment. - -If the first line is /* alone, return the position right after -the star; if the first line is /* followed by some text, return -the position right before the text minus 1. - -Use an offset of 1 with this anchor. BOL is the beginning of -non-whitespace characters of the current line." - (save-excursion - (forward-line -1) - (back-to-indentation) - (when (looking-at comment-start-skip) - (goto-char (match-end 0)) - (if (looking-at (rx (* (or " " "\t")) eol)) - ;; Only /* at the first line. - (progn (skip-chars-backward " \t") - (if (save-excursion - (goto-char bol) - (looking-at (rx "*"))) - ;; The common case. Checked by "Multiline Block - ;; Comments 4". - (point) - ;; The "Multiline Block Comments 2" test in - ;; c-ts-mode-resources/indent.erts checks this. - (1- (point)))) - ;; There is something after /* at the first line. The - ;; "Multiline Block Comments 3" test checks this. - (1- (point)))))) - ;;; Font-lock =20 (defvar c-ts-mode--preproc-keywords @@ -782,156 +720,6 @@ c-ts-mode-indent-defun (treesit-node-end node)) (goto-char orig-point))) =20 -;;; Filling - -(defvar c-ts-mode--comment-regexp - ;; These covers C/C++, Java, JavaScript, TypeScript, Rust, C#. - (rx (or "comment" "line_comment" "block_comment")) - "Regexp pattern that matches a comment in C-like languages.") - -(defun c-ts-mode--fill-paragraph (&optional arg) - "Fillling function for `c-ts-mode'. -ARG is passed to `fill-paragraph'." - (interactive "*P") - (save-restriction - (widen) - (let ((node (treesit-node-at (point)))) - (when (string-match-p c-ts-mode--comment-regexp - (treesit-node-type node)) - (if (save-excursion - (goto-char (treesit-node-start node)) - (looking-at "//")) - (fill-comment-paragraph arg) - (c-ts-mode--fill-block-comment arg))) - ;; Return t so `fill-paragraph' doesn't attempt to fill by - ;; itself. - t))) - -(defun c-ts-mode--fill-block-comment (&optional arg) - "Fillling function for block comments. -ARG is passed to `fill-paragraph'. Assume point is in a block -comment." - (let* ((node (treesit-node-at (point))) - (start (treesit-node-start node)) - (end (treesit-node-end node)) - ;; Bind to nil to avoid infinite recursion. - (fill-paragraph-function nil) - (orig-point (point-marker)) - (start-marker (point-marker)) - (end-marker nil) - (end-len 0)) - (move-marker start-marker start) - ;; We mask "/*" and the space before "*/" like - ;; `c-fill-paragraph' does. - (atomic-change-group - ;; Mask "/*". - (goto-char start) - (when (looking-at (rx (* (syntax whitespace)) - (group "/") "*")) - (goto-char (match-beginning 1)) - (move-marker start-marker (point)) - (replace-match " " nil nil nil 1)) - ;; Include whitespaces before /*. - (goto-char start) - (beginning-of-line) - (setq start (point)) - ;; Mask spaces before "*/" if it is attached at the end - ;; of a sentence rather than on its own line. - (goto-char end) - (when (looking-back (rx (not (syntax whitespace)) - (group (+ (syntax whitespace))) - "*/") - (line-beginning-position)) - (goto-char (match-beginning 1)) - (setq end-marker (point-marker)) - (setq end-len (- (match-end 1) (match-beginning 1))) - (replace-match (make-string end-len ?x) - nil nil nil 1)) - ;; If "*/" is on its own line, don't included it in the - ;; filling region. - (when (not end-marker) - (goto-char end) - (when (looking-back (rx "*/") 2) - (backward-char 2) - (skip-syntax-backward "-") - (setq end (point)))) - ;; Let `fill-paragraph' do its thing. - (goto-char orig-point) - (narrow-to-region start end) - ;; We don't want to fill the region between START and - ;; START-MARKER, otherwise the filling function might delete - ;; some spaces there. - (fill-region start-marker end arg) - ;; Unmask. - (when start-marker - (goto-char start-marker) - (delete-char 1) - (insert "/")) - (when end-marker - (goto-char end-marker) - (delete-region (point) (+ end-len (point))) - (insert (make-string end-len ?\s)))))) - -(defun c-ts-mode-comment-setup () - "Set up local variables for C-like comment. - -Set up: - - `comment-start' - - `comment-end' - - `comment-start-skip' - - `comment-end-skip' - - `adaptive-fill-mode' - - `adaptive-fill-first-line-regexp' - - `paragraph-start' - - `paragraph-separate' - - `fill-paragraph-function'" - (setq-local comment-start "// ") - (setq-local comment-end "") - (setq-local comment-start-skip (rx (or (seq "/" (+ "/")) - (seq "/" (+ "*"))) - (* (syntax whitespace)))) - (setq-local comment-end-skip - (rx (* (syntax whitespace)) - (group (or (syntax comment-end) - (seq (+ "*") "/"))))) - (setq-local adaptive-fill-mode t) - ;; This matches (1) empty spaces (the default), (2) "//", (3) "*", - ;; but do not match "/*", because we don't want to use "/*" as - ;; prefix when filling. (Actually, it doesn't matter, because - ;; `comment-start-skip' matches "/*" which will cause - ;; `fill-context-prefix' to use "/*" as a prefix for filling, that's - ;; why we mask the "/*" in `c-ts-mode--fill-paragraph'.) - (setq-local adaptive-fill-regexp - (concat (rx (* (syntax whitespace)) - (group (or (seq "/" (+ "/")) (* "*")))) - adaptive-fill-regexp)) - ;; Note the missing * comparing to `adaptive-fill-regexp'. The - ;; reason for its absence is a bit convoluted to explain. Suffice - ;; to say that without it, filling a single line paragraph that - ;; starts with /* doesn't insert * at the beginning of each - ;; following line, and filling a multi-line paragraph whose first - ;; two lines start with * does insert * at the beginning of each - ;; following line. If you know how does adaptive filling works, you - ;; know what I mean. - (setq-local adaptive-fill-first-line-regexp - (rx bos - (seq (* (syntax whitespace)) - (group (seq "/" (+ "/"))) - (* (syntax whitespace))) - eos)) - ;; Same as `adaptive-fill-regexp'. - (setq-local paragraph-start - (rx (or (seq (* (syntax whitespace)) - (group (or (seq "/" (+ "/")) (* "*"))) - (* (syntax whitespace)) - ;; Add this eol so that in - ;; `fill-context-prefix', `paragraph-start' - ;; doesn't match the prefix. - eol) - "\f"))) - (setq-local paragraph-separate paragraph-start) - (setq-local fill-paragraph-function #'c-ts-mode--fill-paragraph)) - ;;; Modes =20 (defvar-keymap c-ts-mode-map @@ -968,7 +756,7 @@ c-ts-base-mode (setq-local indent-tabs-mode t)) =20 ;; Comment - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) =20 ;; Electric (setq-local electric-indent-chars diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el index 04f7f22236..852e893dc2 100644 --- a/lisp/progmodes/csharp-mode.el +++ b/lisp/progmodes/csharp-mode.el @@ -34,7 +34,7 @@ (require 'cc-mode) (require 'cc-langs) (require 'treesit) -(require 'c-ts-mode) ; For comment indenting and filling. +(require 'c-ts-common) ; For comment indenting and filling. =20 (eval-when-compile (require 'cc-fonts) @@ -634,8 +634,8 @@ csharp-ts-mode--indent-rules ((node-is "}") parent-bol 0) ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) - ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) + ((and (parent-is "comment") c-ts-common-looking-at-star) + c-ts-common-comment-start-after-first-star -1) ((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "namespace_declaration") parent-bol 0) ((parent-is "class_declaration") parent-bol 0) @@ -908,7 +908,7 @@ csharp-ts-mode (treesit-parser-create 'c-sharp) =20 ;; Comments. - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) =20 ;; Indent. (setq-local treesit-simple-indent-rules csharp-ts-mode--indent-rules) diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index 8251d9603c..af2b0c1fa8 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -29,7 +29,7 @@ =20 (require 'treesit) (eval-when-compile (require 'rx)) -(require 'c-ts-mode) ; For comment indent and filling. +(require 'c-ts-common) ; For comment indent and filling. =20 (declare-function treesit-parser-create "treesit.c") (declare-function treesit-induce-sparse-tree "treesit.c") @@ -73,8 +73,8 @@ java-ts-mode--indent-rules ((node-is "}") (and parent parent-bol) 0) ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) - ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) + ((and (parent-is "comment") c-ts-common-looking-at-star) + c-ts-common-comment-start-after-first-star -1) ((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "text_block") no-indent) ((parent-is "class_body") parent-bol java-ts-mode-indent-offset) @@ -293,7 +293,7 @@ java-ts-mode (treesit-parser-create 'java) =20 ;; Comments. - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) =20 ;; Indent. (setq-local treesit-simple-indent-rules java-ts-mode--indent-rules) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 176024863f..b5c912b8b0 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -54,7 +54,7 @@ (require 'json) (require 'prog-mode) (require 'treesit) -(require 'c-ts-mode) ; For comment indent and filling. +(require 'c-ts-common) ; For comment indent and filling. =20 (eval-when-compile (require 'cl-lib) @@ -3428,8 +3428,8 @@ js--treesit-indent-rules ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) ((node-is ">") parent-bol 0) - ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) + ((and (parent-is "comment") c-ts-common-looking-at-star) + c-ts-common-comment-start-after-first-star -1) ((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "ternary_expression") parent-bol js-indent-level) ((parent-is "member_expression") parent-bol js-indent-level) @@ -3806,7 +3806,7 @@ js-ts-mode ;; Which-func. (setq-local which-func-imenu-joiner-function #'js--which-func-joiner) ;; Comment. - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) (setq-local comment-multi-line t) ;; Electric-indent. (setq-local electric-indent-chars diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el index 08590ae6a8..3a6cb61b71 100644 --- a/lisp/progmodes/rust-ts-mode.el +++ b/lisp/progmodes/rust-ts-mode.el @@ -29,7 +29,7 @@ =20 (require 'treesit) (eval-when-compile (require 'rx)) -(require 'c-ts-mode) ; For comment indent and filling. +(require 'c-ts-common) ; For comment indent and filling. =20 (declare-function treesit-parser-create "treesit.c") (declare-function treesit-induce-sparse-tree "treesit.c") @@ -71,8 +71,8 @@ rust-ts-mode--indent-rules ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) ((node-is "}") (and parent parent-bol) 0) - ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) + ((and (parent-is "comment") c-ts-common-looking-at-star) + c-ts-common-comment-start-after-first-star -1) ((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "arguments") parent-bol rust-ts-mode-indent-offset) ((parent-is "await_expression") parent-bol rust-ts-mode-indent-offset) @@ -285,7 +285,7 @@ rust-ts-mode (treesit-parser-create 'rust) =20 ;; Comments. - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) =20 ;; Font-lock. (setq-local treesit-font-lock-settings rust-ts-mode--font-lock-setting= s) diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescri= pt-ts-mode.el index 903be93422..3403096880 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -30,7 +30,7 @@ (require 'treesit) (require 'js) (eval-when-compile (require 'rx)) -(require 'c-ts-mode) ; For comment indent and filling. +(require 'c-ts-common) ; For comment indent and filling. =20 (declare-function treesit-parser-create "treesit.c") =20 @@ -74,8 +74,8 @@ typescript-ts-mode--indent-rules ((node-is ")") parent-bol 0) ((node-is "]") parent-bol 0) ((node-is ">") parent-bol 0) - ((and (parent-is "comment") c-ts-mode--looking-at-star) - c-ts-mode--comment-start-after-first-star -1) + ((and (parent-is "comment") c-ts-common-looking-at-star) + c-ts-common-comment-start-after-first-star -1) ((parent-is "comment") prev-adaptive-prefix 0) ((parent-is "ternary_expression") parent-bol typescript-ts-mode-inden= t-offset) ((parent-is "member_expression") parent-bol typescript-ts-mode-indent= -offset) @@ -321,7 +321,7 @@ typescript-ts-base-mode :syntax-table typescript-ts-mode--syntax-table =20 ;; Comments. - (c-ts-mode-comment-setup) + (c-ts-common-comment-setup) =20 ;; Electric (setq-local electric-indent-chars --=20 2.34.1 --=-=-=--