From 7fbdb31deeaeeca530ef09fbd22080e955b95992 Mon Sep 17 00:00:00 2001 From: Stanislav Golovin Date: Mon, 2 Nov 2015 13:52:42 -0500 Subject: [PATCH] Add back-quoted string support for javascript Closes #1084, Fixes: #1055 --- PowerEditor/installer/themes/Bespin.xml | 1 + PowerEditor/installer/themes/Black board.xml | 1 + PowerEditor/installer/themes/Choco.xml | 1 + PowerEditor/installer/themes/Deep Black.xml | 1 + PowerEditor/installer/themes/Hello Kitty.xml | 1 + PowerEditor/installer/themes/HotFudgeSundae.xml | 1 + PowerEditor/installer/themes/Mono Industrial.xml | 1 + PowerEditor/installer/themes/Monokai.xml | 1 + PowerEditor/installer/themes/MossyLawn.xml | 1 + PowerEditor/installer/themes/Navajo.xml | 1 + PowerEditor/installer/themes/Obsidian.xml | 1 + PowerEditor/installer/themes/Plastic Code Wrap.xml | 1 + PowerEditor/installer/themes/Ruby Blue.xml | 1 + PowerEditor/installer/themes/Solarized-light.xml | 1 + PowerEditor/installer/themes/Solarized.xml | 1 + PowerEditor/installer/themes/Twilight.xml | 1 + PowerEditor/installer/themes/Vibrant Ink.xml | 1 + PowerEditor/installer/themes/Zenburn.xml | 1 + PowerEditor/installer/themes/khaki.xml | 1 + PowerEditor/installer/themes/vim Dark Blue.xml | 1 + PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp | 1 + PowerEditor/src/stylers.model.xml | 2 ++ 22 files changed, 23 insertions(+) diff --git a/PowerEditor/installer/themes/Bespin.xml b/PowerEditor/installer/themes/Bespin.xml index 8bdb92fb5..58d293057 100644 --- a/PowerEditor/installer/themes/Bespin.xml +++ b/PowerEditor/installer/themes/Bespin.xml @@ -214,6 +214,7 @@ Credits: alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug + diff --git a/PowerEditor/installer/themes/Black board.xml b/PowerEditor/installer/themes/Black board.xml index 3bcfb6134..533856ab0 100644 --- a/PowerEditor/installer/themes/Black board.xml +++ b/PowerEditor/installer/themes/Black board.xml @@ -214,6 +214,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/Choco.xml b/PowerEditor/installer/themes/Choco.xml index dba942ce0..1cb65cb4b 100644 --- a/PowerEditor/installer/themes/Choco.xml +++ b/PowerEditor/installer/themes/Choco.xml @@ -214,6 +214,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/Deep Black.xml b/PowerEditor/installer/themes/Deep Black.xml index d986aeac2..e22b3e053 100644 --- a/PowerEditor/installer/themes/Deep Black.xml +++ b/PowerEditor/installer/themes/Deep Black.xml @@ -185,6 +185,7 @@ http://sourceforge.net/donate/index.php?group_id=95717 + diff --git a/PowerEditor/installer/themes/Hello Kitty.xml b/PowerEditor/installer/themes/Hello Kitty.xml index 99a068551..525f2f73e 100644 --- a/PowerEditor/installer/themes/Hello Kitty.xml +++ b/PowerEditor/installer/themes/Hello Kitty.xml @@ -323,6 +323,7 @@ so your enhanced file can be included in Notepad++ future release. + diff --git a/PowerEditor/installer/themes/HotFudgeSundae.xml b/PowerEditor/installer/themes/HotFudgeSundae.xml index 97879d58e..940615920 100644 --- a/PowerEditor/installer/themes/HotFudgeSundae.xml +++ b/PowerEditor/installer/themes/HotFudgeSundae.xml @@ -423,6 +423,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Mono Industrial.xml b/PowerEditor/installer/themes/Mono Industrial.xml index c791574bf..0f8aa5471 100644 --- a/PowerEditor/installer/themes/Mono Industrial.xml +++ b/PowerEditor/installer/themes/Mono Industrial.xml @@ -214,6 +214,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/Monokai.xml b/PowerEditor/installer/themes/Monokai.xml index d8f263b29..ae09bdc75 100644 --- a/PowerEditor/installer/themes/Monokai.xml +++ b/PowerEditor/installer/themes/Monokai.xml @@ -214,6 +214,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/MossyLawn.xml b/PowerEditor/installer/themes/MossyLawn.xml index 6a996d34c..75aebfb1d 100644 --- a/PowerEditor/installer/themes/MossyLawn.xml +++ b/PowerEditor/installer/themes/MossyLawn.xml @@ -424,6 +424,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Navajo.xml b/PowerEditor/installer/themes/Navajo.xml index 80022fd70..8bc229b25 100644 --- a/PowerEditor/installer/themes/Navajo.xml +++ b/PowerEditor/installer/themes/Navajo.xml @@ -421,6 +421,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Obsidian.xml b/PowerEditor/installer/themes/Obsidian.xml index a3c5fb4cf..26f76c334 100644 --- a/PowerEditor/installer/themes/Obsidian.xml +++ b/PowerEditor/installer/themes/Obsidian.xml @@ -327,6 +327,7 @@ Notepad++ Custom Style + diff --git a/PowerEditor/installer/themes/Plastic Code Wrap.xml b/PowerEditor/installer/themes/Plastic Code Wrap.xml index 7d8de25cc..5ea305274 100644 --- a/PowerEditor/installer/themes/Plastic Code Wrap.xml +++ b/PowerEditor/installer/themes/Plastic Code Wrap.xml @@ -214,6 +214,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/Ruby Blue.xml b/PowerEditor/installer/themes/Ruby Blue.xml index 0643aed29..e87026f5a 100644 --- a/PowerEditor/installer/themes/Ruby Blue.xml +++ b/PowerEditor/installer/themes/Ruby Blue.xml @@ -208,6 +208,7 @@ http://sourceforge.net/donate/index.php?group_id=95717 + diff --git a/PowerEditor/installer/themes/Solarized-light.xml b/PowerEditor/installer/themes/Solarized-light.xml index 63472058b..95de4ac81 100644 --- a/PowerEditor/installer/themes/Solarized-light.xml +++ b/PowerEditor/installer/themes/Solarized-light.xml @@ -432,6 +432,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Solarized.xml b/PowerEditor/installer/themes/Solarized.xml index 85b97f63a..66555b935 100644 --- a/PowerEditor/installer/themes/Solarized.xml +++ b/PowerEditor/installer/themes/Solarized.xml @@ -432,6 +432,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/Twilight.xml b/PowerEditor/installer/themes/Twilight.xml index f65672b1a..b45dc00d7 100644 --- a/PowerEditor/installer/themes/Twilight.xml +++ b/PowerEditor/installer/themes/Twilight.xml @@ -215,6 +215,7 @@ Credits: + diff --git a/PowerEditor/installer/themes/Vibrant Ink.xml b/PowerEditor/installer/themes/Vibrant Ink.xml index ac14bd398..ceebf2588 100644 --- a/PowerEditor/installer/themes/Vibrant Ink.xml +++ b/PowerEditor/installer/themes/Vibrant Ink.xml @@ -190,6 +190,7 @@ http://sourceforge.net/donate/index.php?group_id=95717 + diff --git a/PowerEditor/installer/themes/Zenburn.xml b/PowerEditor/installer/themes/Zenburn.xml index a937b3f5e..6003a17c1 100644 --- a/PowerEditor/installer/themes/Zenburn.xml +++ b/PowerEditor/installer/themes/Zenburn.xml @@ -393,6 +393,7 @@ License: Feel free to modify this style and re-release it. This styl + diff --git a/PowerEditor/installer/themes/khaki.xml b/PowerEditor/installer/themes/khaki.xml index 26d449389..fca4d4164 100644 --- a/PowerEditor/installer/themes/khaki.xml +++ b/PowerEditor/installer/themes/khaki.xml @@ -421,6 +421,7 @@ Installation: + diff --git a/PowerEditor/installer/themes/vim Dark Blue.xml b/PowerEditor/installer/themes/vim Dark Blue.xml index 10a92b38b..d02864acf 100644 --- a/PowerEditor/installer/themes/vim Dark Blue.xml +++ b/PowerEditor/installer/themes/vim Dark Blue.xml @@ -320,6 +320,7 @@ + diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index bdcca2776..57603d7f5 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -984,6 +984,7 @@ void ScintillaEditView::setJsLexer() // Disable track preprocessor to avoid incorrect detection. // In the most of cases, the symbols are defined outside of file. execute(SCI_SETPROPERTY, reinterpret_cast("lexer.cpp.track.preprocessor"), reinterpret_cast("0")); + execute(SCI_SETPROPERTY, reinterpret_cast("lexer.cpp.backquoted.strings"), reinterpret_cast("1")); } void ScintillaEditView::setTclLexer() diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml index 1637dec68..7b2e236ef 100644 --- a/PowerEditor/src/stylers.model.xml +++ b/PowerEditor/src/stylers.model.xml @@ -387,6 +387,7 @@ + @@ -400,6 +401,7 @@ +