Переглянути джерело

Merge pull request #185 from vmarkovtsev/master

Use enry 1.6.8
Vadim Markovtsev 6 роки тому
батько
коміт
d80605933b
3 змінених файлів з 5 додано та 8 видалено
  1. 3 3
      Gopkg.lock
  2. 1 1
      Gopkg.toml
  3. 1 4
      internal/plumbing/languages.go

+ 3 - 3
Gopkg.lock

@@ -467,7 +467,7 @@
   revision = "a7f18ead1433a139742a8b42ce7a059cfb484d60"
 
 [[projects]]
-  digest = "1:bdce03a1ad3dbb484e748b871f7069cefe3a8e111296e494a58bc7145cfa112e"
+  digest = "1:056502949d8cff87f3c4b90ce1f1885b4c0a0566cf59ba20dea835f3be94a18d"
   name = "gopkg.in/src-d/enry.v1"
   packages = [
     ".",
@@ -476,8 +476,8 @@
     "regex",
   ]
   pruneopts = "UT"
-  revision = "8953e0e19a9a08c69113f672fbd89f6082b379d5"
-  version = "v1.6.7"
+  revision = "fe18dc0830edf4f567b398c8e2b5500af239623a"
+  version = "v1.6.8"
 
 [[projects]]
   branch = "master"

+ 1 - 1
Gopkg.toml

@@ -63,7 +63,7 @@
   name = "gopkg.in/cheggaaa/pb.v1"
 
 [[constraint]]
-  version = "v1.6.7"
+  version = "v1.6.8"
   name = "gopkg.in/src-d/enry.v1"
 
 [[constraint]]

+ 1 - 4
internal/plumbing/languages.go

@@ -101,10 +101,7 @@ func (langs *LanguagesDetection) detectLanguage(name string, blob *CachedBlob) s
 	if err == ErrorBinary {
 		return ""
 	}
-	data := make([]byte, len(blob.Data))
-	copy(data, blob.Data)
-	// FIXME(vmarkovtsev): use the original blob.Data once https://github.com/src-d/enry/issues/196 is fixed
-	lang := enry.GetLanguage(path.Base(name), data)
+	lang := enry.GetLanguage(path.Base(name), blob.Data)
 	return lang
 }