diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index b218ebe623..881ea1df3e 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -52,7 +52,7 @@ jobs: path: printer-linter-result/ - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: result.yml diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index 3c3879b046..6a79714e59 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -73,7 +73,7 @@ jobs: unzip printer-linter-result.zip -d printer-linter-result - name: Run clang-tidy-pr-comments action - uses: platisd/clang-tidy-pr-comments@master + uses: platisd/clang-tidy-pr-comments@fix_suggestions_for_multiline_comments with: github_token: ${{ secrets.GITHUB_TOKEN }} clang_tidy_fixes: printer-linter-result/fixes.yml diff --git a/printer-linter/src/printerlinter/linters/defintion.py b/printer-linter/src/printerlinter/linters/defintion.py index d684cd98e9..b0201976be 100644 --- a/printer-linter/src/printerlinter/linters/defintion.py +++ b/printer-linter/src/printerlinter/linters/defintion.py @@ -45,24 +45,17 @@ class Definition(Linter): if is_redefined: redefined = re.compile(r'.*(\"' + key + r'\"[\s\:\S]*?)\{[\s\S]*?\},?') found = redefined.search(self._content) - # TODO: Figure out a way to support multiline fixes in the PR review GH Action, for now suggest no fix to ensure no ill-formed json are created - # see: https://github.com/platisd/clang-tidy-pr-comments/issues/37 - if len(found.group().splitlines()) > 1: - replacements = [] - else: - replacements = [Replacement( - file = self._file, - offset = found.span(1)[0], - length = len(found.group()), - replacement_text = "")] - yield Diagnostic( file = self._file, diagnostic_name = "diagnostic-definition-redundant-override", message = f"Overriding {key} with the same value ({value}) as defined in parent definition: {definition['inherits']}", level = "Warning", offset = found.span(0)[0], - replacements = replacements + replacements = [Replacement( + file = self._file, + offset = found.span(1)[0], + length = len(found.group()), + replacement_text = "")] ) def _loadDefinitionFiles(self, definition_file) -> None: