Skip to content

Commit df8d21a

Browse files
committed
[GR-17457] Simplify jt lint by always running jt checkstyle and jt format explicitly.
PullRequest: truffleruby/2369
2 parents c22d5d6 + 881612c commit df8d21a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

tool/jt.rb

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,6 +2261,7 @@ def idea(*args)
22612261
end
22622262

22632263
def command_format(changed_java_files = nil)
2264+
STDERR.puts bold '$ jt format'
22642265
ENV['ECLIPSE_EXE'] ||= install_eclipse
22652266
if changed_java_files.is_a?(Array)
22662267
File.write('mxbuild/javafilelist.txt', changed_java_files.join("\n"))
@@ -2649,25 +2650,23 @@ def lint(*args)
26492650
# Lint
26502651
rubocop if changed['.rb']
26512652
sh 'tool/lint.sh' if changed['.c']
2652-
if fast
2653-
checkstyle(changed['.java']) if changed['.java']
2654-
command_format(changed['.java']) if changed['.java'] # includes #format_specializations_check
2655-
else
2656-
mx 'gate', '--tags', 'style' # mx eclipseformat, mx checkstyle and a few more checks
2657-
format_specializations_check
2658-
end
2653+
checkstyle(changed['.java']) if changed['.java']
2654+
command_format(changed['.java']) if changed['.java']
26592655
shellcheck if changed['.sh'] or changed['.inc']
26602656

26612657
mx 'verify-ci' if changed['.py']
26622658

26632659
unless fast
2660+
mx 'gate', '--tags', 'style' # mx eclipseformat, mx checkstyle and a few more checks
2661+
26642662
check_core_symbols
26652663
check_parser
26662664
check_options
2667-
check_source_files if ci?
26682665
check_documentation
26692666
check_documentation_urls
26702667
check_license
2668+
2669+
check_source_files if ci?
26712670
end
26722671
end
26732672

0 commit comments

Comments
 (0)