From e018b4322e61e4a776f1bdaf160efbe05281beb0 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Sun, 19 Apr 2015 13:28:09 +0200 Subject: [PATCH] Improve .asc heuristic for Public Key. --- lib/linguist/heuristics.rb | 6 +++--- test/test_heuristics.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/linguist/heuristics.rb b/lib/linguist/heuristics.rb index e342e616..2002d51b 100644 --- a/lib/linguist/heuristics.rb +++ b/lib/linguist/heuristics.rb @@ -155,12 +155,12 @@ module Linguist end disambiguate "AsciiDoc", "AGS Script", "Public Key" do |data| - if /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data) + if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data) + Language["Public Key"] + elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data) Language["AsciiDoc"] elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data) Language["AGS Script"] - elsif /^-----BEGIN/.match(data) - Language["Public Key"] end end diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb index b3197c69..4a156445 100644 --- a/test/test_heuristics.rb +++ b/test/test_heuristics.rb @@ -77,7 +77,7 @@ class TestHeuristcs < Minitest::Test assert_heuristics({ "AsciiDoc" => "AsciiDoc/list.asc", "AGS Script" => "AGS Script/GlobalScript.asc", - "Public Key" => "Public Key/sunCert.asc" + "Public Key" => all_fixtures("Public Key", "*.asc") }) end