colorer schemes v1.2.0.62

Author: ctapmex

colorer/configs/base/CHANGELOG.md

@@ -24,6 +24,10 @@
 - [smarty] fixed working with nested brackets
 - [smarty] literal block - text only
 - [shell-posix] fix variable assignments with line continuations
+- [shell-bash] fix indirect expansion+transformation
+- [shell-posix] fix unhighlighted areas after updating colorer from 1.3.3 to 1.4.0
+- [shell-bash] fix unhighlighted areas after updating colorer from 1.3.3 to 1.4.0
+- [dockerfile] fix unhighlighted areas after updating colorer from 1.3.3 to 1.4.0
 
 ### Changed
 - Simplified catalog.xml.
@@ -35,6 +39,9 @@
 - [groovy] add .gradle as groovy
 - Use the new shell-posix schema for shell scripts by default
 - [json] highlight JSON object keys
+- rename lib/default.hrc to lib/def.hrc
+- move 'default' type implementation from proto.hrc to base/default.hrc
+- [shell-posix] allow to include shell-posix scheme as subscheme enclosed in quotes
 
 ### Added
 - New package type of base - all packed. Hrc and hrd files in one archive. Directory 'auto' not in archive.
@@ -72,6 +79,7 @@
 - [hcl] add a new schema for HashiCorp HCL
 - [terraform] add a new schema for HashiCorp Terraform
 - [dockerfile] add a new schema for Dockerfile
+- [jenkinsfile] add a new schema for Jenkins configuration (Jenkinsfile)
 
 ## [1.2.0] - 2021-09-12
 

colorer/configs/base/hrc/base/default.hrc

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hrc PUBLIC "-//Cail Lomecb//DTD Colorer HRC take5//EN"
+  "http://colorer.sf.net/2003/hrc.dtd">
+<hrc version="take5" xmlns="http://colorer.sf.net/2003/hrc"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://colorer.sf.net/2003/hrc http://colorer.sf.net/2003/hrc.xsd">
+
+    <type name="default">
+        <scheme name='default' />
+    </type>
+    
+</hrc>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Copyright (C) 1999-2009 Cail Lomecb <irusskih at gmail dot com>.
+   - This program is free software; you can redistribute it and/or
+   - modify it under the terms of the GNU General Public License
+   - as published by the Free Software Foundation; either version 2
+   - of the License, or (at your option) any later version.
+   - This program is distributed in the hope that it will be useful,
+   - but WITHOUT ANY WARRANTY; without even the implied warranty of
+   - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   - GNU General Public License for more details.
+   - You should have received a copy of the GNU General Public License
+   - along with this program; If not, see <http://www.gnu.org/licenses/>.
+   - ***** END LICENSE BLOCK ***** -->

colorer/configs/base/hrc/lib/default.hrc colorer/configs/base/hrc/lib/def.hrccolorer/configs/base/hrc/lib/default.hrc renamed to colorer/configs/base/hrc/lib/def.hrc

@@ -277,4 +277,4 @@
    - GNU General Public License for more details.
    - You should have received a copy of the GNU General Public License
    - along with this program; If not, see <http://www.gnu.org/licenses/>.
-   - ***** END LICENSE BLOCK ***** -->
+   - ***** END LICENSE BLOCK ***** -->

colorer/configs/base/hrc/proto.hrc

@@ -223,7 +223,6 @@
         <filename>/\.groovy$/i</filename>
         <filename>/\.gdsl$/i</filename>
         <filename>/\.gradle$/i</filename>
-        <filename>/Jenkinsfile/i</filename>
         <firstline>/^import/</firstline>
         <firstline>/^#!groovy/</firstline>
         <parameters>
@@ -232,6 +231,17 @@
             <param name="spaces-as-errors" value="false" description="Shows trailing spaces as error" />
         </parameters>
     </prototype>
