From 6e4c7cd536731e9053e531b1ed6bd1ee93633645 Mon Sep 17 00:00:00 2001
From: Harald Lapp <harald@octris.org>
Date: Sat, 30 Nov 2013 00:23:59 +0100
Subject: [PATCH 1/2] prevent tab-triggers for snippets when in phpdoc scope

---
 Snippets/$GLOBALS[''].tmSnippet                    | 4 ++--
 Snippets/Constructor.tmSnippet                     | 2 +-
 Snippets/Heredoc.tmSnippet                         | 2 +-
 Snippets/class { }.tmSnippet                       | 2 +-
 Snippets/define( ).tmSnippet                       | 4 ++--
 Snippets/defined( ).tmSnippet                      | 4 ++--
 Snippets/do while( ).tmSnippet                     | 4 ++--
 Snippets/echo ___.tmSnippet                        | 4 ++--
 Snippets/else {}.tmSnippet                         | 4 ++--
 Snippets/elseif( ).tmSnippet                       | 4 ++--
 Snippets/for( ).tmSnippet                          | 4 ++--
 Snippets/foreach( ).tmSnippet                      | 4 ++--
 Snippets/function xx( ).tmSnippet                  | 4 ++--
 Snippets/if ?: a : b;.tmSnippet                    | 4 ++--
 Snippets/if( ) else( ).tmSnippet                   | 4 ++--
 Snippets/if( ).tmSnippet                           | 4 ++--
 Snippets/include( ).tmSnippet                      | 4 ++--
 Snippets/include_once( ).tmSnippet                 | 4 ++--
 Snippets/new array( ).tmSnippet                    | 4 ++--
 Snippets/require( ).tmSnippet                      | 4 ++--
 Snippets/require_once( ).tmSnippet                 | 4 ++--
 Snippets/return $retVal;.tmSnippet                 | 4 ++--
 Snippets/return FALSE;.tmSnippet                   | 4 ++--
 Snippets/return TRUE;.tmSnippet                    | 4 ++--
 Snippets/switch( ) case:.tmSnippet                 | 4 ++--
 Snippets/switch( ).tmSnippet                       | 4 ++--
 Snippets/throw.tmSnippet                           | 4 ++--
 Snippets/try { ___ } catch (___) { ___ }.tmSnippet | 4 ++--
 Snippets/while( ).tmSnippet                        | 4 ++--
 29 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/Snippets/$GLOBALS[''].tmSnippet b/Snippets/$GLOBALS[''].tmSnippet
