rapydscript-ng 0.7.23 → 0.7.24

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+version 0.7.24
+=======================
+
+  * Fix linter warning about end of line semi colons inside multiline string literals
+ 
 version 0.7.23
 =======================
 

package/package.json

@@ -14,7 +14,7 @@
     "start": "node bin/rapydscript",
     "build-self": "node bin/rapydscript self --complete"
   },
-  "version": "0.7.23",
+  "version": "0.7.24",
   "license": "BSD-2-Clause",
   "engines": {
     "node": ">=0.12.0"

package/test/lint.pyj

@@ -83,6 +83,8 @@ err_test('def f():\n a = 1\n for a in "":\n  a', 'loop-shadowed', 3, 'a', 2)
 # Semi-colons
 err_test('a=1;;a', 'extra-semicolon', 1, ';')
 err_test('a=1;', 'eol-semicolon', 1, ';')
+ok_test('a = """\nhello;\n"""')
+ok_test("a = '''\nhello;\n'''")
 
 # Builtins
 for k in 'String Symbol this self window Map arguments print len range dir undefined'.split(' '):

package/tools/lint.js

@@ -498,11 +498,39 @@ function Linter(toplevel, filename, code, options) {
     this.resolve = function() {
         var messages = this.messages;
         var line_filters = {};
+        var in_multiline_str = false;
+        var ml_quote = null;
 
         code.split('\n').forEach(function(line, num) {
             line = line.trimRight();
             num++;
-            if (line[line.length - 1] === ';') {
+
+            // Track triple-quoted multiline string state so we can skip
+            // eol-semicolon checks for lines that are inside string literals.
+            var line_starts_in_multiline = in_multiline_str;
+            var pos = 0, close_pos;
+            while (pos < line.length) {
+                if (!in_multiline_str) {
+                    var dq = line.indexOf('"""', pos);
+                    var sq = line.indexOf("'''", pos);
+                    var first, quote;
+                    if (dq !== -1 && (sq === -1 || dq < sq)) { first = dq; quote = '"""'; }
+                    else if (sq !== -1) { first = sq; quote = "'''"; }
+                    else break;
+                    in_multiline_str = true;
+                    ml_quote = quote;
+                    pos = first + 3;
+                    close_pos = line.indexOf(ml_quote, pos);
+                    if (close_pos !== -1) { in_multiline_str = false; ml_quote = null; pos = close_pos + 3; }
+                    else break;
+                } else {
+                    close_pos = line.indexOf(ml_quote, pos);
+                    if (close_pos !== -1) { in_multiline_str = false; ml_quote = null; pos = close_pos + 3; }
+                    else break;
+                }
+            }
+
+            if (!line_starts_in_multiline && !in_multiline_str && line[line.length - 1] === ';') {
                 var ident = 'eol-semicolon';
                 messages.push({filename:filename, ident:ident, message:MESSAGES[ident],
                     level:WARN, name:';', start_line:num, start_col:line.lastIndexOf(';')});