Match the indent for a single semicolon with the Puppet documentation

Author: msalway

lib/puppet-lint/plugins/check_strict_indent.rb

@@ -120,6 +120,13 @@ def check
         next_token = next_token.next_token
       end
 
+      # For a lone semicolon within a block decrement immediately. Use temp_indent because
+      # indent will be decremented in the next line by the prev_token logic above.
+      temp_indent -= 1 if !colon_indent.nil? and
+                          token.next_token.type == :INDENT and
+                          token.next_token.next_token.type == :SEMIC and
+                          token.next_token.next_token.next_token.type == :NEWLINE
+
       # obviously we have a problem
       if indent < 0
         notify :error, {

spec/fixtures/fail/semicolon_long.pp

@@ -0,0 +1,15 @@
+file {
+  default:
+    ensure => file,
+    owner  => 'root',
+    group  => 'wheel',
+    mode   => '0600',
+    ;
+  ['ssh_host_dsa_key', 'ssh_host_key', 'ssh_host_rsa_key']:
+    # use all defaults
+  ;
+  ['ssh_config', 'ssh_host_dsa_key.pub', 'ssh_host_key.pub', 'ssh_host_rsa_key.pub', 'sshd_config']:
+    # override mode
+    mode => '0644',
+  ;
+}

spec/fixtures/fail/semicolon_short.pp

@@ -0,0 +1,15 @@
+file {
+  default:
+    ensure => file,
+    owner  => 'root',
+    group  => 'wheel',
+    mode   => '0600',
+  ;
+  ['ssh_host_dsa_key', 'ssh_host_key', 'ssh_host_rsa_key']:
+    # use all defaults
+;
+  ['ssh_config', 'ssh_host_dsa_key.pub', 'ssh_host_key.pub', 'ssh_host_rsa_key.pub', 'sshd_config']:
+    # override mode
+    mode => '0644',
+  ;
+}

spec/fixtures/pass/semicolon.pp

@@ -0,0 +1,15 @@
+file {
+  default:
+    ensure => file,
+    owner  => 'root',
+    group  => 'wheel',
+    mode   => '0600',
+  ;
+  ['ssh_host_dsa_key', 'ssh_host_key', 'ssh_host_rsa_key']:
+    # use all defaults
+  ;
+  ['ssh_config', 'ssh_host_dsa_key.pub', 'ssh_host_key.pub', 'ssh_host_rsa_key.pub', 'sshd_config']:
+    # override mode
+    mode => '0644',
+  ;
+}