Stefan Kangas <stefankangas@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 75184) by debbugs.gnu.org; 2 Mar 2025 04:19:46 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 01 23:19:46 2025 Received: from localhost ([127.0.0.1]:49764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1toanp-0008Sl-OA for submit <at> debbugs.gnu.org; Sat, 01 Mar 2025 23:19:45 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:55795) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1toann-0008S2-I8 for 75184 <at> debbugs.gnu.org; Sat, 01 Mar 2025 23:19:44 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5dedd4782c6so6412579a12.3 for <75184 <at> debbugs.gnu.org>; Sat, 01 Mar 2025 20:19:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740889177; x=1741493977; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=n02wXtUvkegX87t1qRjHoWtpho+EIK4buqFAdjRJdDc=; b=RengXqC+8shWDn+qlLnz1cKR2J/amX9RjGqjVNOyu2UGoLRUzS+WIfjzCT7VHlL1ZE vZoX2nHioDpNd0rbbWmY8y30+HZUFNl1BHr6TCBMumcUmzKmn+IKC+3yA4TljntxTbjx 5y947w6ZJwJFk3/51pkf3OT6j0kMzkrhDxDXCaonYkY6AEZQcsj/e2htOoo0OAfWoxir bFGET5oTj0zU7TVBRxpxCEBfbUQ0zkr5vRRA+rV3tXvudwWEw6gVtvY3WtCz17xKl5Yb A01w3tbAavBJ0TZ0JPdHsceNG5TVK6bUOOFsAmqyg3s40Ufjgf4LDrB/uKYTZYyG+99p 1dJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740889177; x=1741493977; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=n02wXtUvkegX87t1qRjHoWtpho+EIK4buqFAdjRJdDc=; b=hYoP7eHFePpZ91zH4bxdsHw9mjgaAU3UpEKtnXppSHstvbvlyqQ6wPzZFa39k4q3HM QaTulFIcjbD194AgM/q/lK+ISr8MuEKqXiQTah1AfcrVKDzXew9fDbBu18xZAH8NsNWf x48Fcz8RMFqE2vqQ0WyilsH7v2MAptsjKFvCUCqcyuYH3oSwRoHow4QBYhFHXHEEVtYs aqa1pvwmpTu7sEpwJgyADuNAxKAeEbdZ6riBqXGzh29gtkzhO9boqFBKzn0ZTkd4Tkj3 6z3wAuwK2ECFzGvks4yzhzYB6BBLSXa16jPxayLGzQojwcJuXzim+1dJPkLrAC36RDi8 UC6A== X-Gm-Message-State: AOJu0YxvVnPqx4WgqAN56Vpm3aRa4QpcibN0c4uMNY90tvxw2ODYVc2D Gd049ZwyYGIP7jQyaHWj34ieOfx0nZT+86DDKC7HryUB1ShaBxELwnZUmLdsHI5HXi3AtpyXnGw u9IMwp7gljuvNK7s+zHZ/yNvSbJiv9IWQMUI= X-Gm-Gg: ASbGncvDHrntO+Fi8tUAKCKqD4lz9/gNEr7EA79IK677lCYfMPwqf1oZxqY67ApiHXG ss+J3o9H5UW3OTh7sXgQI+Ti5RYV8EVhKPmHfQwCYmS5shkrtLA4Vwb5XhRHk8ZTBQ/UcPBM2ua bn3+wnqZ7eti/v/OQ9FyAUmHuFqQ== X-Google-Smtp-Source: AGHT+IGqnVNbyy7z3mjdPgYZOJXMPoFyAJxDLIqEJqw8SSxX+QjnRtd1M4fKt8lTjUuezf+wB8oIEpWnoppF7szdApg= X-Received: by 2002:a05:6402:4582:b0:5db:f26d:fff8 with SMTP id 4fb4d7f45d1cf-5e4d6b70ce7mr11108196a12.22.1740889177413; Sat, 01 Mar 2025 20:19:37 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 1 Mar 2025 20:19:37 -0800 From: Stefan Kangas <stefankangas@HIDDEN> In-Reply-To: <87v7v27bu9.fsf@HIDDEN> References: <87v7v27bu9.fsf@HIDDEN> MIME-Version: 1.0 Date: Sat, 1 Mar 2025 20:19:37 -0800 X-Gm-Features: AQ5f1Jr13d1nHijpkV4cr1RDJh-_XqBbkh6IWkbkkb-CosDvR6dzKWA2D7MCnHU Message-ID: <CADwFkmm+btr7QaoSnRfnMFBbL4UrHSXZm7yXwOy1P+htd7ZsWg@HIDDEN> Subject: Re: bug#75184: Merge haskell-ts-mode to master To: Pranshu Sharma <pranshu@HIDDEN> Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75184 Cc: 75184 <at> debbugs.gnu.org, Yuan Fu <casouri@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Pranshu Sharma <pranshu@HIDDEN> writes: > Hello all, > > This is request to merge haskell-ts-mode to master. The code is here > https://codeberg.org/pranshu/haskell-ts-mode , but I also attacched > file. I suggest you look in codeberg repo for latest changes. > > Phillip kauldarlic has done a review of the non-treesit specific part of > the code in emacs-devel, *I need someone* to review treesit specific > parts of it now. Yuan, could you please take a look at this and install it if it looks okay? Thanks in advance.
bug-gnu-emacs@HIDDEN
:bug#75184
; Package emacs
.
Full text available.Stefan Kangas <stefankangas@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 75184) by debbugs.gnu.org; 30 Dec 2024 10:53:57 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 30 05:53:57 2024 Received: from localhost ([127.0.0.1]:57467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tSDPJ-00020J-1o for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 05:53:57 -0500 Received: from mail.bauherren.ovh ([45.32.179.127]:58354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pranshu@HIDDEN>) id 1tSDPH-000205-Ga for 75184 <at> debbugs.gnu.org; Mon, 30 Dec 2024 05:53:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bauherren.ovh; s=mail; t=1735555998; bh=8ngldf5aXSKb6+/RQEqfjUuo4ovnzmZ4ZpwSlxChACc=; h=From:To:Subject:Date:From; b=YgzQv7Kh5OK8krnfyiLIRxe8+LrPugqyNuT1bDNa+Rujfs9Gyv9mY3/evg94uu7IA sZj3dANctpL7iVxIdDIAdAMzrg8QNY1VJf6GmB/UTyZ0rCyyAq07SllRQQUVNM89ea wW0aH2OK3JCESuRFoCvRRbk2/xnvWppTIoUmpyAgnW/lQlVshVtVhb1xWhsZtVV3U6 qzVcLfrEJezqQ3DLHgyFELOz/jIPdC220JW/y7D9GdEnPqVIw7mRSarwolCLo0vROh O78YAP2UjKXkntVgl1WqufhwsBr6RQPopuiGKYtOslOpOmxnwyV8i0L2HWUYJ8PxBm DBizi2fwn4gug== From: Pranshu Sharma <pranshu@HIDDEN> To: 75184 <at> debbugs.gnu.org Subject: URGENT !! Date: Mon, 30 Dec 2024 20:53:06 +1000 Message-ID: <87jzbh788d.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 75184 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.2 (/) --=-=-= Content-Type: text/plain The version sent in my last email has a major bug, new version is on updaate codeberg repo and attached. --=-=-= Content-Type: application/emacs-lisp Content-Disposition: attachment; filename=haskell-ts-mode.el Content-Transfer-Encoding: quoted-printable ;;; haskell-ts-mode.el --- A treesit based major mode for haskell -*- lexic= al-binding:t -*- ;; Copyright (C) 2024 Pranshu Sharma ;; Author: Pranshu Sharma <pranshusharma366 at gmail> ;; URL: https://codeberg.org/pranshu/haskell-ts-mode ;; Package-Requires: ((emacs "29.3")) ;; Version: 1 ;; Keywords: languages, haskell ;; This program 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. ;; This program 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 this program. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: ;; This is a major mode that uses treesitter to provide all the basic ;; major mode stuff, like indentation, font lock, etc... ;; It uses the grammer at: https://github.com/tree-sitter/tree-sitter-haske= ll ;;; Code: (require 'comint) (require 'treesit) (declare-function treesit-parser-create "treesit.c") (declare-function treesit-node-start "treesit.c") (declare-function treesit-node-parent "treesit.c") (declare-function treesit-node-prev-sibling "treesit.c") (declare-function treesit-node-next-sibling "treesit.c") (declare-function treesit-node-end "treesit.c") (declare-function treesit-node-child "treesit.c") (declare-function treesit-node-type "treesit.c") (defgroup haskell-ts-mode nil "Group that contains haskell-ts-mode variables" :group 'langs) (defvar haskell-ts-font-lock-feature-list `((comment str pragma parens) (type definition function args) (match keyword) (otherwise signature type-sig))) (defcustom haskell-ts-ghci "ghci" "The command to be called to run ghci." :type 'string) (defcustom haskell-ts-ghci-buffer-name "Inferior Haskell" "Buffer name for the ghci prcoess." :type 'string) (defcustom haskell-ts-use-indent t "Set to non-nil to use the indentation provided by haskell-ts-mode" :type 'boolean) (defcustom haskell-ts-font-lock-level 4 "Level of font lock, 1 for minimum highlghting and 4 for maximum." :type '(choice (const :tag "Minimal Highlighting" 1) (const :tag "Low Highlighting" 2) (const :tag "High Highlighting" 3) (const :tag "Maximum Highlighting" 4))) (defvar haskell-ts-prettify-symbols-alist '(("\\" . "=CE=BB") ("/=3D" . "=E2=89=A0") ("->" . "=E2=86=92") ("=3D>" . "=E2=87=92") ("<-" . "=E2=86=90") ("<=3D" . "=E2=89=A5") (">=3D" . "=E2=89=A4"))) (defvar haskell-ts-font-lock (treesit-font-lock-rules :language 'haskell :feature 'keyword `(["module" "import" "data" "let" "where" "case" "type" "if" "then" "else" "of" "do" "in" "instance" "class"] @font-lock-keyword-face) :language 'haskell :feature 'otherwise :override t `(((match (guards guard: (boolean (variable) @font-lock-keyword-face))) (:match "otherwise" @font-lock-keyword-face))) :language 'haskell :feature 'type-sig "(signature (binding_list (variable) @font-lock-doc-markup-face)) (signature (variable) @font-lock-doc-markup-face)" :language 'haskell :feature 'args :override 'keep (concat "(function (infix left_operand: (_) @haskell-ts--fontify-arg))" "(function (infix right_operand: (_) @haskell-ts--fontify-arg))" "(generator . (_) @haskell-ts--fontify-arg)" "(bind (as (variable) . (_) @haskell-ts--fontify-arg))" "(patterns) @haskell-ts--fontify-arg") :language 'haskell :feature 'type `((type) @font-lock-type-face (constructor) @font-lock-type-face) :language 'haskell :override t :feature 'signature `((signature (function) @haskell-ts--fontify-type) (context (function) @haskell-ts--fontify-type)) :language 'haskell :feature 'match `((match ("|" @font-lock-doc-face) ("=3D" @font-lock-doc-face)) (list_comprehension ("|" @font-lock-doc-face (qualifiers (generator "<-" @font-lock-doc-face)))) (match ("->" @font-lock-doc-face))) :language 'haskell :feature 'comment `(((comment) @font-lock-comment-face) ((haddock) @font-lock-doc-face)) :language 'haskell :feature 'pragma `((pragma) @font-lock-preprocessor-face (cpp) @font-lock-preprocessor-face) :language 'haskell :feature 'str :override t `((char) @font-lock-string-face (string) @font-lock-string-face (quasiquote (quoter) @font-lock-type-face) (quasiquote (quasiquote_body) @font-lock-preprocessor-face)) :language 'haskell :feature 'parens :override t `(["(" ")" "[" "]"] @font-lock-operator-face (infix operator: (_) @font-lock-operator-face)) :language 'haskell :feature 'function :override t `((function name: (variable) @font-lock-function-name-face) (function (infix (operator) @font-lock-function-name-face)) (declarations (type_synomym (name) @font-lock-function-name-face)) (bind (variable) @font-lock-function-name-face) (function (infix (infix_id (variable) @font-lock-function-name-face))) (bind (as (variable) @font-lock-function-name-face)))) "The treesitter font lock settings for haskell.") (defun haskell-ts--stand-alone-parent (_ parent bol) (save-excursion (goto-char (treesit-node-start parent)) (let ((type (treesit-node-type parent))) (if (and (not bol) (or (looking-back "^[ \t]*" (line-beginning-position)) (member type '("when" "where" "do" "let" "local_binds" "function")))) (treesit-node-start parent) (haskell-ts--stand-alone-parent 1 (funcall (if bol 'treesit-node-parent 'identity) (treesit-node-parent parent)) nil))))) (defvar haskell-ts--ignore-types (regexp-opt '("comment" "cpp" "haddock")) "Node types that will be ignored by indentation.") (defvar haskell-ts-indent-rules (let* ((p-sib (lambda (node &optional arg) (let* ((func (if arg #'treesit-node-prev-sibling #'treesit-node-next-sibling)) (n (funcall func node))) (while (and n (string-match haskell-ts--ignore-types (treesit-node-type n))) (setq n (funcall func n))) n))) (p-prev-sib (lambda (node &optional _ _) (treesit-node-start (funcall p-sib node t))= )) (p-n-prev (lambda (node) (funcall p-sib node t))) (parent-first-child (lambda (_ parent _) (treesit-node-start (treesit-node-child parent 0))))) `((haskell ((node-is "^cpp$") column-0 0) ((parent-is "^comment$") column-0 0) ((parent-is "^haddock$") column-0 0) ((parent-is "^imports$") column-0 0) ;; Infix ((n-p-gp nil "infix" "infix") (lambda (_ node _) (let ((first-inf nil)) (while (string=3D "infix" (treesit-node-type (setq node (treesit-node-parent node)))) (setq first-inf node)) (funcall ,parent-first-child nil first-inf nil))) 0) ((node-is "^infix$") ,parent-first-child 0) ;; Lambda ((parent-is "^lambda\\(_case\\)?$") standalone-parent 2) ((parent-is "^class_declarations$") prev-sibling 0) ((node-is "^where$") parent 2) ;; in ((node-is "^in$") parent 0) ((parent-is "qualifiers") parent 0) ;; list ((node-is "^]$") parent 0) ((parent-is "^list$") standalone-parent 2) ;; If then else ((node-is "^then$") parent 2) ((node-is "^else$") parent 2) ((parent-is "^apply$") haskell-ts--stand-alone-parent 1) ((node-is "^quasiquote$") grand-parent 2) ((parent-is "^quasiquote_body$") (lambda (_ _ c) c) 0) ((lambda (node parent bol) (when-let ((n (treesit-node-prev-sibling node))) (while (string=3D "comment" (treesit-node-type n)) (setq n (treesit-node-prev-sibling n))) (string=3D "do" (treesit-node-type n)))) haskell-ts--stand-alone-parent 3) ((parent-is "^do$") ,p-prev-sib 0) ((parent-is "^alternatives$") ,p-prev-sib 0) ;; prev-adaptive-prefix is broken sometimes (no-node (lambda (_ _ _) (save-excursion (goto-char (line-beginning-position 0)) (back-to-indentation) (point))) 0) ((parent-is "^data_constructors$") parent 0) ;; where ((lambda (node _ _) (let ((n (treesit-node-prev-sibling node))) (while (string=3D "comment" (treesit-node-type n)) (setq n (treesit-node-prev-sibling n))) (string=3D "where" (treesit-node-type n)))) (lambda (_ b _) (+ 1 (treesit-node-start (treesit-node-prev-sibling b)))) 3) ((parent-is "local_binds\\|instance_declarations") ,p-prev-sib 0) ;; Match ((lambda (node _ _) (and (string=3D "match" (treesit-node-type node)) (string-match (regexp-opt '("patterns" "variable")) (treesit-node-type (funcall ,p-n-prev node))))) standalone-parent 2) ((node-is "match") ,p-prev-sib 0) ((parent-is "match") standalone-parent 2) ((parent-is "^haskell$") column-0 0) ((parent-is "^declarations$") column-0 0) ((parent-is "^record$") standalone-parent 2) ((parent-is "^exports$") (lambda (_ b _) (treesit-node-start (treesit-node-prev-sibling b))) 0) ((n-p-gp nil "signature" "foreign_import") grand-parent 3) ((parent-is "^case$") standalone-parent 4) ((node-is "^alternatives$") (lambda (_ b _) (treesit-node-start (treesit-node-child b 0))) 2) ((node-is "^comment$") (lambda (node parent _) (pcase node ;; (relevent means type not it haskell-ts--ignore-types) ;; 1. next relevent sibling if exists ((app ,p-sib (and (pred (not null)) n)) (treesit-node-start n)) ;; 2. previous relevent sibling if exists ((app ,p-prev-sib (and (pred (not null)) n)) n) ;; 3. parent (_ (treesit-node-start parent)))) 0) ;; Backup (catch-all parent 2)))) "\"Simple\" treesit indentation rules for haskell.") ;; Copied from haskell-tng-mode, changed a bit (defvar haskell-ts-mode-syntax-table (eval-when-compile (let ((table (make-syntax-table)) (syntax-list '(("_" ?! ?_) ("w" ?') ;; Haskell has some goofy comment enders like C-q C-l (">" 13 10 12 11) ("_ 123" ?-) ("(}1nb" ?\{) ("){4nb" ?\}) ("<" ?#) (">" ?\n) ;; Special operaters ("." ?\, ?\; ?@) ("\"" ?\") ("$`" ?\`)))) ;; The defaults are mostly fine (dolist (ls syntax-list table) (dolist (char (cdr ls)) (modify-syntax-entry char (car ls) table)))))) (defmacro haskell-ts-imenu-name-function (check-func) `(lambda (node) (let ((nn (treesit-node-child node 0 node))) (if (funcall ,check-func node) (if (string=3D (treesit-node-type nn) "infix") (treesit-node-text (treesit-node-child nn 1)) (haskell-ts-defun-name node)) nil)))) (defvar-keymap haskell-ts-mode-map :doc "Keymap for haskell-ts-mode." "C-c C-c" 'haskell-ts-compile-region-and-go "C-c C-r" 'run-haskell) ;;;###autoload (define-derived-mode haskell-ts-mode prog-mode "haskell ts mode" "Major mode for Haskell files using tree-sitter." (unless (treesit-ready-p 'haskell) (error "Tree-sitter for Haskell is not available")) (treesit-parser-create 'haskell) (setq-local treesit-defun-type-regexp "\\(?:\\(?:function\\|struct\\)_def= inition\\)") ;; Indent (when haskell-ts-use-indent (setq-local treesit-simple-indent-rules haskell-ts-indent-rules) (setq-local indent-tabs-mode nil)) ;; Comment (setq-local comment-start "-- ") (setq-local comment-use-syntax t) (setq-local comment-start-skip "\\(?: \\|^\\)-+") ;; Electric (setq-local electric-pair-pairs '((?` . ?`) (?\( . ?\)) (?{ . ?}) (?\" . ?\") (?\[ . ?\]))) ;; Navigation (setq-local treesit-defun-name-function 'haskell-ts-defun-name) (setq-local treesit-defun-type-regexp ;; Since haskell is strict functional, any 2nd level ;; entity is defintion (cons ".+" (lambda (node) (and (not (string-match haskell-ts--ignore-types (treesit-node-type= node))) (string=3D "declarations" (treesit-node-type (treesit-node-parent nod= e))))))) (setq-local prettify-symbols-alist haskell-ts-prettify-symbols-alist) ;; Imenu (setq-local treesit-simple-imenu-settings `((nil haskell-ts-imenu-func-node-p nil ,(haskell-ts-imenu-name-function #'haskell-ts-imenu-func-node-p)) ("Signatures.." haskell-ts-imenu-sig-node-p nil ,(haskell-ts-imenu-name-function #'haskell-ts-imenu-sig-node-p)) ("Data..." haskell-ts-imenu-data-type-p nil (lambda (node) (treesit-node-text (treesit-node-child node 1)))))) ;; font-lock (setq-local treesit-font-lock-level haskell-ts-font-lock-level) (setq-local treesit-font-lock-settings haskell-ts-font-lock) (setq-local treesit-font-lock-feature-list haskell-ts-font-lock-feature-list) (treesit-major-mode-setup)) (defun haskell-ts--fontify-arg (node &optional _ _ _) (if (string=3D "variable" (treesit-node-type node)) (put-text-property (treesit-node-start node) (treesit-node-end node) 'face font-lock-variable-name-face) (mapc 'haskell-ts--fontify-arg (treesit-node-children node)))) (defun haskell-ts--fontify-type (node &optional _ _ _) (let ((last-child (treesit-node-child node -1))) (if (string=3D (treesit-node-type last-child) "function") (haskell-ts--fontify-type last-child) (put-text-property (treesit-node-start last-child) (treesit-node-end last-child) 'face font-lock-variable-name-face)))) (defun haskell-ts-imenu-node-p (regex node) (and (string-match-p regex (treesit-node-type node)) (string=3D (treesit-node-type (treesit-node-parent node)) "declarati= ons"))) (defun haskell-ts-imenu-func-node-p (node) (haskell-ts-imenu-node-p "function\\|bind" node)) (defun haskell-ts-imenu-sig-node-p (node) (haskell-ts-imenu-node-p "signature" node)) (defun haskell-ts-imenu-data-type-p (node) (haskell-ts-imenu-node-p "data_type" node)) (defun haskell-ts-defun-name (node) (treesit-node-text (treesit-node-child node 0))) (defun haskell-ts-compile-region-and-go (start end) "Compile the text from START to END in the haskell proc." (interactive "r") (let ((hs (haskell-ts-haskell-session)) (str (buffer-substring-no-properties start end))) (comint-send-string hs ":{\n") (comint-send-string hs (replace-regexp-in-string "^:\\}" "\\:}" str nil t)) (comint-send-string hs "\n:}\n"))) (defun run-haskell () (interactive) (pop-to-buffer-same-window (if (comint-check-proc (concat "*" haskell-ts-ghci-buffer-name "*")) haskell-ts-ghci-buffer-name (make-comint haskell-ts-ghci-buffer-name haskell-ts-ghci nil buffer-fi= le-name)))) (defun haskell-ts-haskell-session () (get-buffer-process (concat "*" haskell-ts-ghci-buffer-name "*"))) (when (treesit-ready-p 'haskell) (add-to-list 'auto-mode-alist '("\\.hs\\'" . haskell-ts-mode))) (provide 'haskell-ts-mode) ;;; haskell-ts-mode.el ends here --=-=-= Content-Type: text/plain (sorry for sending multipel time, I forgot I had to sent to the bug thing) -- Pranshu Sharma <https://p.bauherren.ovh> --=-=-=--
bug-gnu-emacs@HIDDEN
:bug#75184
; Package emacs
.
Full text available.Received: (at submit) by debbugs.gnu.org; 29 Dec 2024 17:14:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 29 12:14:19 2024 Received: from localhost ([127.0.0.1]:55993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tRwrq-0002Yl-EJ for submit <at> debbugs.gnu.org; Sun, 29 Dec 2024 12:14:19 -0500 Received: from lists.gnu.org ([209.51.188.17]:47698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <pranshu@HIDDEN>) id 1tRv8K-0005fi-QW for submit <at> debbugs.gnu.org; Sun, 29 Dec 2024 10:23:13 -0500 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 <pranshu@HIDDEN>) id 1tRv8J-0002mE-P5 for bug-gnu-emacs@HIDDEN; Sun, 29 Dec 2024 10:23:12 -0500 Received: from mail.bauherren.ovh ([45.32.179.127]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <pranshu@HIDDEN>) id 1tRv8H-0000jX-Kk for bug-gnu-emacs@HIDDEN; Sun, 29 Dec 2024 10:23:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bauherren.ovh; s=mail; t=1735485784; bh=PLUOAHYPaIbW8SKFisNcicyhuc8vkR5odLxePzKXDh8=; h=From:To:Subject:Date:From; b=MkjmctqtwcKJsoWYUeikZWnHXBa7v2QRhkli4w4UcD3Qw8TWlRMaOXcLuJDwyIlEQ Lt1xveX8J6RZwaa1qVPFd8Nfp3myCVrzhBJ6DVp27sszt160uc7XqTErWOCDCB5V2B aXWkqiQu0H9zCDTEQSpPmmoqUDoG9o6prIJ/jBRxcNXaMQpN6xDt2dVf7RtSOsIw4u Br7KKbHaH1IBa2QiQp1d4hVknleqpL1UQxi0+/1fy/5B9+rcH3c2BRAI3oThMTHSH2 3S+PFVxwyXYQyhSbAgu4XMtIjSOV1N3cdvsbeHzcd8MW4PmoKiWf2znFsszePlpIvx bLyyWCfcnhgFQ== From: Pranshu Sharma <pranshu@HIDDEN> To: bug-gnu-emacs@HIDDEN Subject: Merge haskell-ts-mode to master Date: Mon, 30 Dec 2024 01:22:54 +1000 Message-ID: <87v7v27bu9.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=45.32.179.127; envelope-from=pranshu@HIDDEN; helo=mail.bauherren.ovh X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 5.0 requ) BAYES_05=-0.5, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, FROM_FMBLA_NEWDOM28=0.798, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.6 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sun, 29 Dec 2024 12:14:10 -0500 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.6 (-) --=-=-= Content-Type: text/plain Hello all, This is request to merge haskell-ts-mode to master. The code is here https://codeberg.org/pranshu/haskell-ts-mode , but I also attacched file. I suggest you look in codeberg repo for latest changes. Phillip kauldarlic has done a review of the non-treesit specific part of the code in emacs-devel, *I need someone* to review treesit specific parts of it now. --=-=-= Content-Type: application/emacs-lisp Content-Disposition: attachment; filename=haskell-ts-mode.el Content-Transfer-Encoding: quoted-printable ;;; haskell-ts-mode.el --- A treesit based major mode for haskell -*- lexic= al-binding:t -*- ;; Copyright (C) 2024 Pranshu Sharma ;; Author: Pranshu Sharma <pranshusharma366 at gmail> ;; URL: https://codeberg.org/pranshu/haskell-ts-mode ;; Package-Requires: ((emacs "29.3")) ;; Version: 1 ;; Keywords: languages, haskell ;; This program 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. ;; This program 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 this program. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: ;; This is a major mode that uses treesitter to provide all the basic ;; major mode stuff, like indentation, font lock, etc... ;; It uses the grammer at: https://github.com/tree-sitter/tree-sitter-haske= ll ;;; Code: (require 'comint) (require 'treesit) (declare-function treesit-parser-create "treesit.c") (declare-function treesit-node-start "treesit.c") (declare-function treesit-node-parent "treesit.c") (declare-function treesit-node-prev-sibling "treesit.c") (declare-function treesit-node-next-sibling "treesit.c") (declare-function treesit-node-end "treesit.c") (declare-function treesit-node-child "treesit.c") (declare-function treesit-node-type "treesit.c") (defgroup haskell-ts-mode nil "Group that contains haskell-ts-mode variables" :group 'langs) (defvar haskell-ts-font-lock-feature-list `((comment str pragma parens) (type definition function args) (match keyword) (otherwise signature type-sig))) (defcustom haskell-ts-ghci "ghci" "The command to be called to run ghci." :type 'string) (defcustom haskell-ts-ghci-buffer-name "Inferior Haskell" "Buffer name for the ghci prcoess." :type 'string) (defcustom haskell-ts-use-indent t "Set to non-nil to use the indentation provided by haskell-ts-mode" :type 'boolean) (defcustom haskell-ts-font-lock-level 4 "Level of font lock, 1 for minimum highlghting and 4 for maximum." :type '(choice (const :tag "Minimal Highlighting" 1) (const :tag "Low Highlighting" 2) (const :tag "High Highlighting" 3) (const :tag "Maximum Highlighting" 4))) (defvar haskell-ts-prettify-symbols-alist '(("\\" . "=CE=BB") ("/=3D" . "=E2=89=A0") ("->" . "=E2=86=92") ("=3D>" . "=E2=87=92") ("<-" . "=E2=86=90") ("<=3D" . "=E2=89=A5") (">=3D" . "=E2=89=A4"))) (defvar haskell-ts-font-lock (treesit-font-lock-rules :language 'haskell :feature 'keyword `(["module" "import" "data" "let" "where" "case" "type" "if" "then" "else" "of" "do" "in" "instance" "class"] @font-lock-keyword-face) :language 'haskell :feature 'otherwise :override t `(((match (guards guard: (boolean (variable) @font-lock-keyword-face))) (:match "otherwise" @font-lock-keyword-face))) :language 'haskell :feature 'type-sig "(signature (binding_list (variable) @font-lock-doc-markup-face)) (signature (variable) @font-lock-doc-markup-face)" :language 'haskell :feature 'args :override 'keep (concat "(function (infix left_operand: (_) @haskell-ts--fontify-arg))" "(function (infix right_operand: (_) @haskell-ts--fontify-arg))" "(generator . (_) @haskell-ts--fontify-arg)" "(bind (as (variable) . (_) @haskell-ts--fontify-arg))" "(patterns) @haskell-ts--fontify-arg") :language 'haskell :feature 'type `((type) @font-lock-type-face (constructor) @font-lock-type-face) :language 'haskell :override t :feature 'signature `((signature (function) @haskell-ts--fontify-type) (context (function) @haskell-ts--fontify-type)) :language 'haskell :feature 'match `((match ("|" @font-lock-doc-face) ("=3D" @font-lock-doc-face)) (list_comprehension ("|" @font-lock-doc-face (qualifiers (generator "<-" @font-lock-doc-face)))) (match ("->" @font-lock-doc-face))) :language 'haskell :feature 'comment `(((comment) @font-lock-comment-face) ((haddock) @font-lock-doc-face)) :language 'haskell :feature 'pragma `((pragma) @font-lock-preprocessor-face (cpp) @font-lock-preprocessor-face) :language 'haskell :feature 'str :override t `((char) @font-lock-string-face (string) @font-lock-string-face (quasiquote (quoter) @font-lock-type-face) (quasiquote (quasiquote_body) @font-lock-preprocessor-face)) :language 'haskell :feature 'parens :override t `(["(" ")" "[" "]"] @font-lock-operator-face (infix operator: (_) @font-lock-operator-face)) :language 'haskell :feature 'function :override t `((function name: (variable) @font-lock-function-name-face) (function (infix (operator) @font-lock-function-name-face)) (declarations (type_synomym (name) @font-lock-function-name-face)) (bind (variable) @font-lock-function-name-face) (function (infix (infix_id (variable) @font-lock-function-name-face))) (bind (as (variable) @font-lock-function-name-face)))) "The treesitter font lock settings for haskell.") (defun haskell-ts--stand-alone-parent (_ parent bol) (save-excursion (goto-char (treesit-node-start parent)) (let ((type (treesit-node-type parent))) (if (and (not bol) (or (looking-back "^[ \t]*" (line-beginning-position)) (member type '("when" "where" "do" "let" "local_binds" "function")))) (treesit-node-start parent) (haskell-ts--stand-alone-parent 1 (funcall (if bol 'treesit-node-parent 'identity) (treesit-node-parent parent)) nil))))) (defvar haskell-ts--ignore-types (regexp-opt '("comment" "cpp" "haddock")) "Node types that will be ignored by indentation.") (defvar haskell-ts-indent-rules (let* ((p-sib (lambda (node &optional arg) (let* ((func (if arg #'treesit-node-prev-sibling #'treesit-node-next-sibling)) (n (funcall func node))) (while (and n (string-match haskell-ts--ignore-types (treesit-node-type n))) (setq n (funcall func n))) n))) (p-prev-sib (lambda (node &optional _ _) (treesit-node-start (funcall p-sib node t))= )) (p-n-prev (lambda (node) (funcall p-sib node t))) (parent-first-child (lambda (_ parent _) (treesit-node-start (treesit-node-child parent 0))))) `((haskell ((node-is "^cpp$") column-0 0) ((parent-is "^comment$") column-0 0) ((parent-is "^haddock$") column-0 0) ((parent-is "^imports$") column-0 0) ;; Infix ((n-p-gp nil "infix" "infix") (lambda (_ node _) (let ((first-inf nil)) (while (string=3D "infix" (treesit-node-type (setq node (treesit-node-parent node)))) (setq first-inf node)) (funcall ,parent-first-child nil first-inf nil))) 0) ((node-is "^infix$") ,parent-first-child 0) ;; Lambda ((parent-is "^lambda\\(_case\\)?$") standalone-parent 2) ((parent-is "^class_declarations$") prev-sibling 0) ((node-is "^where$") parent 2) ;; in ((node-is "^in$") parent 0) ((parent-is "qualifiers") parent 0) ;; list ((node-is "^]$") parent 0) ((parent-is "^list$") standalone-parent 2) ;; If then else ((node-is "^then$") parent 2) ((node-is "^else$") parent 2) ((parent-is "^apply$") haskell-ts--stand-alone-parent 1) ((node-is "^quasiquote$") grand-parent 2) ((parent-is "^quasiquote_body$") (lambda (_ _ c) c) 0) ((lambda (node parent bol) (when-let ((n (treesit-node-prev-sibling node))) (while (string=3D "comment" (treesit-node-type n)) (setq n (treesit-node-prev-sibling n))) (string=3D "do" (treesit-node-type n)))) haskell-ts--stand-alone-parent 3) ((parent-is "^do$") ,p-prev-sib 0) ((parent-is "^alternatives$") ,p-prev-sib 0) ;; prev-adaptive-prefix is broken sometimes (no-node (lambda (_ _ _) (save-excursion (goto-char (line-beginning-position 0)) (back-to-indentation) (point))) 0) ((parent-is "^data_constructors$") parent 0) ;; where ((lambda (node _ _) (let ((n (treesit-node-prev-sibling node))) (while (string=3D "comment" (treesit-node-type n)) (setq n (treesit-node-prev-sibling n))) (string=3D "where" (treesit-node-type n)))) (lambda (_ b _) (+ 1 (treesit-node-start (treesit-node-prev-sibling b)))) 3) ((parent-is "local_binds\\|instance_declarations") ,p-prev-sib 0) ;; Match ((lambda (node _ _) (and (string=3D "match" (treesit-node-type node)) (string-match (regexp-opt '("patterns" "variable")) (treesit-node-type (funcall ,p-n-prev node))))) standalone-parent 2) ((node-is "match") ,p-prev-sib 0) ((parent-is "match") standalone-parent 2) ((parent-is "^haskell$") column-0 0) ((parent-is "^declarations$") column-0 0) ((parent-is "^record$") standalone-parent 2) ((parent-is "^exports$") (lambda (_ b _) (treesit-node-start (treesit-node-prev-sibling b))) 0) ((n-p-gp nil "signature" "foreign_import") grand-parent 3) ((parent-is "^case$") standalone-parent 4) ((node-is "^alternatives$") (lambda (_ b _) (treesit-node-start (treesit-node-child b 0))) 2) ((node-is "^comment$") (lambda (node parent _) (pcase node ;; (relevent means type not it haskell-ts--ignore-types) ;; 1. next relevent sibling if exists ((app ,p-sib (and (pred (not null)) n)) (treesit-node-start n)) ;; 2. previous relevent sibling if exists ((app ,p-prev-sib (and (pred (not null)) n)) n) ;; 3. parent (_ (treesit-node-start parent)))) 0) ;; Backup (catch-all parent 2)))) "\"Simple\" treesit indentation rules for haskell.") ;; Copied from haskell-tng-mode, changed a bit (defvar haskell-ts-mode-syntax-table (eval-when-compile (let ((table (make-syntax-table)) (syntax-list '(("_" ?! ?_) ("w" ?') ;; Haskell has some goofy comment enders like C-q C-l (">" 13 10 12 11) ("_ 123" ?-) ("(}1nb" ?\{) ("){4nb" ?\}) ("<" ?#) (">" ?\n) ;; Special operaters ("." ?\, ?\; ?@) ("\"" ?\") ("$`" ?\`)))) ;; The defaults are mostly fine (dolist (ls syntax-list table) (dolist (char (cdr ls)) (modify-syntax-entry char (car ls) table)))))) (defmacro haskell-ts-imenu-name-function (check-func) `(lambda (node) (let ((nn (treesit-node-child node 0 node))) (if (funcall ,check-func node) (if (string=3D (treesit-node-type nn) "infix") (treesit-node-text (treesit-node-child nn 1)) (haskell-ts-defun-name node)) nil)))) (defvar-keymap haskell-ts-mode-map :doc "Keymap for haskell-ts-mode." "C-c C-c" 'haskell-ts-compile-region-and-go "C-c C-r" 'run-haskell 'haskell-ts-indent-defun) ;;;###autoload (define-derived-mode haskell-ts-mode prog-mode "haskell ts mode" "Major mode for Haskell files using tree-sitter." (unless (treesit-ready-p 'haskell) (error "Tree-sitter for Haskell is not available")) (treesit-parser-create 'haskell) (setq-local treesit-defun-type-regexp "\\(?:\\(?:function\\|struct\\)_def= inition\\)") ;; Indent (when haskell-ts-use-indent (setq-local treesit-simple-indent-rules haskell-ts-indent-rules) (setq-local indent-tabs-mode nil)) ;; Comment (setq-local comment-start "-- ") (setq-local comment-use-syntax t) (setq-local comment-start-skip "\\(?: \\|^\\)-+") ;; Electric (setq-local electric-pair-pairs '((?` . ?`) (?\( . ?\)) (?{ . ?}) (?\" . ?\") (?\[ . ?\]))) ;; Navigation (setq-local treesit-defun-name-function 'haskell-ts-defun-name) (setq-local treesit-defun-type-regexp ;; Since haskell is strict functional, any 2nd level ;; entity is defintion (cons ".+" (lambda (node) (and (not (string-match haskell-ts--ignore-types (treesit-node-type= node))) (string=3D "declarations" (treesit-node-type (treesit-node-parent nod= e))))))) (setq-local prettify-symbols-alist haskell-ts-prettify-symbols-alist) ;; Imenu (setq-local treesit-simple-imenu-settings `((nil haskell-ts-imenu-func-node-p nil ,(haskell-ts-imenu-name-function #'haskell-ts-imenu-func-node-p)) ("Signatures.." haskell-ts-imenu-sig-node-p nil ,(haskell-ts-imenu-name-function #'haskell-ts-imenu-sig-node-p)) ("Data..." haskell-ts-imenu-data-type-p nil (lambda (node) (treesit-node-text (treesit-node-child node 1)))))) ;; font-lock (setq-local treesit-font-lock-level haskell-ts-font-lock-level) (setq-local treesit-font-lock-settings haskell-ts-font-lock) (setq-local treesit-font-lock-feature-list haskell-ts-font-lock-feature-list) (treesit-major-mode-setup)) (defun haskell-ts--fontify-arg (node &optional _ _ _) (if (string=3D "variable" (treesit-node-type node)) (put-text-property (treesit-node-start node) (treesit-node-end node) 'face font-lock-variable-name-face) (mapc 'haskell-ts--fontify-arg (treesit-node-children node)))) (defun haskell-ts--fontify-type (node &optional _ _ _) (let ((last-child (treesit-node-child node -1))) (if (string=3D (treesit-node-type last-child) "function") (haskell-ts--fontify-type last-child) (put-text-property (treesit-node-start last-child) (treesit-node-end last-child) 'face font-lock-variable-name-face)))) (defun haskell-ts-imenu-node-p (regex node) (and (string-match-p regex (treesit-node-type node)) (string=3D (treesit-node-type (treesit-node-parent node)) "declarati= ons"))) (defun haskell-ts-imenu-func-node-p (node) (haskell-ts-imenu-node-p "function\\|bind" node)) (defun haskell-ts-imenu-sig-node-p (node) (haskell-ts-imenu-node-p "signature" node)) (defun haskell-ts-imenu-data-type-p (node) (haskell-ts-imenu-node-p "data_type" node)) (defun haskell-ts-defun-name (node) (treesit-node-text (treesit-node-child node 0))) (defun haskell-ts-compile-region-and-go (start end) "Compile the text from START to END in the haskell proc." (interactive "r") (let ((hs (haskell-ts-haskell-session)) (str (buffer-substring-no-properties start end))) (comint-send-string hs ":{\n") (comint-send-string hs (replace-regexp-in-string "^:\\}" "\\:}" str nil t)) (comint-send-string hs "\n:}\n"))) (defun run-haskell () (interactive) (pop-to-buffer-same-window (if (comint-check-proc (concat "*" haskell-ts-ghci-buffer-name "*")) haskell-ts-ghci-buffer-name (make-comint haskell-ts-ghci-buffer-name haskell-ts-ghci nil buffer-fi= le-name)))) (defun haskell-ts-haskell-session () (get-buffer-process (concat "*" haskell-ts-ghci-buffer-name "*"))) (when (treesit-ready-p 'haskell) (add-to-list 'auto-mode-alist '("\\.hs\\'" . haskell-ts-mode))) (provide 'haskell-ts-mode) ;;; haskell-ts-mode.el ends here --=-=-= Content-Type: text/plain -- Pranshu Sharma <https://p.bauherren.ovh> --=-=-=--
Pranshu Sharma <pranshu@HIDDEN>
:bug-gnu-emacs@HIDDEN
.
Full text available.bug-gnu-emacs@HIDDEN
:bug#75184
; Package emacs
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.