From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec Newsgroups: gmane.emacs.bugs Subject: bug#44592: In sh-script-mode, should the syntax of . and / be made symbol? Date: Sat, 28 Aug 2021 11:44:59 +0200 Message-ID: <87zgt1ucmc.fsf@gmail.com> References: <87eekvyjku.fsf@gnus.org> <87pn30kvo7.fsf@gnus.org> <87fsuun7bj.fsf@gnus.org> 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="10076"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Dario Gjorgjevski , Stefan Monnier , 44592@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Aug 28 11:46:11 2021 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 1mJuuh-0002Lv-Iz for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 28 Aug 2021 11:46:11 +0200 Original-Received: from localhost ([::1]:42172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mJuuf-00078r-ER for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 28 Aug 2021 05:46:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJuuY-00078C-IW for bug-gnu-emacs@gnu.org; Sat, 28 Aug 2021 05:46:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mJuuY-00076Q-9z for bug-gnu-emacs@gnu.org; Sat, 28 Aug 2021 05:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mJuuY-0001Iw-8f for bug-gnu-emacs@gnu.org; Sat, 28 Aug 2021 05:46:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: =?UTF-8?Q?K=C3=A9vin?= Le Gouguec Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 28 Aug 2021 09:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44592 X-GNU-PR-Package: emacs Original-Received: via spool by 44592-submit@debbugs.gnu.org id=B44592.16301439094943 (code B ref 44592); Sat, 28 Aug 2021 09:46:02 +0000 Original-Received: (at 44592) by debbugs.gnu.org; 28 Aug 2021 09:45:09 +0000 Original-Received: from localhost ([127.0.0.1]:53418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJuth-0001Hf-8k for submit@debbugs.gnu.org; Sat, 28 Aug 2021 05:45:09 -0400 Original-Received: from mail-wr1-f43.google.com ([209.85.221.43]:46913) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mJute-0001Gu-UR for 44592@debbugs.gnu.org; Sat, 28 Aug 2021 05:45:07 -0400 Original-Received: by mail-wr1-f43.google.com with SMTP id x6so5980592wrv.13 for <44592@debbugs.gnu.org>; Sat, 28 Aug 2021 02:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=kHnERJnyAimMKS0N0EaJ5qEzR5byr69Dp0zTpF0Fx0M=; b=uYpK9Js8o9omz6MNFuXllqWbMZdqCSdh4ijrVTxcBL+w4h4ok17EAvJGM0bWfEMNUq MBR0+HtT4A9gSWF70dGOWs2lyu6Bi5Duto+MmAUV9I2xdOuAwPhU1lNSldD8L7gHJAlX CFo6LoPvPpwlS0+NZ1QxnI5lSv+sfHHXDcsD0Z3ihGoGs2wt967u7+CJgFMMUTxBQVn8 JjpXUdBun+e6/ZXYEhPZ5KsLG1jKaYtHhUWE9po1FEGB2Scq/BKamPzXA5CD+U09SyTO JvX945R02PKBlCSLy/uAWFWiNGd0npGdHJo1QRomZtUesU9AqjQeNOGF7AOrGdNQVJaz 8AHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=kHnERJnyAimMKS0N0EaJ5qEzR5byr69Dp0zTpF0Fx0M=; b=MrukjT3kPGImY6khXfEGwalVS5qiLyf7fqvA6kFT30QdND1+YrOID8XylZVFRim6bL q0F60X1sdriAbD2PsJAHhOdOVUhLRWmEWeHWvD6EG0rnI3wg06eesa2LQI+Fz+BLyDaZ mLfrgu3JjXZYRus936MOaArFe3biWwVsBBjw02ZLSUHynPiao67CmU1qzbOhUPbIWzuf 9qS+V/3JOFIUDmu08aUTzzdq8ysNXZMlmcJobRcsK4kKlN0wWK/J5RoIp0F1ti0bCp1z 1efNhA7YEAPdiqsc68GFFLu7dvruziuiuXBouddMOoKBbKpqkae2ELrDPYJL/AtEBssb TMUA== X-Gm-Message-State: AOAM531hxem0HyvM3EiIN1N23d1HH2wXSBUU/SNGJ1/1GEWCTKpNE9y0 Is6wOWWGcEZtIG4/fuNQrvK0Oo9Ph2E= X-Google-Smtp-Source: ABdhPJzQn55IQzEdl62yuvyfqZ/5CRLK20cSyL7LbCk8eHnz5deCLZUZDK5fc2UZ1+lmwHBOKi37tA== X-Received: by 2002:a5d:47cd:: with SMTP id o13mr15524569wrc.246.1630143900821; Sat, 28 Aug 2021 02:45:00 -0700 (PDT) Original-Received: from amdahl30 ([2a01:e0a:20e:d340:2ef0:5dff:fed2:7b49]) by smtp.gmail.com with ESMTPSA id p1sm668894wmp.12.2021.08.28.02.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Aug 2021 02:44:59 -0700 (PDT) In-Reply-To: <87fsuun7bj.fsf@gnus.org> (Lars Ingebrigtsen's message of "Fri, 27 Aug 2021 19:09:04 +0200") 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" Xref: news.gmane.io gmane.emacs.bugs:212863 Archived-At: --=-=-= Content-Type: text/plain Lars Ingebrigtsen writes: > I've now applied Dario's change to Emacs 28 (and added a test case). I wonder, would it make sense to also add ){ and (} to handle cases with ${braces}? E.g. I'd like this indentation: ${path_to_root}/configure --prefix=$prefix\ --with-x but right now (55e77a811) I am getting this: ${path_to_root}/configure --prefix=$prefix\ --with-x I'm don't know all that much about syntax classes and SMIE; still, here's a "monkey see; monkey do" patch that works for me: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=further.patch diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 201d1fd164..2d095c2a13 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1775,7 +1775,7 @@ sh-smie--default-backward-token (goto-char p) nil)))) (while - (progn (skip-syntax-backward ".w_'") + (progn (skip-syntax-backward ".w_'){(}") (or (not (zerop (skip-syntax-backward "\\"))) (when (eq ?\\ (char-before (1- (point)))) (let ((p (point))) diff --git a/test/lisp/progmodes/sh-script-tests.el b/test/lisp/progmodes/sh-script-tests.el index 5bdce6260a..82c2d5168c 100644 --- a/test/lisp/progmodes/sh-script-tests.el +++ b/test/lisp/progmodes/sh-script-tests.el @@ -35,6 +35,17 @@ test-sh-script-indentation (should (equal (buffer-substring-no-properties (point-min) (point-max)) "relative-path/to/configure --prefix=$prefix\\ - --with-x")))) + --with-x"))) + (with-temp-buffer + (insert "${path_to_root}/configure --prefix=$prefix\\ + --with-x") + (shell-script-mode) + (goto-char (point-min)) + (forward-line 1) + (indent-for-tab-command) + (should (equal + (buffer-substring-no-properties (point-min) (point-max)) + "${path_to_root}/configure --prefix=$prefix\\ + --with-x")))) ;;; sh-script-tests.el ends here --=-=-=--