Remove extra lines around imports

eregon · eregon · commit 7ca8ede4fd9e · 2020-11-27T12:51:52.000+01:00
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -115,7 +115,6 @@
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule("Truffle::CExt")
 public class CExtNodes {
 
diff --git a/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java b/src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java
@@ -85,7 +85,6 @@
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "BasicObject", isClass = true)
 public abstract class BasicObjectNodes {
 
diff --git a/src/main/java/org/truffleruby/core/cast/HashCastNode.java b/src/main/java/org/truffleruby/core/cast/HashCastNode.java
@@ -24,9 +24,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 // TODO(CS): copy and paste of ArrayCastNode
-
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class HashCastNode extends RubyContextSourceNode {
 
diff --git a/src/main/java/org/truffleruby/core/cast/NumericToFloatNode.java b/src/main/java/org/truffleruby/core/cast/NumericToFloatNode.java
@@ -21,7 +21,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 /** Casts a value into a Ruby Float (double). */
 public abstract class NumericToFloatNode extends RubyContextNode {
 
diff --git a/src/main/java/org/truffleruby/core/cast/ToAryNode.java b/src/main/java/org/truffleruby/core/cast/ToAryNode.java
@@ -20,7 +20,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ToAryNode extends RubyContextSourceNode {
 
diff --git a/src/main/java/org/truffleruby/core/cast/ToStringOrSymbolNode.java b/src/main/java/org/truffleruby/core/cast/ToStringOrSymbolNode.java
@@ -25,7 +25,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import org.truffleruby.language.library.RubyStringLibrary;
 
-
 /** Convert objects to a String by calling #to_str, but leave existing Strings or Symbols as they are. */
 @NodeChild(value = "child", type = RubyNode.class)
 public abstract class ToStringOrSymbolNode extends RubyContextSourceNode {
diff --git a/src/main/java/org/truffleruby/core/format/convert/ToDoubleWithCoercionNode.java b/src/main/java/org/truffleruby/core/format/convert/ToDoubleWithCoercionNode.java
@@ -17,7 +17,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-
 @NodeChild("value")
 public abstract class ToDoubleWithCoercionNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/format/convert/ToIntegerNode.java b/src/main/java/org/truffleruby/core/format/convert/ToIntegerNode.java
@@ -18,7 +18,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-
 @NodeChild("value")
 public abstract class ToIntegerNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/format/read/array/ReadHashValueNode.java b/src/main/java/org/truffleruby/core/format/read/array/ReadHashValueNode.java
@@ -22,7 +22,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @NodeChild(value = "source", type = SourceNode.class)
 public abstract class ReadHashValueNode extends FormatNode {
 
diff --git a/src/main/java/org/truffleruby/core/hash/HashNodes.java b/src/main/java/org/truffleruby/core/hash/HashNodes.java
@@ -53,7 +53,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Hash", isClass = true)
 public abstract class HashNodes {
 
diff --git a/src/main/java/org/truffleruby/core/klass/ClassNodes.java b/src/main/java/org/truffleruby/core/klass/ClassNodes.java
@@ -41,7 +41,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule(value = "Class", isClass = true)
 public abstract class ClassNodes {
 
diff --git a/src/main/java/org/truffleruby/core/module/ModuleNodes.java b/src/main/java/org/truffleruby/core/module/ModuleNodes.java
@@ -126,7 +126,6 @@
 import com.oracle.truffle.api.profiles.ValueProfile;
 import com.oracle.truffle.api.source.SourceSection;
 
-
 @CoreModule(value = "Module", isClass = true)
 public abstract class ModuleNodes {
 
diff --git a/src/main/java/org/truffleruby/core/numeric/FloatNodes.java b/src/main/java/org/truffleruby/core/numeric/FloatNodes.java
@@ -41,7 +41,6 @@
 
 import java.util.Locale;
 
-
 @CoreModule(value = "Float", isClass = true)
 public abstract class FloatNodes {
 
diff --git a/src/main/java/org/truffleruby/core/numeric/IntegerNodes.java b/src/main/java/org/truffleruby/core/numeric/IntegerNodes.java
@@ -58,7 +58,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Integer", isClass = true)
 public abstract class IntegerNodes {
 
diff --git a/src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java b/src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java
@@ -42,7 +42,6 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @CoreModule("ObjectSpace")
 public abstract class ObjectSpaceNodes {
 
diff --git a/src/main/java/org/truffleruby/core/range/RangeNodes.java b/src/main/java/org/truffleruby/core/range/RangeNodes.java
@@ -48,7 +48,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "Range", isClass = true)
 public abstract class RangeNodes {
 
diff --git a/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java b/src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java
@@ -59,7 +59,6 @@
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.objects.AllocationTracing;
 
-
 @CoreModule("Truffle::RegexpOperations")
 public class TruffleRegexpNodes {
 
diff --git a/src/main/java/org/truffleruby/core/string/StringNodes.java b/src/main/java/org/truffleruby/core/string/StringNodes.java
@@ -200,7 +200,6 @@
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 
-
 @CoreModule(value = "String", isClass = true)
 public abstract class StringNodes {
 
diff --git a/src/main/java/org/truffleruby/language/TruffleBootNodes.java b/src/main/java/org/truffleruby/language/TruffleBootNodes.java
@@ -52,7 +52,6 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.llvm.api.Toolchain;
 
-
 @CoreModule("Truffle::Boot")
 public abstract class TruffleBootNodes {
 
diff --git a/src/main/java/org/truffleruby/language/exceptions/RescueNode.java b/src/main/java/org/truffleruby/language/exceptions/RescueNode.java
@@ -26,7 +26,6 @@
 import com.oracle.truffle.api.instrumentation.ProbeNode;
 import com.oracle.truffle.api.profiles.BranchProfile;
 
-
 @GenerateWrapper
 public abstract class RescueNode extends RubyContextSourceNode {
 
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -2444,7 +2444,7 @@ def format_imports
       each_file do |content|
         content
           .sub(/\n{3,}import /, "\n\nimport ")
-          .sub(/^(import .+;)\n{3,}public/, "\\1\n\npublic")
+          .sub(/^(import .+;)\n{3,}((?:(?:@|\/\/|\/\*).+\n)*)public/, "\\1\n\n\\2public")
       end
     end
 
