fix: add check on closing quote

Author: meinradandermatt

spec/clipboard.spec.js

@@ -302,6 +302,42 @@ describe('Clipboard', function () {
         expect(block).toEqual(`It’s a cat’s world.`)
       })
 
+      it('does not replace two apostrophe with quotes inside quotes', function () {
+        const updatedConfig = cloneDeep(config)
+        updatedConfig.pastedHtmlRules.replaceQuotes = {
+          quotes: ['«', '»'],
+          singleQuotes: ['‹', '›'],
+          apostrophe: '’'
+        }
+
+        updateConfig(updatedConfig)
+        const block = extractSingleBlock(`'It's a cat's world.'`)
+        expect(block).toEqual(`‹It’s a cat’s world.›`)
+      })
+
+      it('does not replace apostrophe at the beginning or end with quotes', function () {
+        const updatedConfig = cloneDeep(config)
+        updatedConfig.pastedHtmlRules.replaceQuotes = {
+          quotes: ['«', '»'],
+          singleQuotes: ['‹', '›'],
+          apostrophe: '’'
+        }
+
+        updateConfig(updatedConfig)
+        const block = extractSingleBlock(`Can I ask you somethin'? “'Twas the night before Christmas,” he said.`)
+        expect(block).toEqual(`Can I ask you somethin’? «’Twas the night before Christmas,» he said.`)
+      })
+
+      it('does not replace apostrophe at the beginning or end with quotes', function () {
+        const block = extractSingleBlock(`Gehen S' 'nauf!`)
+        expect(block).toEqual(`Gehen S’ ’nauf!`)
+      })
+
+      it('replaces quotes with punctuation after the closing quote', function () {
+        const block = extractSingleBlock(`Beginning of the sentence "inside quote".`)
+        expect(block).toEqual(`Beginning of the sentence “inside quote”.`)
+      })
+
       it('replaces nested quotes with single quotes inside nested', function () {
         const block = extractSingleBlock(`text outside "text 'inside „second inside text“'"`)
         expect(block).toEqual('text outside “text ‘inside “second inside text”’”')

src/quotes.js

@@ -25,6 +25,10 @@ const quotesRegex = /([‘’‹›‚'«»"“”„])(?![^<]*?>)/g
 // whitespace end of tag, or any dash (normal, en or em-dash)
 // or any opening double quote
 const beforeOpeningQuote = /\s|[>\-–—«»”"“„]/
+
+// whitespace begin of tag, or any dash (normal, en or em-dash)
+// or any closing quote, or any punctuation
+const afterClosingQuote = /\s|[<\-–—«»”"“‘’‹›'.;?:,]/
 let replacements
 
 export function replaceAllQuotes (str, replaceQuotesRules) {
@@ -80,11 +84,13 @@ function findClosingQuote (matches, position) {
   const possibleClosingSingleQuotes = getPossibleClosingQuotes(openingQuote, singleQuotePairs)
   const possibleClosingDoubleQuotes = getPossibleClosingQuotes(openingQuote, doubleQuotePairs)
   for (let i = position + 1; i < matches.length; i++) {
-    if (possibleClosingSingleQuotes.includes(matches[i].char)) {
-      return {position: i, type: 'single'}
-    }
-    if (possibleClosingDoubleQuotes.includes(matches[i].char)) {
-      return {position: i, type: 'double'}
+    if ((matches[i].after && afterClosingQuote.test(matches[i].after)) || !matches[i].after) {
+      if (possibleClosingSingleQuotes.includes(matches[i].char)) {
+        return {position: i, type: 'single'}
+      }
+      if (possibleClosingDoubleQuotes.includes(matches[i].char)) {
+        return {position: i, type: 'double'}
+      }
     }
   }
 }