Skip to content

Commit 4a57c05

Browse files
committed
Remove the dmp workaround and update deps
Signed-off-by: Vadim Markovtsev <vadim@sourced.tech>
1 parent 6bb4705 commit 4a57c05

36 files changed

+4203
-108
lines changed

Gopkg.lock

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
name = "github.com/jdkato/prose"
3838
version = "1.1.0"
3939

40-
[[constraint]]
40+
[[override]]
4141
name = "github.com/sergi/go-diff"
42-
version = "1.0.0"
42+
revision = "da645544ed44df016359bd4c0e3dc60ee3a0da43"
4343

4444
[[constraint]]
4545
name = "github.com/stretchr/testify"
@@ -65,6 +65,10 @@
6565
name = "gopkg.in/src-d/go-git.v4"
6666
version = "4.1.0"
6767

68+
[[constraint]]
69+
name = "github.com/spf13/pflag"
70+
branch = "master"
71+
6872
[prune]
6973
go-tests = true
7074
unused-packages = true

db.go

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -201,44 +201,12 @@ func (db *LicenseDatabase) QueryLicenseText(text string) map[string]float32 {
201201
tokarr[len(db.tokens)] = "!"
202202
println(dmp.DiffPrettyText(dmp.DiffCharsToLines(diff, tokarr)))
203203
}
204-
205-
// TODO(vmarkovtsev): replace with dmp.DiffLevenshtein when this PR is merged:
206-
// https://github.com/sergi/go-diff/pull/90
207-
distance := diffLevenshtein(diff)
204+
distance := dmp.DiffLevenshtein(diff)
208205
candidates[key] = float32(1) - float32(distance)/float32(len(myRunes))
209206
}
210207
return candidates
211208
}
212209

213-
func diffLevenshtein(diffs []diffmatchpatch.Diff) int {
214-
levenshtein := 0
215-
insertions := 0
216-
deletions := 0
217-
max := func(a, b int) int {
218-
if a < b {
219-
return b
220-
}
221-
return a
222-
}
223-
224-
for _, aDiff := range diffs {
225-
switch aDiff.Type {
226-
case diffmatchpatch.DiffInsert:
227-
insertions += len(aDiff.Text)
228-
case diffmatchpatch.DiffDelete:
229-
deletions += len(aDiff.Text)
230-
case diffmatchpatch.DiffEqual:
231-
// A deletion and an insertion is one substitution.
232-
levenshtein += max(insertions, deletions)
233-
insertions = 0
234-
deletions = 0
235-
}
236-
}
237-
238-
levenshtein += max(insertions, deletions)
239-
return levenshtein
240-
}
241-
242210
// QueryReadmeText tries to detect licenses mentioned in the README.
243211
func (db *LicenseDatabase) QueryReadmeText(text string) map[string]float32 {
244212
return investigateReadmeFile(text, db.nameSubstrings, db.nameSubstringSizes)

vendor/github.com/sergi/go-diff/diffmatchpatch/diff.go

Lines changed: 71 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/sergi/go-diff/diffmatchpatch/operation_string.go

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spf13/pflag/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spf13/pflag/.travis.yml

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)