index 652c8d3..7984dd6 100644
--- a/Snippets/$GLOBALS[''].tmSnippet
+++ b/Snippets/$GLOBALS[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>$GLOBALS['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>globals</string>
 	<key>uuid</key>
diff --git a/Snippets/Constructor.tmSnippet b/Snippets/Constructor.tmSnippet
index f31a8f6..9811fe9 100644
--- a/Snippets/Constructor.tmSnippet
+++ b/Snippets/Constructor.tmSnippet
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>function __construct</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>con</string>
 	<key>uuid</key>
diff --git a/Snippets/Heredoc.tmSnippet b/Snippets/Heredoc.tmSnippet
index b1d2d12..e3a142c 100644
--- a/Snippets/Heredoc.tmSnippet
+++ b/Snippets/Heredoc.tmSnippet
@@ -12,7 +12,7 @@ $1;
 	<key>scope</key>
 	<string>source.php</string>
 	<key>tabTrigger</key>
-	<string>&lt;&lt;&lt;</string>
+	<string>&lt;&lt;&lt; - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
 	<string>1634287E-035A-4617-9AD8-09133183F8FE</string>
 </dict>
diff --git a/Snippets/class { }.tmSnippet b/Snippets/class { }.tmSnippet
index 55ec65b..f8e3134 100644
--- a/Snippets/class { }.tmSnippet	
+++ b/Snippets/class { }.tmSnippet	
@@ -18,7 +18,7 @@ class ${2:ClassName}${3: extends ${4:AnotherClass}}
 	<key>name</key>
 	<string>class …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>class</string>
 	<key>uuid</key>
diff --git a/Snippets/define( ).tmSnippet b/Snippets/define( ).tmSnippet
index 5b9eddb..44e58a4 100644
--- a/Snippets/define( ).tmSnippet	
+++ b/Snippets/define( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -8,7 +8,7 @@ $0</string>
 	<key>name</key>
 	<string>define(…, …)</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>def</string>
 	<key>uuid</key>
diff --git a/Snippets/defined( ).tmSnippet b/Snippets/defined( ).tmSnippet
index 2f86ce7..59dfd7d 100644
--- a/Snippets/defined( ).tmSnippet	
+++ b/Snippets/defined( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>defined(…)</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>def?</string>
 	<key>uuid</key>
diff --git a/Snippets/do while( ).tmSnippet b/Snippets/do while( ).tmSnippet
index 500dafa..1ffe698 100644
--- a/Snippets/do while( ).tmSnippet	
+++ b/Snippets/do while( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>do … while …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>do</string>
 	<key>uuid</key>
diff --git a/Snippets/echo ___.tmSnippet b/Snippets/echo ___.tmSnippet
index 8140b8c..5819583 100644
--- a/Snippets/echo ___.tmSnippet	
+++ b/Snippets/echo ___.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>echo "…"</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>echo</string>
 	<key>uuid</key>
diff --git a/Snippets/else {}.tmSnippet b/Snippets/else {}.tmSnippet
index 8592032..9108c0a 100644
--- a/Snippets/else {}.tmSnippet	
+++ b/Snippets/else {}.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>else …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>else</string>
 	<key>uuid</key>
diff --git a/Snippets/elseif( ).tmSnippet b/Snippets/elseif( ).tmSnippet
index 1c35909..02f3436 100644
--- a/Snippets/elseif( ).tmSnippet	
+++ b/Snippets/elseif( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>elseif …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>elseif</string>
 	<key>uuid</key>
diff --git a/Snippets/for( ).tmSnippet b/Snippets/for( ).tmSnippet
index 3b5819f..f04890a 100644
--- a/Snippets/for( ).tmSnippet	
+++ b/Snippets/for( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>for …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>for</string>
 	<key>uuid</key>
diff --git a/Snippets/foreach( ).tmSnippet b/Snippets/foreach( ).tmSnippet
index a534e47..347392b 100644
--- a/Snippets/foreach( ).tmSnippet	
+++ b/Snippets/foreach( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>foreach …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>foreach</string>
 	<key>uuid</key>
diff --git a/Snippets/function xx( ).tmSnippet b/Snippets/function xx( ).tmSnippet
index 1a252be..796600c 100644
--- a/Snippets/function xx( ).tmSnippet	
+++ b/Snippets/function xx( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -10,7 +10,7 @@
 	<key>name</key>
 	<string>function …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>fun</string>
 	<key>uuid</key>
diff --git a/Snippets/if ?: a : b;.tmSnippet b/Snippets/if ?: a : b;.tmSnippet
index ee02e7c..125ee7f 100644
--- a/Snippets/if ?: a : b;.tmSnippet	
+++ b/Snippets/if ?: a : b;.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>scope</key>
 	<string>source.php</string>
 	<key>tabTrigger</key>
-	<string>if?</string>
+	<string>if? - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
 	<string>7720523B-8CCE-11D9-B507-000D93C8BE28</string>
 </dict>
diff --git a/Snippets/if( ) else( ).tmSnippet b/Snippets/if( ) else( ).tmSnippet
index 84fe39a..d66c56c 100644
--- a/Snippets/if( ) else( ).tmSnippet	
+++ b/Snippets/if( ) else( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -12,7 +12,7 @@ $0</string>
 	<key>name</key>
 	<string>if … else …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>ifelse</string>
 	<key>uuid</key>
diff --git a/Snippets/if( ).tmSnippet b/Snippets/if( ).tmSnippet
index f0137b4..6fe2b99 100644
--- a/Snippets/if( ).tmSnippet	
+++ b/Snippets/if( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>if …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>if</string>
 	<key>uuid</key>
diff --git a/Snippets/include( ).tmSnippet b/Snippets/include( ).tmSnippet
index eca78c0..40481e7 100644
--- a/Snippets/include( ).tmSnippet	
+++ b/Snippets/include( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>include …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>incl</string>
 	<key>uuid</key>
diff --git a/Snippets/include_once( ).tmSnippet b/Snippets/include_once( ).tmSnippet
index 142582a..1044524 100644
--- a/Snippets/include_once( ).tmSnippet	
+++ b/Snippets/include_once( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>include_once …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>incl1</string>
 	<key>uuid</key>
diff --git a/Snippets/new array( ).tmSnippet b/Snippets/new array( ).tmSnippet
index 95091d2..33cf61f 100644
--- a/Snippets/new array( ).tmSnippet	
+++ b/Snippets/new array( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>$… = array (…)</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>array</string>
 	<key>uuid</key>
diff --git a/Snippets/require( ).tmSnippet b/Snippets/require( ).tmSnippet
index 23a5c30..5f4c525 100644
--- a/Snippets/require( ).tmSnippet	
+++ b/Snippets/require( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>require …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>req</string>
 	<key>uuid</key>
diff --git a/Snippets/require_once( ).tmSnippet b/Snippets/require_once( ).tmSnippet
index 4ed0d18..ffa08db 100644
--- a/Snippets/require_once( ).tmSnippet	
+++ b/Snippets/require_once( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>require_once …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>req1</string>
 	<key>uuid</key>
diff --git a/Snippets/return $retVal;.tmSnippet b/Snippets/return $retVal;.tmSnippet
index 8588f02..8cb50a0 100644
--- a/Snippets/return $retVal;.tmSnippet	
+++ b/Snippets/return $retVal;.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>return</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>ret</string>
 	<key>uuid</key>
diff --git a/Snippets/return FALSE;.tmSnippet b/Snippets/return FALSE;.tmSnippet
index dfd2c15..108cea7 100644
--- a/Snippets/return FALSE;.tmSnippet	
+++ b/Snippets/return FALSE;.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>return false</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>ret0</string>
 	<key>uuid</key>
diff --git a/Snippets/return TRUE;.tmSnippet b/Snippets/return TRUE;.tmSnippet
index 8649c13..4b7f2e3 100644
--- a/Snippets/return TRUE;.tmSnippet	
+++ b/Snippets/return TRUE;.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>return true</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>ret1</string>
 	<key>uuid</key>
diff --git a/Snippets/switch( ) case:.tmSnippet b/Snippets/switch( ) case:.tmSnippet
index 7a40d93..995e285 100644
--- a/Snippets/switch( ) case:.tmSnippet	
+++ b/Snippets/switch( ) case:.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>case …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>case</string>
 	<key>uuid</key>
diff --git a/Snippets/switch( ).tmSnippet b/Snippets/switch( ).tmSnippet
index 61a5e01..dede613 100644
--- a/Snippets/switch( ).tmSnippet	
+++ b/Snippets/switch( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -15,7 +15,7 @@
 	<key>name</key>
 	<string>switch …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>switch</string>
 	<key>uuid</key>
diff --git a/Snippets/throw.tmSnippet b/Snippets/throw.tmSnippet
index ff6f8ed..a0f8582 100644
--- a/Snippets/throw.tmSnippet
+++ b/Snippets/throw.tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -10,7 +10,7 @@ $0</string>
 	<key>scope</key>
 	<string>source.php</string>
 	<key>tabTrigger</key>
-	<string>throw</string>
+	<string>throw - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
 	<string>FE39640E-A69C-48DF-9282-633672AAEFD2</string>
 </dict>
diff --git a/Snippets/try { ___ } catch (___) { ___ }.tmSnippet b/Snippets/try { ___ } catch (___) { ___ }.tmSnippet
index 07ccac7..3624565 100644
--- a/Snippets/try { ___ } catch (___) { ___ }.tmSnippet	
+++ b/Snippets/try { ___ } catch (___) { ___ }.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -15,7 +15,7 @@ ${TM_SELECTED_TEXT/([\t ]*).*/$1/m}}</string>
 	<key>scope</key>
 	<string>source.php</string>
 	<key>tabTrigger</key>
-	<string>try</string>
+	<string>try - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
 	<string>F7751DAF-AC95-4D47-955F-FE2534FDE4F5</string>
 </dict>
diff --git a/Snippets/while( ).tmSnippet b/Snippets/while( ).tmSnippet
index fcacfc8..756a692 100644
--- a/Snippets/while( ).tmSnippet	
+++ b/Snippets/while( ).tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>while …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>while</string>
 	<key>uuid</key>

From 10803a17df9d8406809488f5e7bdaf2e85cee936 Mon Sep 17 00:00:00 2001
From: Harald Lapp <h.lapp@clipdealer.de>
Date: Wed, 4 Dec 2013 15:15:03 +0100
Subject: [PATCH 2/2] excluded more snippets from
 comment.block.documentation.phpdoc.php scope

---
 Commands/Insert Call to Parent.tmCommand           | 14 +++++++++++---
 Snippets/$_COOKIE[''].tmSnippet                    |  4 ++--
 Snippets/$_ENV[''].tmSnippet                       |  4 ++--
 Snippets/$_FILES[''].tmSnippet                     |  4 ++--
 Snippets/$_GET[''].tmSnippet                       |  4 ++--
 Snippets/$_POST[''].tmSnippet                      |  4 ++--
 Snippets/$_REQUEST[''].tmSnippet                   |  4 ++--
 Snippets/$_SERVER[''].tmSnippet                    |  4 ++--
 Snippets/$_SESSION[''].tmSnippet                   |  4 ++--
 Snippets/<?php ?>.tmSnippet                        |  2 +-
 Snippets/<?php echo ___ ?>.tmSnippet               |  2 +-
 Snippets/<?php echo htmlentities(___) ?>.tmSnippet |  2 +-
 Snippets/<?php else: ?>.tmSnippet                  |  2 +-
 ...foreach (___) ___ <?php endforeach ?>.tmSnippet |  2 +-
 ... ___ <?php else ?> ___ <?php endif ?>.tmSnippet |  2 +-
 .../<?php if (___) ?> ___ <?php endif ?>.tmSnippet |  2 +-
 "Snippets/?>\342\200\246<?php.tmSnippet"           |  2 +-
 Snippets/Heredoc.tmSnippet                         |  2 +-
 Snippets/Include TextMate Support Script.tmSnippet |  4 ++--
 Snippets/if ?: a : b;.tmSnippet                    |  2 +-
 Snippets/throw.tmSnippet                           |  4 ++--
 Snippets/try { ___ } catch (___) { ___ }.tmSnippet |  4 ++--
 22 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Commands/Insert Call to Parent.tmCommand b/Commands/Insert Call to Parent.tmCommand
index bb80e8e..f5f78d5 100755
--- a/Commands/Insert Call to Parent.tmCommand	
+++ b/Commands/Insert Call to Parent.tmCommand	
@@ -104,15 +104,23 @@ for ($x = $functionToken + 1; $x &lt; $numTokens; $x++) {
 echo "parent::{$functionName}(" . implode(', ', $params) . ');$0';</string>
 	<key>input</key>
 	<string>document</string>
+	<key>inputFormat</key>
+	<string>text</string>
 	<key>name</key>
 	<string>Insert Call to Parent</string>
-	<key>output</key>
-	<string>insertAsSnippet</string>
+	<key>outputCaret</key>
+	<string>afterOutput</string>
+	<key>outputFormat</key>
+	<string>snippet</string>
+	<key>outputLocation</key>
+	<string>replaceSelection</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>parent</string>
 	<key>uuid</key>
 	<string>978B5E5E-F5C6-4FD8-B346-B0C85883D600</string>
+	<key>version</key>
+	<integer>2</integer>
 </dict>
 </plist>
diff --git a/Snippets/$_COOKIE[''].tmSnippet b/Snippets/$_COOKIE[''].tmSnippet
index d990917..acca6ef 100644
--- a/Snippets/$_COOKIE[''].tmSnippet
+++ b/Snippets/$_COOKIE[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>COOKIE['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_ENV[''].tmSnippet b/Snippets/$_ENV[''].tmSnippet
index ae2e47f..da0ea7e 100644
--- a/Snippets/$_ENV[''].tmSnippet
+++ b/Snippets/$_ENV[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>ENV['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_FILES[''].tmSnippet b/Snippets/$_FILES[''].tmSnippet
index 940cf08..71629f6 100644
--- a/Snippets/$_FILES[''].tmSnippet
+++ b/Snippets/$_FILES[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>FILES['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_GET[''].tmSnippet b/Snippets/$_GET[''].tmSnippet
index 6173b52..132c334 100644
--- a/Snippets/$_GET[''].tmSnippet
+++ b/Snippets/$_GET[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>GET['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_POST[''].tmSnippet b/Snippets/$_POST[''].tmSnippet
index a8bd5f0..7c63821 100644
--- a/Snippets/$_POST[''].tmSnippet
+++ b/Snippets/$_POST[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>POST['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_REQUEST[''].tmSnippet b/Snippets/$_REQUEST[''].tmSnippet
index 813310b..4935501 100644
--- a/Snippets/$_REQUEST[''].tmSnippet
+++ b/Snippets/$_REQUEST[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>REQUEST['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_SERVER[''].tmSnippet b/Snippets/$_SERVER[''].tmSnippet
index aa78862..c373d79 100644
--- a/Snippets/$_SERVER[''].tmSnippet
+++ b/Snippets/$_SERVER[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>SERVER['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/$_SESSION[''].tmSnippet b/Snippets/$_SESSION[''].tmSnippet
index c474c50..c68419d 100644
--- a/Snippets/$_SESSION[''].tmSnippet
+++ b/Snippets/$_SESSION[''].tmSnippet
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>SESSION['…']</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>$_</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php ?>.tmSnippet b/Snippets/<?php ?>.tmSnippet
index 42b8aac..90d379d 100644
--- a/Snippets/<?php ?>.tmSnippet	
+++ b/Snippets/<?php ?>.tmSnippet	
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>&lt;?php … ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>php</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php echo ___ ?>.tmSnippet b/Snippets/<?php echo ___ ?>.tmSnippet
index d243c3c..1603e00 100644
--- a/Snippets/<?php echo ___ ?>.tmSnippet	
+++ b/Snippets/<?php echo ___ ?>.tmSnippet	
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>&lt;?php echo … ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>echo</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php echo htmlentities(___) ?>.tmSnippet b/Snippets/<?php echo htmlentities(___) ?>.tmSnippet
index c074d8b..b6653d6 100644
--- a/Snippets/<?php echo htmlentities(___) ?>.tmSnippet	
+++ b/Snippets/<?php echo htmlentities(___) ?>.tmSnippet	
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>&lt;?php echo htmlentities(…) ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>echoh</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php else: ?>.tmSnippet b/Snippets/<?php else: ?>.tmSnippet
index c37f51b..df4e8c2 100644
--- a/Snippets/<?php else: ?>.tmSnippet	
+++ b/Snippets/<?php else: ?>.tmSnippet	
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>&lt;?php else: ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>else</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php foreach (___) ___ <?php endforeach ?>.tmSnippet b/Snippets/<?php foreach (___) ___ <?php endforeach ?>.tmSnippet
index fd6181f..7a9668e 100644
--- a/Snippets/<?php foreach (___) ___ <?php endforeach ?>.tmSnippet	
+++ b/Snippets/<?php foreach (___) ___ <?php endforeach ?>.tmSnippet	
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>&lt;?php foreach (…) … &lt;?php endforeach ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>foreach</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php if (___) ?> ___ <?php else ?> ___ <?php endif ?>.tmSnippet b/Snippets/<?php if (___) ?> ___ <?php else ?> ___ <?php endif ?>.tmSnippet
index dd777f3..81b319a 100644
--- a/Snippets/<?php if (___) ?> ___ <?php else ?> ___ <?php endif ?>.tmSnippet	
+++ b/Snippets/<?php if (___) ?> ___ <?php else ?> ___ <?php endif ?>.tmSnippet	
@@ -11,7 +11,7 @@
 	<key>name</key>
 	<string>&lt;?php if (…) ?&gt; … &lt;?php else ?&gt; … &lt;?php endif ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>ifelse</string>
 	<key>uuid</key>
diff --git a/Snippets/<?php if (___) ?> ___ <?php endif ?>.tmSnippet b/Snippets/<?php if (___) ?> ___ <?php endif ?>.tmSnippet
index 4a2d0a6..b26aaa7 100644
--- a/Snippets/<?php if (___) ?> ___ <?php endif ?>.tmSnippet	
+++ b/Snippets/<?php if (___) ?> ___ <?php endif ?>.tmSnippet	
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>&lt;?php if (…) ?&gt; … &lt;?php endif ?&gt;</string>
 	<key>scope</key>
-	<string>text.html.php</string>
+	<string>text.html.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>if</string>
 	<key>uuid</key>
diff --git "a/Snippets/?>\342\200\246<?php.tmSnippet" "b/Snippets/?>\342\200\246<?php.tmSnippet"
index daabf39..2be3909 100644
--- "a/Snippets/?>\342\200\246<?php.tmSnippet"
+++ "b/Snippets/?>\342\200\246<?php.tmSnippet"
@@ -9,7 +9,7 @@
 	<key>name</key>
 	<string>?&gt;…&lt;?php</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>php</string>
 	<key>uuid</key>
diff --git a/Snippets/Heredoc.tmSnippet b/Snippets/Heredoc.tmSnippet
index e3a142c..ad9fbaa 100644
--- a/Snippets/Heredoc.tmSnippet
+++ b/Snippets/Heredoc.tmSnippet
@@ -10,7 +10,7 @@ $1;
 	<key>name</key>
 	<string>Heredoc</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>&lt;&lt;&lt; - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
diff --git a/Snippets/Include TextMate Support Script.tmSnippet b/Snippets/Include TextMate Support Script.tmSnippet
index c86b5fd..f5a6b28 100644
--- a/Snippets/Include TextMate Support Script.tmSnippet	
+++ b/Snippets/Include TextMate Support Script.tmSnippet	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
@@ -16,7 +16,7 @@ fi`
 	<key>name</key>
 	<string>Include TextMate Support Script</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>tmphp</string>
 	<key>uuid</key>
diff --git a/Snippets/if ?: a : b;.tmSnippet b/Snippets/if ?: a : b;.tmSnippet
index 125ee7f..de4fcc3 100644
--- a/Snippets/if ?: a : b;.tmSnippet	
+++ b/Snippets/if ?: a : b;.tmSnippet	
@@ -7,7 +7,7 @@
 	<key>name</key>
 	<string>$… = ( … ) ? … : …</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
 	<string>if? - comment.block.documentation.phpdoc.php</string>
 	<key>uuid</key>
diff --git a/Snippets/throw.tmSnippet b/Snippets/throw.tmSnippet
index a0f8582..c4163d2 100644
--- a/Snippets/throw.tmSnippet
+++ b/Snippets/throw.tmSnippet
@@ -8,9 +8,9 @@ $0</string>
 	<key>name</key>
 	<string>Throw Exception</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
-	<string>throw - comment.block.documentation.phpdoc.php</string>
+	<string>throw</string>
 	<key>uuid</key>
 	<string>FE39640E-A69C-48DF-9282-633672AAEFD2</string>
 </dict>
diff --git a/Snippets/try { ___ } catch (___) { ___ }.tmSnippet b/Snippets/try { ___ } catch (___) { ___ }.tmSnippet
index 3624565..8fb5fce 100644
--- a/Snippets/try { ___ } catch (___) { ___ }.tmSnippet	
+++ b/Snippets/try { ___ } catch (___) { ___ }.tmSnippet	
@@ -13,9 +13,9 @@ ${TM_SELECTED_TEXT/([\t ]*).*/$1/m}}</string>
 	<key>name</key>
 	<string>Wrap in try { … } catch (…) { … }</string>
 	<key>scope</key>
-	<string>source.php</string>
+	<string>source.php - comment.block.documentation.phpdoc.php</string>
 	<key>tabTrigger</key>
-	<string>try - comment.block.documentation.phpdoc.php</string>
+	<string>try</string>
 	<key>uuid</key>
 	<string>F7751DAF-AC95-4D47-955F-FE2534FDE4F5</string>
 </dict>