Merge pull request #152 from lee-m/unknown-prop

Fix UnknownProperty being used for known properties

Author: TylerBrinks

src/ExCSS.Tests/Cases.cs

@@ -1013,5 +1013,14 @@ public void StyleSheetWithInitialCommentShouldWorkWithTriviaActive()
             Assert.IsType<Comment>(comment);
             Assert.Equal(" Comment at the start ", ((Comment)comment).Data);
         }
+
+        [Fact]
+        public void StylesheetIncludeUnknownDeclarationsWithKnownPropertyShouldNotUseUnknownProperty()
+        {
+            var parser = new StylesheetParser(includeUnknownDeclarations: true);
+            var document = parser.Parse(@"body { border-width: 0; }");
+
+            Assert.IsNotType<UnknownProperty>(((StyleRule)document.Rules[0]).Style.Children.First());
+        }
     }
 }

src/ExCSS/Parser/StylesheetComposer.cs

@@ -620,10 +620,13 @@ public Property CreateDeclarationWith(Func<string, Property> createProperty, ref
 
             if (propertyName.Length > 0)
             {
-                property = _parser.Options.IncludeUnknownDeclarations ||
-                           _parser.Options.AllowInvalidValues
-                    ? new UnknownProperty(propertyName)
-                    : createProperty(propertyName);
+                property = createProperty(propertyName);
+
+                if (property == null
+                    && (_parser.Options.IncludeUnknownDeclarations || _parser.Options.AllowInvalidValues))
+                {
+                    property = new UnknownProperty(propertyName);
+                }
 
                 if (property == null)
                     RaiseErrorOccurred(ParseError.UnknownDeclarationName, start);