merged changes from master

.swiftlint.yml

@@ -1,9 +1,13 @@
+swiftlint_version: 0.29.3
+
 opt_in_rules:
  - anyobject_protocol
  - array_init
  - attributes
+ - closure_body_length
  - closure_end_indentation
  - closure_spacing
+ - collection_alignment
  - contains_over_first_not_nil
  - convenience_type
  - discouraged_optional_boolean
@@ -15,15 +19,23 @@ opt_in_rules:
  - file_header
  - first_where
  - force_unwrapping
+ - identical_operands
  - implicit_return
  - implicitly_unwrapped_optional
+ - inert_defer
  - joined_default_parameter
+ - last_where
+ - legacy_hashing
+ - legacy_random
  - literal_expression_end_indentation
  - lower_acl_than_parent
  - modifier_order
  - multiline_arguments
+ - multiline_arguments_brackets
  - multiline_function_chains
+ - multiline_literal_brackets
  - multiline_parameters
+ - multiline_parameters_brackets
  - number_separator
  - object_literal
  - operator_usage_whitespace
@@ -33,12 +45,18 @@ opt_in_rules:
  - private_outlet
  - prohibited_super_call
  - redundant_nil_coalescing
+ - redundant_objc_attribute
  - sorted_first_last
  - sorted_imports
+ - static_operator
+ - toggle_bool
  - trailing_closure
  - unavailable_function
  - unneeded_parentheses_in_closure_argument
+ - unused_control_flow_label
  - vertical_parameter_alignment_on_call
+ - vertical_whitespace_closing_braces
+ - vertical_whitespace_opening_braces
  - yoda_condition
 
 # Rules customization

CHANGELOG.md

@@ -20,7 +20,9 @@ _None_
 
 ### Internal Changes
 
-_None_
+* Update to SwiftLint 0.29.3 and enable some extra SwiftLint rules.  
+  [David Jennes](https://github.com/djbe)
+  [#112](https://github.com/SwiftGen/StencilSwiftKit/pull/112)
 
 ## 2.7.1
 

Gemfile

@@ -10,7 +10,7 @@ end
 
 # In addition to :build, for contributing
 group :development do
-	gem 'cocoapods', '~> 1.6.beta'
+	gem 'cocoapods', '~> 1.6.0.beta.2'
 	gem 'rubocop', '~> 0.62'
 end
 

Gemfile.lock

@@ -102,7 +102,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.6.beta)
+  cocoapods (~> 1.6.0.beta.2)
   octokit (~> 4.13)
   rake (~> 12.3)
   rubocop (~> 0.62)

Podfile

@@ -5,5 +5,5 @@ raise 'Please use bundle exec to run the pod command' unless defined?(Bundler)
 
 target 'Tests' do
   pod 'StencilSwiftKit', path: '.'
-  pod 'SwiftLint', '~> 0.27'
+  pod 'SwiftLint', '~> 0.29'
 end

Podfile.lock

@@ -4,11 +4,11 @@ PODS:
     - PathKit (~> 0.9.0)
   - StencilSwiftKit (2.7.1):
     - Stencil (~> 0.13.1)
-  - SwiftLint (0.27.0)
+  - SwiftLint (0.29.3)
 
 DEPENDENCIES:
   - StencilSwiftKit (from `.`)
-  - SwiftLint (~> 0.27)
+  - SwiftLint (~> 0.29)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -24,8 +24,8 @@ SPEC CHECKSUMS:
   PathKit: 273f59a38e3218eb95abd9f6a61730a8bcfd2f06
   Stencil: b5128a0a43ece9225db5cbd94d6569fe6fba609b
   StencilSwiftKit: e16b4580ae8cec0af6deea1924200ae733042162
-  SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
+  SwiftLint: bfa7ca7b4d170cfaf0d236ca3ffd969e88a2f002
 
-PODFILE CHECKSUM: bfb045d6ef409d0ed3751cc1023e316c5e7803ad
+PODFILE CHECKSUM: dc07e3bb2d5b477586d93c79a4bbd9e79a49960f
 
 COCOAPODS: 1.6.0.beta.2

Sources/StencilSwiftKit/CallMacroNodes.swift

@@ -17,10 +17,12 @@ struct CallableBlock {
 
   func context(_ context: Context, arguments: [Resolvable], variable: Variable) throws -> [String: Any] {
     guard parameters.count == arguments.count else {
-      throw TemplateSyntaxError("""
+      throw TemplateSyntaxError(
+        """
         Block '\(variable.variable)' accepts \(parameters.count) parameters, \
         \(arguments.count) given.
-        """)
+        """
+      )
     }
 
     var result = [String: Any]()