style: improve java import pattern formatting

Author: caiuswang

.grit/patterns/java/_test_java_imports.md

@@ -7,9 +7,10 @@ tag: [java]
 
 ```grit
 language java
+
 file($body) where {
-    $delete_import = `import a.b.Text;`,
-    $body<: maybe contains remove_import_statement($delete_import)
+	$delete_import = `import a.b.Text;`,
+	$body <: maybe contains remove_import_statement($delete_import)
 }
 ```
 
@@ -89,9 +90,10 @@ public class AClass {
 
 ```grit
 language java
+
 file($body) where {
-    $new_import = `import a.b.Text;`,
-    $body<: maybe contains ensure_import_statement($new_import)
+	$new_import = `import a.b.Text;`,
+	$body <: maybe contains ensure_import_statement($new_import)
 }
 ```
 
@@ -171,6 +173,7 @@ public class AClass {
 
 ```grit
 language java
+
 replace_import_statement(`import a.b.Text;`, `import a.c.Text;`)
 ```
 
@@ -221,6 +224,7 @@ public class AClass {
 
 ```grit
 language java
+
 remove_duplicate_import_statements()
 ```
 

.grit/patterns/java/import.grit

@@ -1,39 +1,33 @@
 language java
 
 pattern remove_duplicate_import_statements() {
-    $_ where {
-        $GLOBAL_REMOVE_DUPLICATE_EXIST_IMPORTS = true,
-    }
+	$_ where { $GLOBAL_REMOVE_DUPLICATE_EXIST_IMPORTS = true }
 }
 
 pattern ensure_import_statement($import_decl) {
-    $_ where {
-        $GLOBAL_EXIST_IMPORTS <: not some $import_decl,
-        $GLOBAL_EXIST_IMPORTS += $import_decl,
-        $GLOBAL_NEW_FROM_IMPORTS += $import_decl,
-        $GLOBAL_NEW_FROM_IMPORTS = distinct($GLOBAL_NEW_FROM_IMPORTS)
-    }
+	$_ where {
+		$GLOBAL_EXIST_IMPORTS <: not some $import_decl,
+		$GLOBAL_EXIST_IMPORTS += $import_decl,
+		$GLOBAL_NEW_FROM_IMPORTS += $import_decl,
+		$GLOBAL_NEW_FROM_IMPORTS = distinct($GLOBAL_NEW_FROM_IMPORTS)
+	}
 }
 
 pattern replace_import_statement($old_import, $new_import) {
-    $body where {
-        $find_all_import = [],
-        $body <: program(statements = $statements),
-        $statements <: bubble($find_all_import, $old_import, $new_import) every {
-            or {
-                bubble($old_import, $new_import, $find_all_import) import_declaration() as $this_import where {
-                    if ($this_import <: $old_import) {
-                        $this_import => `$new_import`
-                    }
-                },
-                $_
-            }
-        },
-    }
+	$body where {
+		$find_all_import = [],
+		$body <: program(statements=$statements),
+		$statements <: bubble($find_all_import, $old_import, $new_import) every {
+			or {
+				bubble($old_import, $new_import, $find_all_import) import_declaration() as $this_import where {
+					if ($this_import <: $old_import) { $this_import => `$new_import` }
+				},
+				$_
+			}
+		}
+	}
 }
 
 pattern remove_import_statement($import_statement) {
-    $_ where {
-        $GLOBAL_REMOVE_IMPORTS += $import_statement
-    }
+	$_ where { $GLOBAL_REMOVE_IMPORTS += $import_statement }
 }

.grit/patterns/java/java.grit

@@ -1,43 +1,38 @@
 language java
 
 // All core stdlib functions can be done here
-private pattern before_each_file_stdlib() { 
-  file($body) where {
-     $body <: init_vars(),
-     $body <: maybe contains bubble import_declaration() as $this_import where {
-         $GLOBAL_EXIST_IMPORTS += $this_import,
-     }
-  }
+private pattern before_each_file_stdlib() {
+	file($body) where {
+		$body <: init_vars(),
+		$body <: maybe contains bubble import_declaration() as $this_import where {
+			$GLOBAL_EXIST_IMPORTS += $this_import
+		}
+	}
 }
 
 private pattern after_each_file_stdlib() {
-    after_rewrite(),
-    after_each_file_global_rewrites() 
+	after_rewrite(),
+	after_each_file_global_rewrites()
 }
 
-
 // These could be redefined in the future (not presently supported)
 pattern before_each_file() { before_each_file_stdlib() }
 
 pattern after_each_file() { after_each_file_stdlib() }
 
-
 private pattern after_rewrite() {
-  file($body) where {
-    $body <: maybe process_all_import(),
-  }
+	file($body) where { $body <: maybe process_all_import() }
 }
 
 private pattern init_vars() {
-    $_ where {
-        $GLOBAL_EXIST_IMPORTS = [],
-        $GLOBAL_NEW_FROM_IMPORTS = [],
-        $GLOBAL_REMOVE_IMPORTS = [],
-        $GLOABL_REMOVE_DUPLICATE_EXIST_IMPORTS = false,
-    }
+	$_ where {
+		$GLOBAL_EXIST_IMPORTS = [],
+		$GLOBAL_NEW_FROM_IMPORTS = [],
+		$GLOBAL_REMOVE_IMPORTS = [],
+		$GLOABL_REMOVE_DUPLICATE_EXIST_IMPORTS = false
+	}
 }
 
-
 private pattern process_all_import() {
     $body where {
             // short-circuit if no changes