Merge pull request #318 from atom/project-level-find-replace-regex-bug

Fix project-level find-and-replace regex bug

Author: darangi

spec/text-buffer-spec.js

@@ -2,13 +2,31 @@ const path = require('path')
 const TextBuffer = require('../src/text-buffer')
 
 describe('when a buffer is already open', () => {
+  const filePath = path.join(__dirname, 'fixtures', 'sample.js')
+  const buffer = new TextBuffer()
+
   it('replaces foo( with bar( using /\bfoo\\(\b/gim', () => {
-    const filePath = path.join(__dirname, 'fixtures', 'sample.js')
-    const buffer = new TextBuffer()
     buffer.setPath(filePath)
     buffer.setText('foo(x)')
     buffer.replace(/\bfoo\(\b/gim, 'bar(')
 
     expect(buffer.getText()).toBe('bar(x)')
   })
+
+  describe('Texts should be replaced properly with strings containing literals when using the regex option', () => {
+    it('replaces tstat_fvars()->curr_setpoint[HEAT_EN] with tstat_set_curr_setpoint($1, $2);', () => {
+      buffer.setPath(filePath)
+      buffer.setText('tstat_fvars()->curr_setpoint[HEAT_EN] = new_tptr->heat_limit;')
+      buffer.replace(/tstat_fvars\(\)->curr_setpoint\[(.+?)\] = (.+?);/, 'tstat_set_curr_setpoint($1, $2);')
+
+      expect(buffer.getText()).toBe('tstat_set_curr_setpoint(HEAT_EN, new_tptr->heat_limit);')
+    })
+
+    it('replaces atom/flight-manualatomio with $1', () => {
+      buffer.setText('atom/flight-manualatomio')
+      buffer.replace(/\.(atom)\./, '$1')
+
+      expect(buffer.getText()).toBe('atom/flight-manualatomio')
+    })
+  })
 })

src/text-buffer.js

@@ -1608,7 +1608,9 @@ class TextBuffer {
     let replacements = 0
 
     this.transact(() => {
-      return this.scan(regex, function ({replace}) {
+      return this.scan(regex, function ({matchText, replace}) {
+        const text = matchText.replace(regex, replacementText)
+        replacementText = text === matchText ? replacementText : text
         replace(replacementText)
         return replacements++
       })