Add @import keyword "inline" and media filter.

Author: Horcrux7

src/com/inet/lib/less/LessParser.java

@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Scanner;
 import java.util.StringTokenizer;
 
 import javax.annotation.Nonnull;
@@ -434,6 +435,8 @@ private void importFile( FormattableContainer currentRule, final String name ) {
         boolean isCss = false;
         boolean isLess = false;
         boolean isMultiple = reader.isMultiple();
+        boolean isInline = false;
+        boolean isOptional = false;
         if( filename.startsWith( "(" ) ) {
             int endIdx = filename.indexOf( ')', 1);
             if( endIdx > 0 ) {
@@ -443,7 +446,10 @@ private void importFile( FormattableContainer currentRule, final String name ) {
                     String keywordStr = tokenizer.nextToken().trim();
                     switch( keywordStr ) {
                         case "inline":
+                            isInline = true;
+                            break;
                         case "optional":
+                            isOptional = true;
                             System.err.println( "not implemented @import keyword: " + keywordStr ); //TODO
                             break;
                         case "once":
@@ -514,6 +520,9 @@ private void importFile( FormattableContainer currentRule, final String name ) {
             if( i < filename.length() - 1 ) {
                 //additional content after url(...)
                 media = filename.substring( i + 1 ).trim();
+                Rule rule = new Rule( reader, currentRule, "@media " + media, null, null );
+                currentRule.add( rule );
+                currentRule = rule;
             }
             filename = trim( builder );
 
@@ -533,13 +542,13 @@ private void importFile( FormattableContainer currentRule, final String name ) {
                 lazyImports.add( lazy );
                 return;
             }
-            if( !isLess && (isCss || filename.endsWith( "css" )) ) {
+            if( !isLess && !isInline && (isCss || filename.endsWith( "css" )) ) {
                 // filenames ends with "css" will not be inline else a CSS @import directive is written
                 currentRule.add( new CssAtRule( reader, "@import " + name + ';') );
                 return;
             }
             baseURL = baseURL == null ? new URL( filename ) : new URL( baseURL, filename );
-            if( !isLess && baseURL.getPath().endsWith( "css" ) ) {
+            if( !isLess && !isInline && baseURL.getPath().endsWith( "css" ) ) {
                 // URL path ends with "css" will not be inline else a CSS @import directive is written
                 currentRule.add( new CssAtRule( reader, "@import " + name + ';') );
                 return;
@@ -554,9 +563,17 @@ private void importFile( FormattableContainer currentRule, final String name ) {
                 if( isReference != reader.isReference() ) {
                     add( new ReferenceInfo( isReference ) );
                 }
-                reader = new LessLookAheadReader( readerFactory.create( baseURL ), filename, isReference, isMultiple );
-                parse( currentRule );
-                reader.close();
+                Reader importReader = readerFactory.create( baseURL );
+                if( isInline ) {
+                    Scanner scanner = new Scanner(importReader).useDelimiter( "\\A" );
+                    if( scanner.hasNext() ) {
+                        currentRule.add( new CssAtRule( reader, scanner.next() ) );
+                    }
+                } else {
+                    reader = new LessLookAheadReader( importReader, filename, isReference, isMultiple );
+                    parse( currentRule );
+                    reader.close();
+                }
             }
         } catch( LessException ex ) {
             throw ex;

test/com/inet/lib/less/samples/less_org_tests/less/import-inline.css

@@ -0,0 +1,5 @@
+@media (min-width:600px) {
+#css { color: yellow; }
+
+}
+this isn't very valid CSS.

test/com/inet/lib/less/samples/less_org_tests/less/import-inline.less

@@ -0,0 +1,2 @@
+@import (inline) url("import/import-test-d.css") (min-width:600px);
+@import (inline, css) url("import/invalid-css.less");

test/com/inet/lib/less/samples/less_org_tests/less/import.css

@@ -0,0 +1,36 @@
+@import url(http://fonts.googleapis.com/css?family=Open+Sans);
+@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
+@import url("//ha.com/file.css") (min-width:100px);
+#import-test {
+  height: 10px;
+  color: red;
+  width: 10px;
+  height: 30%;
+}
+@media screen and (max-width: 600px) {
+  body {
+    width: 100%;
+  }
+}
+#import {
+  color: red;
+}
+.mixin {
+  height: 10px;
+  color: red;
+}
+@media screen and (max-width: 601px) {
+  #css {
+    color: yellow;
+  }
+}
+@media screen and (max-width: 602px) {
+  body {
+    width: 100%;
+  }
+}
+@media screen and (max-width: 603px) {
+  #css {
+    color: yellow;
+  }
+}

test/com/inet/lib/less/samples/less_org_tests/less/import.less

@@ -0,0 +1,21 @@
+@import url(http://fonts.googleapis.com/css?family=Open+Sans);
+
+@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
+
+@var: 100px;
+@import url("//ha.com/file.css") (min-width:@var);
+
+#import-test {
+  .mixin;
+  width: 10px;
+  height: (@a + 10%);
+}
+@import "import/import-test-e" screen and (max-width: 600px);
+
+@import url("import/import-test-a.less");
+
+@import (less, multiple) "import/import-test-d.css" screen and (max-width: 601px);
+
+@import (multiple) "import/import-test-e" screen and (max-width: 602px);
+
+@import (less, multiple) url("import/import-test-d.css") screen and (max-width: 603px);