Add support for languages with extentions like test.d.ts such as type…

…script typings
boyter · Jul 25, 2018 · c8b2a70 · c8b2a70
1 parent 311dc1a
commit c8b2a70
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 10 deletions.
diff --git a/languages.json b/languages.json
@@ -81,6 +81,57 @@
       ]
     ]
   },
+  "TypeScript Typings": {
+    "line_comment": [
+      "//"
+    ],
+    "complexitychecks": [
+      "for ",
+      "for(",
+      "if ",
+      "if(",
+      "switch ",
+      "while ",
+      "else ",
+      "| ",
+      "|| ",
+      "& ",
+      "&& ",
+      "!= ",
+      "!== ",
+      "== ",
+      "=== ",
+      "foreach(",
+      "case ",
+      "case(",
+      "casex ",
+      "casex(",
+      "casez ",
+      "casez(",
+      "casexz ",
+      "casexz(",
+      "fork",
+      "?",
+      ":",
+      "inside",
+      "with"
+    ],
+    "extensions": [
+      "d.ts"
+    ],
+    "multi_line": [
+      [
+        "/*",
+        "*/"
+      ]
+    ],
+    "quotes": [
+      [
+        "\"",
+        "\""
+      ]
+    ]
+  },
   "Lisp": {
     "line_comment": [
       ";"

diff --git a/processor/constants.go b/processor/constants.go
diff --git a/processor/file.go b/processor/file.go
@@ -25,12 +25,15 @@ func getExtension(name string) string {
 		return extension.(string)
 	}
 
-	loc := strings.LastIndex(name, ".")
+	locs := strings.Split(name, ".")
 
-	if loc == -1 || loc == 0 {
+	switch {
+	case len(locs) == 0 || len(locs) == 1 || strings.LastIndex(name, ".") == 0:
 		extension = name
-	} else {
-		extension = name[loc+1:]
+	case len(locs) == 2:
+		extension = locs[len(locs)-1]
+	default:
+		extension = locs[len(locs)-2] + "." + locs[len(locs)-1]
 	}
 
 	extensionCache.Store(name, extension)
@@ -109,15 +112,20 @@ func walkDirectoryParallel(root string, output *chan *FileJob) {
 							if !info.IsDir() {
 								if gitignoreerror != nil || !gitignore.Match(filepath.Join(root, info.Name()), false) {
 
-									extension = getExtension(info.Name())
-
-									// If unknown lookup in case the full name matches
+									// Lookup in case the full name matches
 									language, ok := extensionLookup[strings.ToLower(info.Name())]
 
+									// If no match check if we have a matching extension
 									if !ok {
+										extension = getExtension(info.Name())
 										language, ok = extensionLookup[extension]
 									}
 
+									// Convert from d.ts to ts and check that in case of multiple extensions
+									if !ok {
+										language, ok = extensionLookup[getExtension(extension)]
+									}
+
 									if ok {
 										*output <- &FileJob{Location: root, Filename: info.Name(), Extension: extension, Language: language}
 									} else if Verbose {

diff --git a/processor/file_test.go b/processor/file_test.go
@@ -25,7 +25,7 @@ func TestGetExtensionNoExtension(t *testing.T) {
 
 func TestGetExtensionMultipleDots(t *testing.T) {
 	got := getExtension(".travis.yml")
-	expected := "yml"
+	expected := "travis.yml"
 
 	if got != expected {
 		t.Errorf("Expected %s got %s", expected, got)
@@ -34,7 +34,7 @@ func TestGetExtensionMultipleDots(t *testing.T) {
 
 func TestGetExtensionMultipleExtensions(t *testing.T) {
 	got := getExtension("something.go.yml")
-	expected := "yml"
+	expected := "go.yml"
 
 	if got != expected {
 		t.Errorf("Expected %s got %s", expected, got)
@@ -50,6 +50,25 @@ func TestGetExtensionStartsWith(t *testing.T) {
 	}
 }
 
+func TestGetExtensionTypeScriptDefinition(t *testing.T) {
+	got := getExtension("test.d.ts")
+	expected := "d.ts"
+
+	if got != expected {
+		t.Errorf("Expected %s got %s", expected, got)
+	}
+}
+
+func TestGetExtensionSecondPass(t *testing.T) {
+	got := getExtension("test.d.ts")
+	got = getExtension(got)
+	expected := "ts"
+
+	if got != expected {
+		t.Errorf("Expected %s got %s", expected, got)
+	}
+}
+
 func BenchmarkGetExtensionDifferent(b *testing.B) {
 	for i := 0; i < b.N; i++ {