[geany/geany] c1aba3: Handle PHPSCRIPT like HTML but for markup cases

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 15 May 2014 14:37:22 UTC
Commit:      c1aba3862d6c0b240c67b028779af04e8d7c84be
             https://github.com/geany/geany/commit/c1aba3862d6c0b240c67b028779af04e8d7c84be

Log Message:
-----------
Handle PHPSCRIPT like HTML but for markup cases


Modified Paths:
--------------
    src/editor.c
    src/highlighting.c

Modified: src/editor.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -1252,6 +1252,7 @@ static gboolean lexer_has_braces(ScintillaObject *sci)
 		case SCLEX_CPP:
 		case SCLEX_D:
 		case SCLEX_HTML:	/* for PHP & JS */
+		case SCLEX_PHPSCRIPT:
 		case SCLEX_PASCAL:	/* for multiline comments? */
 		case SCLEX_BASH:
 		case SCLEX_PERL:
@@ -2878,6 +2879,7 @@ static gint get_multiline_comment_style(GeanyEditor *editor, gint line_start)
 	{
 		case SCLEX_XML:
 		case SCLEX_HTML:
+		case SCLEX_PHPSCRIPT:
 		{
 			if (is_style_php(sci_get_style_at(editor->sci, line_start)))
 				style_comment = SCE_HPHP_COMMENT;
@@ -3415,6 +3417,7 @@ static gboolean in_block_comment(gint lexer, gint style)
 				style == SCE_D_COMMENTNESTED);
 
 		case SCLEX_HTML:
+		case SCLEX_PHPSCRIPT:
 			return (style == SCE_HPHP_COMMENT);
 
 		case SCLEX_CSS:
@@ -4952,6 +4955,7 @@ void editor_set_indentation_guides(GeanyEditor *editor)
 		/* C-like (structured) languages benefit from the "look both" method */
 		case SCLEX_CPP:
 		case SCLEX_HTML:
+		case SCLEX_PHPSCRIPT:
 		case SCLEX_XML:
 		case SCLEX_PERL:
 		case SCLEX_LATEX:


Modified: src/highlighting.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -1497,6 +1497,7 @@ gboolean highlighting_is_string_style(gint lexer, gint style)
 
 		case SCLEX_XML:
 		case SCLEX_HTML:
+		case SCLEX_PHPSCRIPT:
 			return (
 				style == SCE_HBA_STRING ||
 				style == SCE_HBA_STRINGEOL ||
@@ -1669,6 +1670,7 @@ gboolean highlighting_is_comment_style(gint lexer, gint style)
 
 		case SCLEX_XML:
 		case SCLEX_HTML:
+		case SCLEX_PHPSCRIPT:
 			return (
 				style == SCE_HBA_COMMENTLINE ||
 				style == SCE_HB_COMMENTLINE ||



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).