[PHP] Suppress method completions when typing php tags (#3237)

* [PHP] Suppress method completions when typing php tags Resolves https://github.com/sublimehq/sublime_text/issues/5256 The fix consists of two parts: 1. Extending the completion's selector by - punctuation.section.embedded.begin 2. Making sure to highlight incomplete <?php tags punctuation.section.embedded.begin Note: If this isn't acceptable we might want to scope incomplete tags using a `meta` scope and add this to the selector (1.) as well. We just need to ensure ST sees the correct scope while typing the opening php tag in order to not add those methods to the list of available completions. * [PHP] Fix php snippet This commit makes sure to correctly complete the `<?php | ?>` snippet depending on whether `php` or `<?php` was entered. In the latter case we might want to apply `php (begin tag)` snippet which doesn't add a second `<?`. Before this commit: <?ph| => <?<?php | ?> With this commit: <?ph| => <?php | ?> * [PHP] Use separate patterns for incomplete php tags Keep scoping to suppress completions while not pushing/popping contexts until tag is complete. May help to prevent some false positives or confusion about non-running but highlighted code.
sublimehq · Feb 15, 2022 · 1f94fc2 · 1f94fc2
1 parent 346258e
commit 1f94fc2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/PHP/PHP Source.sublime-syntax b/PHP/PHP Source.sublime-syntax
@@ -120,6 +120,8 @@ contexts:
       push:
         - meta_scope: embedding.php text.html.basic
         - clear_scopes: true
+        - match: <\?(?i:(?!php)ph?)
+          scope: meta.embedded.block.php punctuation.section.embedded.begin.php
         - match: <\?(?i:php)?
           scope: meta.embedded.block.php punctuation.section.embedded.begin.php
           pop: 1
@@ -131,6 +133,8 @@ contexts:
           push: scope:text.html.basic
 
   single-line-php-tag:
+    - match: <\?(?i:(?!php)ph?)
+      scope: meta.embedded.block.php punctuation.section.embedded.begin.php
     - match: (?:<\?=|<\?(?i:php)?(?=.*\?>))
       scope: punctuation.section.embedded.begin.php
       push:

diff --git a/PHP/PHP.sublime-completions b/PHP/PHP.sublime-completions
@@ -1,5 +1,5 @@
 {
-	"scope": "source.php - string - comment - variable.other.php - meta.embedded.html",
+	"scope": "source.php - string - comment - variable.other.php - meta.embedded.html - punctuation.section.embedded.begin.php",
 	"completions":
 	[
 		"php",

diff --git a/PHP/PHP.sublime-syntax b/PHP/PHP.sublime-syntax
@@ -32,6 +32,8 @@ contexts:
     - match: ''
       set: scope:text.html.basic
       with_prototype:
+        - match: <\?(?i:(?!php)ph?)
+          scope: meta.embedded.block.php punctuation.section.embedded.begin.php
         - match: <\?(?i:php|=)?(?![^?]*\?>)
           scope: punctuation.section.embedded.begin.php
           push:

diff --git a/PHP/Snippets/php (begin tag).sublime-snippet b/PHP/Snippets/php (begin tag).sublime-snippet
@@ -0,0 +1,6 @@
+<snippet>
+	<content><![CDATA[${TM_PHP_OPEN_TAG:php} $0 ?>]]></content>
+	<tabTrigger>php</tabTrigger>
+	<scope>embedding.php text.html punctuation.section.embedded.begin.php</scope>
+	<description>&lt;?php … ?&gt;</description>
+</snippet>
diff --git a/PHP/Snippets/php.sublime-snippet b/PHP/Snippets/php.sublime-snippet
@@ -1,6 +1,6 @@
 <snippet>
 	<content><![CDATA[<?${TM_PHP_OPEN_TAG:php} $0 ?>]]></content>
 	<tabTrigger>php</tabTrigger>
-	<scope>embedding.php text.html - source.php</scope>
+	<scope>embedding.php text.html - source.php - punctuation.section.embedded.begin.php</scope>
 	<description>&lt;?php … ?&gt;</description>
 </snippet>