Disallow shorthands not in allowed_shorthands list

printercu · Jun 9, 2016 · e283d16 · e283d16
1 parent 9016d80
commit e283d16
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/config/default.yml b/config/default.yml
@@ -168,7 +168,7 @@ linters:
 
   Shorthand:
     enabled: true
-    allowed_shorthands: [1, 2, 3]
+    allowed_shorthands: [1, 2, 3, 4]
 
   SingleLinePerProperty:
     enabled: true

diff --git a/lib/scss_lint/linter/README.md b/lib/scss_lint/linter/README.md
@@ -1309,11 +1309,11 @@ margin: 1px;
 ```
 
 If you don't want to allow all possible shorthands, you can limit them by
-setting the `allowed_shorthands` array option to a subset of `[1, 2, 3]`.
+setting the `allowed_shorthands` array option to a subset of `[1, 2, 3, 4]`.
 
 Configuration Option | Description
 ---------------------|---------------------------------------------------------
-`allowed_shorthands` | Array of allowed shorthand lengths (default `[1, 2, 3]`)
+`allowed_shorthands` | Array of allowed shorthand lengths (default `[1, 2, 3, 4]`)
 
 ## SingleLinePerProperty
 

diff --git a/lib/scss_lint/linter/shorthand.rb b/lib/scss_lint/linter/shorthand.rb
@@ -68,6 +68,9 @@ def check_script_string(prop, script_string)
     # @param node [Sass::Script::Value::String]
     # @param values [Array<String>]
     def check_shorthand(prop, node, values)
+      add_lint(node, "Shorthands of length `#{values.count}` are not allowed. " \
+                     "Value was `#{values.join(' ')}`") unless allowed?(values.count)
+
       return unless (2..4).member?(values.count)
 
       shortest_form = condensed_shorthand(*values)

diff --git a/spec/scss_lint/linter/shorthand_spec.rb b/spec/scss_lint/linter/shorthand_spec.rb
@@ -194,5 +194,16 @@
 
       it { should_not report_lint }
     end
+
+    context 'is fine but length is not allowed' do
+      let(:allowed) { [1, 2, 3] }
+      let(:scss) { <<-SCSS }
+        p {
+          margin: 1px 2px 3px 4px;
+        }
+      SCSS
+
+      it { should report_lint }
+    end
   end
 end