Changeset 1162384

Timestamp:

05/18/2015 01:23:55 AM (11 years ago)

Author:

knarfalingus

Message:

Added support for Typescript 1.5, licensing updates.

Location:

syntax-highlighter-evolved-typescript/trunk

Files:

• license.txt (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• shBrushTScript.js (modified) (2 diffs)
• syntaxhighlighter_typescript.php (modified) (2 diffs)

syntax-highlighter-evolved-typescript/trunk/license.txt

@@ -2 +2 @@
 by Knarfalingus (https://www.knarfalingus.com/)
 
-Copyright 2014 by Knarfalingus
+-=-=-=-=   GPL License -=-=-=-=
+
+Copyright 2014-2015 by Knarfalingus
 
 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
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
@@ -694 +696 @@
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+-=-=-=-=   MIT License -=-=-=-=
+
+    Copyright (c) 2015 Knarfalingus  (email : [email protected] )
+
+    Permission is hereby granted, free of charge, to any person obtaining a 
+    copy of this software and associated documentation files (the "Software"), 
+    to deal in the Software without restriction, including without limitation the 
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+    sell copies of the Software, and to permit persons to whom the Software is 
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all 
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

syntax-highlighter-evolved-typescript/trunk/readme.txt

@@ -3 +3 @@
 Tags: syntaxhighlighting, typescript
 Requires at least: 2.7
-Tested up to: 4.1.2
-Stable tag: 1.0.2
-License: GPLv3
+Tested up to: 4.2.2
+Stable tag: 1.5.0
+License: dual - GPLv3 or MIT
 License URI: http://www.gnu.org/licenses/gpl-3.0.txt
 
@@ -18 +18 @@
 == Changelog ==
 
-= 0.1 =
+= 1.0.1 =
 * Initial Version
+
+= 1.5.0 =
+* Reworked to support Typescript 1.5
+* Added hilighting for operators, separators, parens etc
+* Updated licensing in files to clarify GPL as being v3, added MIT option
+* Added support for custom regions (Web Essentials http://vswebessentials.com/features/typescript)

syntax-highlighter-evolved-typescript/trunk/shBrushTScript.js

@@ -7 +7 @@
  *
  * @version
- * 1.0.0 (Wed, 31 May 2014)
+ * 1.4.9 (Sun, 10 May 2015)
  *
  * @copyright
- * TypeScript brush Copyright (C) 2014 Knarf P. Lingus.
+ * TypeScript brush Copyright (C) 2014-2015 Knarf P. Lingus.
  *
  * @license
@@ -18 +18 @@
 SyntaxHighlighter.brushes.TypeScript = function()
 {
-        var keywords =  'any abstract boolean break case catch class const constructor continue ' +
-                'debugger default delete do else enum export extends false  ' +
-                'finally for foreach function if implements import in instanceof ' +
-                'interface let module new null number package private protected ' +
-                'public require return static string super switch ' +
-                'this throw true try typeof var void while with yield';
+        // reserved words ECMAscript 6,  removed older ECMAscript  reserved keywords (abstract, constructor etc) 
+        var keywords =  'break case catch class const continue debugger default delete do else '
+            + 'export extends finally for function if import in instanceof let new '
+            + 'return super switch this throw try typeof var void while with yield '
+            // future reserved
+            + 'await enum '
+            // future reserved strict mode
+            + 'implements interface package private protected public static '
+            // literals
+            + 'false null true '
+            // Typescript 1.5 beta - anything in scanner.ts that is not in above....
+            + 'any as Array boolean constructor declare from get module namespace number of require set static string symbol type';
+            
+             
+        var chars   
 
         var r = SyntaxHighlighter.regexLib;
         
         this.regexList = [
+            { regex: />/,                                        css: 'color1' },            // apparently need this to prevent > replace??
+                                                                                                // I think my highlighting of > triggers this somehow
+            { regex: /&/,                                       css: 'color1' },            // ditto
+            { regex: /</,                                        css: 'color1' },            // ditto
+            { regex: /\s*\/\/#(region|endregion).*/gm,              css: 'script' },            // preprocessor tags like #region and #endregion (Web Essentials)
             { regex: r.multiLineDoubleQuotedString,                 css: 'string' },            // double quoted strings
             { regex: r.multiLineSingleQuotedString,                 css: 'string' },            // single quoted strings
             { regex: r.singleLineCComments,                         css: 'comments' },          // one line comments
-            { regex: r.multiLineCComments,                          css: 'comments' },          // multiline comments
-            { regex: /\s*#.*/gm,                                    css: 'preprocessor' },      // preprocessor tags like #region and #endregion
+            { regex: r.multiLineCComments,                          css: 'comments' },          // multi-line comments
+            { regex: /\s*@[a-zA-Z_$][a-zA-Z_$0-9]*/gm,              css: 'color3' },            // TypeScript 1.5, ES7 decorators
+            { regex: /(;|\(|\)|\[|\]|\.|{|})/gm,                    css: 'color1' },            // highlight square & squiggly brackets, parentheses, dots and parentheses
+            { regex: /(%|\/|\+|\-|\*|=|,|:|\||&|\!|\<|\>|~|\^)/gm,  css: 'color1' },            // highlight operators&separators etc
             { regex: new RegExp(this.getKeywords(keywords), 'gm'),  css: 'keyword' }            // keywords
             ];
     
-        //this.forHtmlScript(r.scriptScriptTags);
 };
  

syntax-highlighter-evolved-typescript/trunk/syntaxhighlighter_typescript.php

@@ -4 +4 @@
 Plugin Name: SyntaxHighlighter Evolved: TypeScript Brush
 Description: Adds support for the TypeScript language to the SyntaxHighlighter Evolved plugin.
-Version: 1.0.1
+Version: 1.5.0
 Author: KnarfaLingus
 Author URI: https://www.knarfalingus.com/
-License: GPL2
+License: GPL3 or MIT
 */
  
-/*  Copyright 2014 Knarfalingus  (email : [email protected] )
+/* GPL License follows */
+/*  Copyright 2014-2015 Knarfalingus  (email : [email protected] )
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License, version 2, as 
+    it under the terms of the GNU General Public License, version 3, as 
     published by the Free Software Foundation.
 
@@ -26 +27 @@
 */
 
+/* MIT license follows */
+/*
+    Copyright (c) 2015 Knarfalingus  (email : [email protected] )
+
+    Permission is hereby granted, free of charge, to any person obtaining a 
+    copy of this software and associated documentation files (the "Software"), 
+    to deal in the Software without restriction, including without limitation the 
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
+    sell copies of the Software, and to permit persons to whom the Software is 
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all 
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+*/