From f6015ca8fcd70c1827cd88e821fe6641332b7f2a Mon Sep 17 00:00:00 2001 From: Kevin Newton Date: Thu, 26 Oct 2023 09:48:30 -0400 Subject: [PATCH] Updates for TruffleRuby --- .editorconfig | 20 ++++++++------------ Gemfile | 2 +- java/org/prism/ParseResult.java | 2 ++ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index c44e61dc774..3ab16b35c6d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,23 +2,19 @@ root = true [*] end_of_line = lf -indent_size = 4 -indent_style = space insert_final_newline = true -tab_width = 8 trim_trailing_whitespace = true -[*.bat] -end_of_line = crlf - -[*.gemspec] -indent_size = 2 - -[{*.rb,Rakefile}] -indent_size = 2 +[*.{c,h}] +indent_style = space +indent_size = 4 +tab_width = 8 -[*.yml] +[{*.rb,*.gemspec,Rakefile,*.yml}] +indent_style = space indent_size = 2 [{*[Mm]akefile*,*.mak,*.mk,depend}] indent_style = tab +indent_size = 4 +tab_width = 4 diff --git a/Gemfile b/Gemfile index 662bff5276f..295012d5633 100644 --- a/Gemfile +++ b/Gemfile @@ -9,5 +9,5 @@ gem "rake-compiler" gem "test-unit" gem "ffi", platform: %i[mri mswin mingw x64_mingw] group :memcheck do - gem "ruby_memcheck", platform: %i[mri truffleruby mswin mingw x64_mingw] + gem "ruby_memcheck", platform: %i[mri mswin mingw x64_mingw] end diff --git a/java/org/prism/ParseResult.java b/java/org/prism/ParseResult.java index 6470dbaf64e..281eed5f1f0 100644 --- a/java/org/prism/ParseResult.java +++ b/java/org/prism/ParseResult.java @@ -1,5 +1,6 @@ package org.prism; +// @formatter:off public final class ParseResult { public static final class MagicComment { @@ -44,3 +45,4 @@ public ParseResult(Nodes.Node value, MagicComment[] magicComments, Error[] error this.warnings = warnings; } } +// @formatter:on