Merge pull request #418 from dave-bartolomeo/dave/FormatConfig

hvitved · web-flow · commit 40def8d3647d · 2018-11-12T09:43:39.000+01:00
Allow mixed whitespace in certain test and external directories
diff --git a/cpp/ql/test/format.json b/cpp/ql/test/format.json
@@ -0,0 +1,11 @@
+[
+  {
+    "pattern": [
+      "**/*.c",
+      "**/*.cpp",
+      "**/*.h",
+      "**/*.hpp"
+    ],
+    "allowMixedTabsAndSpaces": true
+  }
+]
diff --git a/csharp/ql/test/format.json b/csharp/ql/test/format.json
@@ -0,0 +1,6 @@
+[
+  {
+    "pattern": "**/*.cs",
+    "allowMixedTabsAndSpaces": true
+  }
+]
diff --git a/java/ql/test/format.json b/java/ql/test/format.json
@@ -0,0 +1,6 @@
+[
+  {
+    "pattern": "**/*.java",
+    "allowMixedTabsAndSpaces": true
+  }
+]
diff --git a/javascript/extractor/.project b/javascript/extractor/.project
@@ -5,13 +5,13 @@
     <projects>
     </projects>
     <buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
     </buildSpec>
     <natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.eclipse.jdt.core.javanature</nature>
     </natures>
 </projectDescription>
diff --git a/javascript/extractor/format.json b/javascript/extractor/format.json
@@ -0,0 +1,10 @@
+[
+  {
+    "pattern": [
+      "lib/**/*",
+      "parser-tests/**/*.js",
+      "tests/**/*.js"
+    ],
+    "allowMixedTabsAndSpaces": true
+  }
+]
diff --git a/javascript/ql/test/format.json b/javascript/ql/test/format.json
@@ -0,0 +1,6 @@
+[
+  {
+    "pattern": "**/*.js",
+    "allowMixedTabsAndSpaces": true
+  }
+]

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +[
 +  {
 +    "pattern": "**/*.cs",
 +    "allowMixedTabsAndSpaces": true
 +  }
 +]