Merge pull request #48 from GiraffeKey/feat/extra-brackets

feat(extra-brackets): fix extra brackets

Author: Berkmann18

index.js

@@ -55,6 +55,8 @@ const comment = (err) => err.found === '/';
 
 const ops = (err) => ['+', '-', '*', '/', '>', '<', '~', '|', '&', '^'].includes(err.found);
 
+const extraBrackets = (err) => err.found === '}';
+
 const runFixer = ({ verbose, lines, start, err }) => {
   /* eslint-disable security/detect-object-injection */
   let fixedData = [...lines];
@@ -80,6 +82,8 @@ const runFixer = ({ verbose, lines, start, err }) => {
     fixedData = fixer.fixComment({ start, fixedData, verbose });
   } else if (ops(err)) {
     fixedData = fixer.fixOpConcat({ start, fixedData, verbose });
+  } else if (extraBrackets(err)) {
+    fixedData = fixer.fixExtraCurlyBrackets({ start, fixedData, verbose });
   } else throw new Error(`Unsupported issue: ${err.message} (please open an issue at the repo)`);
   return fixedData;
 };

src/__tests__/index.js

@@ -289,6 +289,12 @@ describe('fix wrong brackets', () => {
       { verbose: true }
     );
   });
+
+  it('extra brackets', () => {
+    shouldHaveChanged('extraBrackets', {
+      error: 'extra brackets'
+    });
+  });
 });
 
 describe('comments', () => {

src/fixer.js

@@ -156,6 +156,27 @@ const fixOpConcat = ({ start, fixedData, verbose }) => {
   return fixedData;
 };
 
+function fixExtraCurlyBrackets({ start, fixedData, verbose }) {
+  if (verbose) psw(chalk.magenta('Extra curly brackets'));
+
+  const targetLine = start.line - 1;
+  const fullData = fixedData.join('\n');
+  let fixedLine = removeLinebreak(fixedData[targetLine]);
+
+  const data = fullData.split('');
+  const openingCount = data.filter((c) => c === '{').length;
+  const closingCount = data.filter((c) => c === '}').length;
+  const bracketDiff = closingCount - openingCount;
+
+  for (let i = 0; i < bracketDiff; i++) {
+    const index = fixedLine.lastIndexOf('}');
+    fixedLine = fixedLine.slice(0, index) + fixedLine.slice(index + 1);
+  }
+
+  fixedData[targetLine] = fixedLine;
+  return fixedData;
+}
+
 module.exports = {
   fixExtraChar,
   fixSingleQuotes,
@@ -164,5 +185,6 @@ module.exports = {
   fixSquareBrackets,
   fixCurlyBrackets,
   fixComment,
-  fixOpConcat
+  fixOpConcat,
+  fixExtraCurlyBrackets
 };

test/samples/extraBrackets.json

@@ -0,0 +1,3 @@
+{
+	"error": "extra brackets"
+}}}