From 650daaff63503f6426f64b12d8b33cfca6ef7185 Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Wed, 19 Jan 2022 21:46:43 +0000 Subject: [PATCH] fix(#161): Fixed issue with `options.ignorews` (#162) --- CONTRIBUTING.md | 2 +- git-conventional-commits.json | 2 ++ src/lcs.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab78fef..4b0dd6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,4 +8,4 @@ npm run test ## Conventional commits -Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0). +Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0), and [standard-version](https://www.npmjs.com/package/standard-version). diff --git a/git-conventional-commits.json b/git-conventional-commits.json index 1ef7b7a..43c39ae 100644 --- a/git-conventional-commits.json +++ b/git-conventional-commits.json @@ -4,6 +4,8 @@ "build", "chore", "ci", + "feat", + "fix", "docs", "style", "refactor", diff --git a/src/lcs.js b/src/lcs.js index a8fa9b4..5205fe9 100644 --- a/src/lcs.js +++ b/src/lcs.js @@ -3,7 +3,7 @@ const DiffParser = require('./diff-parser'); function LCS(x, y, options) { function getPositionOfWords(text, options) { - var exp = new RegExp(/\w+/g); + var exp = new RegExp(/[^\s]/g); var map = {}; var match; var item = 0;