summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2017-01-29 14:43:59 +0000
committerMaxime Coste <mawww@kakoune.org>2017-01-29 14:43:59 +0000
commite2d24701fa04dbda3c80b8b4c649877769cfe58f (patch)
treecac282b4165cdb2207382429a0ee454085d1c030
parent0051a4f89670746c09db10f5d5839a77214e9fce (diff)
parentee9482d90defb7a11badf3000f1243db82779d3e (diff)
Merge remote-tracking branch '4d47/php-comments'
-rw-r--r--rc/core/comment.kak2
-rw-r--r--rc/extra/php.kak3
2 files changed, 3 insertions, 2 deletions
diff --git a/rc/core/comment.kak b/rc/core/comment.kak
index c536ece3..24920501 100644
--- a/rc/core/comment.kak
+++ b/rc/core/comment.kak
@@ -9,7 +9,7 @@ hook global BufSetOption filetype=asciidoc %{
set buffer comment_block '///:///'
}
-hook global BufSetOption filetype=(c|cpp|go|java|javascript|objc|sass|scala|scss|swift) %{
+hook global BufSetOption filetype=(c|cpp|go|java|javascript|objc|php|sass|scala|scss|swift) %{
set buffer comment_line '//'
set buffer comment_block '/*:*/'
}
diff --git a/rc/extra/php.kak b/rc/extra/php.kak
index 563ccf98..7889c2a5 100644
--- a/rc/extra/php.kak
+++ b/rc/extra/php.kak
@@ -12,7 +12,8 @@ add-highlighter -group / regions -default code php \
double_string '"' (?<!\\)(\\\\)*" '' \
single_string "'" (?<!\\)(\\\\)*' '' \
comment // '$' '' \
- comment /\* \*/ ''
+ comment /\* \*/ '' \
+ comment '#' '$' ''
add-highlighter -group /php/double_string fill string
add-highlighter -group /php/single_string fill string