fix: lint Objective-C header files (#31938)

Co-authored-by: Milan Burda <milan.burda@gmail.com>
electron · Nov 22, 2021 · 7bf1d3c · 7bf1d3c
1 parent 92969d6
commit 7bf1d3c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/script/lint.js b/script/lint.js
@@ -14,10 +14,6 @@ const DEPOT_TOOLS = path.resolve(SOURCE_ROOT, '..', 'third_party', 'depot_tools'
 
 const IGNORELIST = new Set([
   ['shell', 'browser', 'resources', 'win', 'resource.h'],
-  ['shell', 'browser', 'notifications', 'mac', 'notification_center_delegate.h'],
-  ['shell', 'browser', 'ui', 'cocoa', 'event_dispatching_window.h'],
-  ['shell', 'browser', 'ui', 'cocoa', 'NSColor+Hex.h'],
-  ['shell', 'browser', 'ui', 'cocoa', 'NSString+ANSI.h'],
   ['shell', 'common', 'node_includes.h'],
   ['spec', 'static', 'jquery-2.0.3.min.js'],
   ['spec', 'ts-smoke', 'electron', 'main.ts'],
@@ -81,7 +77,7 @@ const LINTERS = [{
 }, {
   key: 'objc',
   roots: ['shell'],
-  test: filename => filename.endsWith('.mm'),
+  test: filename => filename.endsWith('.mm') || (filename.endsWith('.h') && isObjCHeader(filename)),
   run: (opts, filenames) => {
     if (opts.fix) {
       spawnAndCheckExitCode('python', ['script/run-clang-format.py', '--fix', ...filenames]);
@@ -95,7 +91,7 @@ const LINTERS = [{
       '-whitespace/indent',
       '-whitespace/parens'
     ];
-    cpplint(['--extensions=mm', `--filter=${filter.join(',')}`, ...filenames]);
+    cpplint(['--extensions=mm,h', `--filter=${filter.join(',')}`, ...filenames]);
   }
 }, {
   key: 'python',

diff --git a/shell/browser/mac/electron_application.h b/shell/browser/mac/electron_application.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#ifndef SHELL_BROWSER_MAC_ELECTRON_APPLICATION_H_
+#define SHELL_BROWSER_MAC_ELECTRON_APPLICATION_H_
+
 #include "base/callback.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/mac/scoped_sending_event.h"
@@ -45,3 +48,5 @@
                  withUserInfo:(NSDictionary*)userInfo;
 
 @end
+
+#endif  // SHELL_BROWSER_MAC_ELECTRON_APPLICATION_H_
diff --git a/shell/browser/mac/electron_application_delegate.h b/shell/browser/mac/electron_application_delegate.h
@@ -2,6 +2,9 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
+#ifndef SHELL_BROWSER_MAC_ELECTRON_APPLICATION_DELEGATE_H_
+#define SHELL_BROWSER_MAC_ELECTRON_APPLICATION_DELEGATE_H_
+
 #import <Cocoa/Cocoa.h>
 
 #import "shell/browser/ui/cocoa/electron_menu_controller.h"
@@ -15,3 +18,5 @@
 - (void)setApplicationDockMenu:(electron::ElectronMenuModel*)model;
 
 @end
+
+#endif  // SHELL_BROWSER_MAC_ELECTRON_APPLICATION_DELEGATE_H_
diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
-#define SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#ifndef SHELL_BROWSER_UI_COCOA_ELECTRON_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#define SHELL_BROWSER_UI_COCOA_ELECTRON_INSPECTABLE_WEB_CONTENTS_VIEW_H_
 
 #import <AppKit/AppKit.h>
 
@@ -52,4 +52,4 @@ using electron::InspectableWebContentsViewMac;
 
 @end
 
-#endif  // SHELL_BROWSER_UI_COCOA_BRY_INSPECTABLE_WEB_CONTENTS_VIEW_H_
+#endif  // SHELL_BROWSER_UI_COCOA_ELECTRON_INSPECTABLE_WEB_CONTENTS_VIEW_H_