From: John Wellesz <john.wellesz@gmail.com>
Date: Thu, 20 Nov 2025 20:50:54 +0000 (+0000)
Subject: runtime(php): Update indent script to 1.76 (from 1.75)
X-Git-Tag: v9.1.1923~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1288503aa0099ab36802312c6dcf3e87751797a;p=thirdparty%2Fvim.git

runtime(php): Update indent script to 1.76 (from 1.75)

fixes: #18739 (editor hang on mixed syntax style)
closes: #18758

Signed-off-by: John Wellesz <john.wellesz@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 377ffd5afb..89d4afa0d0 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -1,10 +1,9 @@
-" Vim indent file
 " Language:	PHP
 " Author:	John Wellesz <John.wellesz (AT) gmail (DOT) com>
 " URL:		https://www.2072productions.com/vim/indent/php.vim
 " Home:		https://github.com/2072/PHP-Indenting-for-VIm
-" Last Change:	2023 August 18th
-" Version:	1.75
+" Last Change:	2025 November 16th
+" Version:	1.76
 "
 "
 "	Type :help php-indent for available options
@@ -839,13 +838,15 @@ function! GetPhpIndent()
 
 		continue
 	    else
-		let isSingleLineBlock = 0
 
-		if getline(last_line_num) =~# '^\s*else\%(if\)\=\>'
+		if getline(last_line_num) =~# '^\s*else\%(if\)\=\>' && !isSingleLineBlock
 		    let last_line_num = FindTheIfOfAnElse(last_line_num, 0)
+		    let isSingleLineBlock = 0
 		    continue
 		endif
 
+		let isSingleLineBlock = 0
+
 
 		let last_match = last_line_num