Merge pull request #1 from Cutlery-Drawer/typespec-fixes

Fix pedantic test failures for github-linguist#6775
timotheeguerin · Apr 4, 2024 · b6a5c6b · b6a5c6b
2 parents d9d1447 + 392acb1
commit b6a5c6b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 25 deletions.
diff --git a/lib/linguist/heuristics.yml b/lib/linguist/heuristics.yml
@@ -746,6 +746,12 @@ disambiguations:
   - language: XML
     pattern: '<TS\b'
   - language: TypeScript
+- extensions: ['.tsp']
+  rules:
+  - language: TypeSpec
+    pattern: '^(import|using|namespace|interface|op|model|scalar|alias|union|enum)\s'
+  - language: TSPLIB data
+    pattern: '^(NAME|TYPE|DIMENSION|EDGE_WEIGHT_TYPE|EDGE_WEIGHT_FORMAT)\s*:'
 - extensions: ['.tst']
   rules:
   - language: GAP
@@ -841,12 +847,6 @@ disambiguations:
   - language: JSON
     pattern: '\"modelName\"\:\s*\"GM'
   - language: Yacc
-- extensions: ['.tsp']
-  rules:
-  - language: TypeSpec
-    pattern: '^(import|using|namespace|interface|op|model|scalar|alias|union|enum)\s'
-  - language: TSPLIB data
-    pattern: '^(NAME|TYPE|DIMENSION|EDGE_WEIGHT_TYPE|EDGE_WEIGHT_FORMAT)\s*:'
 named_patterns:
   cpp:
   - '^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>'

diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
@@ -7001,6 +7001,16 @@ TOML:
   codemirror_mode: toml
   codemirror_mime_type: text/x-toml
   language_id: 365
+TSPLIB data:
+  aliases:
+  - travelling salesman problem
+  - traveling salesman problem
+  type: data
+  extensions:
+  - ".tsp"
+  tm_scope: none
+  ace_mode: text
+  language_id: 89289301
 TSQL:
   type: programming
   color: "#e38c00"
@@ -7292,6 +7302,16 @@ TypeScript:
   codemirror_mode: javascript
   codemirror_mime_type: application/typescript
   language_id: 378
+TypeSpec:
+  type: programming
+  color: "#4A3665"
+  aliases:
+  - tsp
+  extensions:
+  - ".tsp"
+  tm_scope: source.tsp
+  ace_mode: text
+  language_id: 952272597
 Typst:
   type: programming
   color: "#239dad"
@@ -8412,22 +8432,3 @@ xBase:
   tm_scope: source.harbour
   ace_mode: text
   language_id: 421
-TypeSpec:
-  type: programming
-  color: "#4A3665"
-  aliases:
-  - tsp
-  extensions:
-  - ".tsp"
-  tm_scope: source.tsp
-  ace_mode: text
-  language_id: 952272597
-TSPLIB data:
-  aliases:
-  - travelling salesman problem
-  - traveling salesman problem
-  type: data
-  extensions:
-  - ".tsp"
-  ace_mode: text
-  language_id: 89289301
diff --git a/samples/TravelingSalesmanProblem/att48.tsp → samples/TSPLIB data/att48.tsp b/samples/TravelingSalesmanProblem/att48.tsp → samples/TSPLIB data/att48.tsp
diff --git a/...es/TravelingSalesmanProblem/dantzig42.tsp → samples/TSPLIB data/dantzig42.tsp b/...es/TravelingSalesmanProblem/dantzig42.tsp → samples/TSPLIB data/dantzig42.tsp
diff --git a/test/test_heuristics.rb b/test/test_heuristics.rb
@@ -991,6 +991,13 @@ def test_ts_by_heuristics
     })
   end
 
+  def test_tsp_by_heuristics
+    assert_heuristics({
+      "TypeSpec" => all_fixtures("TypeSpec", "*.tsp"),
+      "TSPLIB data" => all_fixtures("TSPLIB data", "*.tsp")
+    })
+  end
+
   def test_tst_by_heuristics
     assert_heuristics({
       "GAP" => all_fixtures("GAP", "*.tst"),