A platform for community discussion. Free, open, simple.
DEV: Lint symlinked plugins using relative paths (#43037)
Martin Brennan49dbb2c544ab
diff --git a/bin/lint b/bin/lintindex a95d75082f1..aaabdf12535 100755--- a/bin/lint+++ b/bin/lint@@ -22,7 +22,9 @@ class ExternalLinterdef initialize(root, files, fix:, verbose: false)@root = root- @files = files.map { |f| File.expand_path(f) }+ root_path = Pathname.new(@root).realpath+ # Keep paths relative to the plugin root so linter exclusions work for symlinked plugins.+ @files = files.map { |f| Pathname.new(f).realpath.relative_path_from(root_path).to_s }@fix = fix@verbose = verbose@results = []@@ -315,7 +317,7 @@ class LefthookLinterfiles.each do |f|if (root = external_plugin_root(f))- external_files[File.join(PROJECT_ROOT, root)] << f+ external_files[root] << felsecore_files << fend@@ -324,16 +326,22 @@ class LefthookLinter[core_files, external_files]end- # Returns "plugins/<name>" if the file is in an unbundled plugin directory, else nil.+ # Returns the plugin root if the file is in an unbundled plugin directory, else nil.def external_plugin_root(file)path = normalize_relative_path(file)- return nil unless path.start_with?("plugins/")+ return standalone_plugin_root(file) unless path.start_with?("plugins/")parts = path.split("/")return nil if parts.length < 2plugin_dir = "plugins/#{parts[1]}"- bundled_plugins.include?(plugin_dir) ? nil : plugin_dir+ File.join(PROJECT_ROOT, plugin_dir) if bundled_plugins.exclude?(plugin_dir)+ end++ def standalone_plugin_root(file)+ file_path = Pathname.new(file).realpath+ plugin_root = file_path.ascend.find { |path| path.join("plugin.rb").file? }+ plugin_root&.to_senddef bundled_plugins