From b709688d8b09d334b7fd20281df0aa68234bf59b Mon Sep 17 00:00:00 2001 From: steelbrain Date: Fri, 22 Jan 2016 13:19:33 -0700 Subject: [PATCH 1/3] :bug: Do not add a g flag to regex if it already exists --- lib/helpers.js | 4 +++- src/helpers.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/helpers.js b/lib/helpers.js index b5f7342..53eb715 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -388,7 +388,9 @@ function parse(data, regex) { } const options = assign({ flags: '' }, opts); - options.flags += 'g'; + if (options.flags.indexOf('g') === -1) { + options.flags += 'g'; + } const messages = []; const compiledRegexp = NamedRegexp(regex, options.flags); diff --git a/src/helpers.js b/src/helpers.js index be6e2ae..21ad5a0 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -332,7 +332,9 @@ export function parse(data, regex, opts = {}) { } const options = assign({flags: ''}, opts) - options.flags += 'g' + if (options.flags.indexOf('g') === -1) { + options.flags += 'g' + } const messages = [] const compiledRegexp = NamedRegexp(regex, options.flags) From 5b2e01dd45bd0b339e6ef2b7d820b61c737e1211 Mon Sep 17 00:00:00 2001 From: steelbrain Date: Fri, 22 Jan 2016 13:20:18 -0700 Subject: [PATCH 2/3] :new: Add spec for change --- spec/helper-spec.coffee | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/spec/helper-spec.coffee b/spec/helper-spec.coffee index 4450580..3623ea1 100644 --- a/spec/helper-spec.coffee +++ b/spec/helper-spec.coffee @@ -152,6 +152,17 @@ describe 'linter helpers', -> results = helpers.parse(input, regex, {flags: "i"}) expect(results).toEqual(output) + regex = 'type:(?.+) message:(?.+)' + input = 'TYPE:type message:message' + output = [( + type: 'type' + text: 'message' + filePath: null + range: [[0, 0], [0, 0]] + )] + results = helpers.parse(input, regex, {flags: "gi"}) + expect(results).toEqual(output) + describe '::find', -> it 'cries when no argument is passed', -> expect -> From 778b2269507cf7f521191257d9b8996adc3834f7 Mon Sep 17 00:00:00 2001 From: steelbrain Date: Fri, 22 Jan 2016 13:20:51 -0700 Subject: [PATCH 3/3] :memo: Document change in changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a14870..6049c57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 4.3.4 + +* Do not add `g` flag to regex if it already exists + ### 4.3.3 * Switch to `named-js-regexp` instead of `xregexp` for `parse` method