From 2849146823f9d05c667814914cdcdd53781d7252 Mon Sep 17 00:00:00 2001 From: Boris Tsirkin Date: Thu, 9 Jan 2025 07:26:06 -0800 Subject: [PATCH] Disable clang-format in Matlab files Matlab files extension is the same as ObjC, which is .m This makes clang-format think that those files are ObjC and then it wrongly formats them, leading to output that doesn't compile at all. It's a known issue and the solution is to disable it in Matlab files. I don't want to disable ObjC in whole folders, because of 2 reasons: 1) I want ObjC to be properly formatted if new files are added in the future 2) C++ header files are interpreted as ObjC and it will disable their formatting According to clang documentation (https://clang.llvm.org/docs/ClangFormatStyleOptions.html#disabling-formatting-on-a-piece-of-code), we can disable formatting inline. However, comments in Matlab are prefixed with `%` and not `//`, so I thought of a kinda hacky solution, which is `% // clang-format off`, and it works perfectly. No-Iwyu: Includes didn't change and it isn't related to formatting Bug: webrtc:42225392 Change-Id: I281462fd1aecd3ff0428e6ee974514ebabc696ec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/374060 Reviewed-by: Danil Chapovalov Reviewed-by: Harald Alvestrand Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/main@{#43700} --- modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m | 1 + modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m | 1 + modules/audio_processing/test/apmtest.m | 1 + tools_webrtc/matlab/maxUnwrap.m | 1 + tools_webrtc/matlab/parseLog.m | 1 + tools_webrtc/matlab/rtpAnalyze.m | 1 + 6 files changed, 6 insertions(+) diff --git a/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m b/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m index 031d8a39ee..26391243f2 100644 --- a/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m +++ b/modules/audio_coding/neteq/test/delay_tool/parse_delay_file.m @@ -1,3 +1,4 @@ +% // clang-format off % % Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. % diff --git a/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m b/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m index 86d533fbeb..ff0bca8b8d 100644 --- a/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m +++ b/modules/audio_coding/neteq/test/delay_tool/plot_neteq_delay.m @@ -1,3 +1,4 @@ +% // clang-format off % % Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. % diff --git a/modules/audio_processing/test/apmtest.m b/modules/audio_processing/test/apmtest.m index 1c8183c3ec..1367295d5d 100644 --- a/modules/audio_processing/test/apmtest.m +++ b/modules/audio_processing/test/apmtest.m @@ -1,3 +1,4 @@ +% // clang-format off % % Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. % diff --git a/tools_webrtc/matlab/maxUnwrap.m b/tools_webrtc/matlab/maxUnwrap.m index 276c9523a4..cda48278b8 100644 --- a/tools_webrtc/matlab/maxUnwrap.m +++ b/tools_webrtc/matlab/maxUnwrap.m @@ -1,3 +1,4 @@ +% // clang-format off function sequence = maxUnwrap(sequence, max) % % sequence = maxUnwrap(sequence, max) diff --git a/tools_webrtc/matlab/parseLog.m b/tools_webrtc/matlab/parseLog.m index 5d4c3f7bc1..62c9388621 100644 --- a/tools_webrtc/matlab/parseLog.m +++ b/tools_webrtc/matlab/parseLog.m @@ -1,3 +1,4 @@ +% // clang-format off function parsed = parseLog(filename) % % parsed = parseLog(filename) diff --git a/tools_webrtc/matlab/rtpAnalyze.m b/tools_webrtc/matlab/rtpAnalyze.m index c51af9cca5..c64756579e 100644 --- a/tools_webrtc/matlab/rtpAnalyze.m +++ b/tools_webrtc/matlab/rtpAnalyze.m @@ -1,3 +1,4 @@ +% // clang-format off function rtpAnalyze( input_file ) %RTP_ANALYZE Analyze RTP stream(s) from a txt file % The function takes the output from the command line tool rtp_analyze