Force strategy detection when instrumenter is definded

Author: DecimalTurn

lib/linguist/lazy_blob.rb

@@ -74,9 +74,16 @@ def language
 
       @language = if lang = git_attributes['linguist-language']
         detected_language = Language.find_by_alias(lang)
-        # Instrument the gitattributes override as a strategy
-        if detected_language
-          strategy = Struct.new(:name).new("Linguist::Strategy::GitAttributes")
+
+        # If strategies are being tracked, get the overridden strategy that would have been used with a note that it was overridden
+        if detected_language && Linguist.instrumenter
+          # Get the overridden strategy by calling super (which calls Linguist.detect)
+          super
+          overridden_strategy_info = Linguist.instrumenter.detected_info[self.name]
+          overridden_strategy = overridden_strategy_info ? overridden_strategy_info[:strategy] : "Unknown"
+
+          strategy_name = "#{overridden_strategy} (overridden by .gitattributes)"
+          strategy = Struct.new(:name).new(strategy_name)
           Linguist.instrument("linguist.detected", blob: self, strategy: strategy, language: detected_language)
         end
         detected_language

test/test_basic_instrumenter.rb

@@ -85,12 +85,12 @@ def test_tracks_filename_strategy
   def test_tracks_override_strategy
     # Simulate a blob with a gitattributes override
     blob = Linguist::FileBlob.new("Gemfile", "")
-    # Simulate detection with gitattributes strategy
-    strategy = Struct.new(:name).new("Linguist::Strategy::GitAttributes")
+    # Simulate detection with gitattributes strategy showing the override
+    strategy = Struct.new(:name).new("Filename (overridden by .gitattributes)")
     language = Struct.new(:name).new("Java")
     @instrumenter.instrument("linguist.detected", blob: blob, strategy: strategy, language: language) {}
     assert @instrumenter.detected_info.key?(blob.name)
-    assert_equal "GitAttributes", @instrumenter.detected_info[blob.name][:strategy]
+    assert_match(/overridden by \.gitattributes/, @instrumenter.detected_info[blob.name][:strategy])
     assert_equal "Java", @instrumenter.detected_info[blob.name][:language]
   end
 end

test/test_cli_integration.rb

@@ -39,7 +39,7 @@ def test_strategies_flag_with_gitattributes_override
 
     assert status.success?, "CLI command failed: #{stderr}"
     assert_match(/language:\s+Ruby/, stdout, "Should detect Ruby language")
-    assert_match(/strategy:\s+GitAttributes/, stdout, "Should show GitAttributes strategy")
+    assert_match(/strategy:\s+.*\(overridden by \.gitattributes\)/, stdout, "Should show override in strategy")
   end
 
   def test_strategies_flag_with_normal_detection
@@ -81,7 +81,7 @@ def test_breakdown_with_gitattributes_strategies
     assert status.success?, "CLI command failed: #{stderr}"
 
     # Check that GitAttributes strategy appears for the overridden file
-    assert_match(/override\.special \[GitAttributes\]/, stdout, "Should show GitAttributes strategy for overridden file")
+    assert_match(/override\.special \[.* \(overridden by \.gitattributes\)\]/, stdout, "Should show override for overridden file")
 
     # Check that normal detection strategies appear for other files
     assert_match(/normal\.js \[Extension\]/, stdout, "Should show Extension strategy for .js file")
@@ -134,6 +134,6 @@ def test_repository_scan_with_gitattributes
 
     # Verify that both normal and override detection work in repository scan
     assert_match(/src\/app\.rb \[Extension\]/, stdout, "Should show Extension strategy for Ruby file")
-    assert_match(/config\.config \[GitAttributes\]/, stdout, "Should show GitAttributes strategy for overridden file")
+    assert_match(/config\.config \[.* \(overridden by \.gitattributes\)\]/, stdout, "Should show override for overridden file")
   end
 end