Add fixes for indentation checker

ViacomInc · Feb 12, 2019 · d511cfe · d511cfe
1 parent 4e709ff
commit d511cfe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+ = 4.16.1 =
+
+ - Fixes for indentation checker
+
  = 4.16.0 =
 
  - Allow plugins to validate themselves

diff --git a/lib/roku_builder/plugins/indentation_inspector.rb b/lib/roku_builder/plugins/indentation_inspector.rb
@@ -42,6 +42,8 @@ def set_indentation(line:)
             # Don't change indentation
           elsif @prev_line =~ /[\{\[\(:]$/
             @ind += @count
+          elsif @prev_line =~ /:\s*\bfunction\b|:\s*\bsub\b/i
+            @ind += @count
           elsif @prev_line =~ /^\s*\bfunction\b|^\s*\bsub\b/i
             @ind += @count
           elsif @prev_line =~ /^\s*#?if\b|^\s*#?else\b/i

diff --git a/lib/roku_builder/plugins/performance_config.json b/lib/roku_builder/plugins/performance_config.json
@@ -1,6 +1,6 @@
 [
   {
-    "regex": "\\sas\\s(Object|Boolean|String|Integer|LongInteger|Double|Float|Function|Dynamic)",
+    "regex": "\\sas\\s+(Object|Boolean|String|Integer|LongInteger|Double|Float|Function|Dynamic)",
     "severity": "warning",
     "message": "Found function return type. Consider removing"
   } ,

diff --git a/lib/roku_builder/version.rb b/lib/roku_builder/version.rb
@@ -2,5 +2,5 @@
 
 module RokuBuilder
   # Version of the RokuBuilder Gem
-  VERSION = "4.16.0"
+  VERSION = "4.16.1"
 end