+    <prototype name="jenkinsfile" group="scripts" description="Jenkinsfile">
+        <location link="scripts/jenkinsfile.hrc"/>
+        <filename>/^Jenkins[Ff]ile\..+$/</filename>
+        <filename>/^.+\.Jenkins[Ff]ile/</filename>
+        <filename>/^Jenkins[Ff]ile$/</filename>
+        <filename>/\.gdsl$/i</filename>
+        <firstline weight='3'>/(^|\n)\s*pipeline\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*node\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*node\([^\)]\)\s+\{\s*$/</firstline>
+        <firstline weight='3'>/(^|\n)\s*import\s+org\.jenkinsci\./</firstline>
+    </prototype>
 
     <prototype name="rust" group="main" description="Rust">
         <location link="base/rust.hrc" />
@@ -638,13 +648,11 @@
         <filename>/\.(text|md|markdown)$/i</filename>
     </prototype>
     &scripts-colorer-protos;
-  &scripts-far-protos;
+    &scripts-far-protos;
     <prototype name="makefile" group="scripts" description="makefile">
         <location link="scripts/makefile.hrc" />
         <filename>/(makefile | tools\.ini) | \.(mak|gmk|ds(p|w)|bp(k|r|g))$/ix</filename>
         <filename weight='3'>/\.mk$/i</filename>
-        <!--firstline>/Microsoft Developer Studio Project File/i</firstline>
-    <firstline>/^\!if/i</firstline-->
         <firstline>/makefile/s</firstline>
         <parameters>
             <param name="gnu" value="false" description="use GNU make only" />
@@ -824,10 +832,10 @@
 
     <!--  rare languages  -->
     &rare-j2ee-protos;
-  &rare-gen-protos;
-  &rare-scripts-protos;
-  &rare-qrm-protos;
-  &rare-ie-weidu-protos;
+    &rare-gen-protos;
+    &rare-scripts-protos;
+    &rare-qrm-protos;
+    &rare-ie-weidu-protos;
     <prototype name="c1c" group="rare" description="1C">
         <location link="rare/1c.hrc" />
         <filename>/\.1c$/i</filename>
@@ -850,7 +858,7 @@
     </prototype>
 
     <!--  !! you may wish to swap next two types
-  because of collision with extensions  -->
+     because of collision with extensions  -->
     <prototype name="dssp" group="rare" description="Dssp">
         <location link="rare/dssp.hrc" />
         <filename>/\.dsp$/i</filename>
@@ -1087,6 +1095,7 @@
     </prototype>
 
     <prototype name="default" group="other" description="default type">
+        <location link="base/default.hrc" />
         <filename weight='1'>//</filename>
         <parameters>
             <!-- firstline -->
@@ -1095,15 +1104,10 @@
         </parameters>
     </prototype>
 
-    <type name="default">
-        <scheme name='default' />
-    </type>
-
-
     <!--  packages  -->
 
     <package name="def" description="core definitions">
-        <location link="lib/default.hrc" />
+        <location link="lib/def.hrc" />
     </package>
     <package name="uri" description="URI (RFC 2396)">
         <location link="lib/uri.hrc" />

colorer/configs/base/hrc/rare/json.hrc

@@ -145,6 +145,7 @@
 </hrc>
 <!-- ***** BEGIN LICENSE BLOCK *****
    - Copyright (C) 1999-2009 Cail Lomecb <irusskih at gmail dot com>.
+   - Copyright (C) Konstantin Kushnir <[email protected]>
    - This program is free software; you can redistribute it and/or
    - modify it under the terms of the GNU General Public License
    - as published by the Free Software Foundation; either version 2
@@ -155,4 +156,4 @@
    - GNU General Public License for more details.
    - You should have received a copy of the GNU General Public License
    - along with this program; If not, see <http://www.gnu.org/licenses/>.
-   - ***** END LICENSE BLOCK ***** -->
+   - ***** END LICENSE BLOCK ***** -->

colorer/configs/base/hrc/scripts/dockerfile.hrc

@@ -159,13 +159,13 @@
 
 <scheme name="string-array-body">
     <inherit scheme="escape_newline"/>
-    <block start="/(\[?#1|\s*(?{Symbol},)|^)\s*((&quot;))(.*&quot;)?=/" end="/(&quot;|$)\M(?{Symbol},)?/" scheme="string-with-var"
+    <block start="/(\[?#1|\s*(?{Symbol},)|^)\s*((&quot;))(.*&quot;)?=/" end="/(&quot;|$)\M,?/" scheme="string-with-var"
         region="String"
         region02="def:PairStart" region10="def:PairEnd"
         region03="Symbol"        region11="Symbol"/>
     <!-- skip some free space -->
     <regexp match="/\s+\M\]/"/>
-    <regexp match="/\s*,?\s*\M%escape;$/"/>
+    <regexp match="/\s*(?{Symbol},)?\s*\M%escape;$/"/>
     <!-- everything else except closing bracket is an error -->
     <block start="/(\])?!/" end="/\M(\]|$)/" scheme="def:empty" region="Error"/>
 </scheme>
@@ -422,7 +422,6 @@
 </hrc>
 
 <!-- ***** BEGIN LICENSE BLOCK *****
-   - Copyright (C) 1999-2009 Cail Lomecb <irusskih at gmail dot com>.
    - Copyright (C) Konstantin Kushnir <[email protected]>
    - This program is free software; you can redistribute it and/or
    - modify it under the terms of the GNU General Public License