Merge remote-tracking branch 'upstream/master'

LufsX · Mar 9, 2024 · 1d42abc · 1d42abc
2 parents 4c84287 + baeb420
commit 1d42abc
Show file tree

Hide file tree

Showing 20 changed files with 1,743 additions and 1,305 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: Chromium
+SortIncludes: false
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,3 @@
+# apply clang format
+ce94f9c4403b9c33d5e251fc7f1e15c44725d881
+
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -12,6 +12,12 @@ jobs:
         with:
           submodules: true
 
+      - name: Install clang-format
+        run: brew install clang-format
+
+      - name: Lint
+        run: make clang-format-lint
+
       - name: Configure build environment
         run: |
           echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV

diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml
@@ -9,6 +9,12 @@ jobs:
         with:
           submodules: true
 
+      - name: Install clang-format
+        run: brew install clang-format
+
+      - name: Lint
+        run: make clang-format-lint
+
       - name: Configure build environment
         run: |
           echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV

diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -15,6 +15,12 @@ jobs:
           fetch-depth: 0
           submodules: true
 
+      - name: Install clang-format
+        run: brew install clang-format
+
+      - name: Lint
+        run: make clang-format-lint
+
       - name: Build Squirrel
         run: ./action-build.sh archive
 

diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ $(RIME_DEPS):
 	$(MAKE) -C librime deps
 
 librime: $(RIME_DEPS)
-	$(MAKE) -C librime install
+	$(MAKE) -C librime release install
 	$(MAKE) copy-rime-binaries
 
 copy-rime-binaries:
@@ -78,6 +78,12 @@ copy-opencc-data:
 
 deps: librime data
 
+clang-format-lint:
+	find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format -Werror --dry-run || { echo Please lint your code by '"'"make clang-format-apply"'"'.; false; }
+
+clang-format-apply:
+	find . -name '*.m' -o -name '*.h' -maxdepth 1 | xargs clang-format --verbose -i
+
 ifdef ARCHS
 BUILD_SETTINGS += ARCHS="$(ARCHS)"
 BUILD_SETTINGS += ONLY_ACTIVE_ARCH=NO

diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj
@@ -84,6 +84,7 @@
 		A4FC48CB0F6530EF0069BE81 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A4FC48C90F6530EF0069BE81 /* Localizable.strings */; };
 		D26434552706A15100857391 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26434542706A15100857391 /* QuartzCore.framework */; };
 		E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E93074B60A5C264700470842 /* InputMethodKit.framework */; };
+		F45E005F2B8CA81C00179B75 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F45E005E2B8CA81C00179B75 /* UserNotifications.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -278,6 +279,7 @@
 		A4FC48CA0F6530EF0069BE81 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D26434542706A15100857391 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		E93074B60A5C264700470842 /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = /System/Library/Frameworks/InputMethodKit.framework; sourceTree = "<absolute>"; };
+		F45E005E2B8CA81C00179B75 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -287,6 +289,7 @@
 			files = (
 				D26434552706A15100857391 /* QuartzCore.framework in Frameworks */,
 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				F45E005F2B8CA81C00179B75 /* UserNotifications.framework in Frameworks */,
 				E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */,
 				A4B8E1B30F645B870094E08B /* Carbon.framework in Frameworks */,
 				447765C925C30E97002415AF /* Sparkle.framework in Frameworks */,
@@ -379,6 +382,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				F45E005E2B8CA81C00179B75 /* UserNotifications.framework */,
 				D26434542706A15100857391 /* QuartzCore.framework */,
 				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
 				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,

diff --git a/SquirrelApplicationDelegate.h b/SquirrelApplicationDelegate.h
@@ -3,33 +3,35 @@
 @class SquirrelConfig;
 @class SquirrelPanel;
 
-// Note: the SquirrelApplicationDelegate is instantiated automatically as an outlet of NSApp's instance
+// Note: the SquirrelApplicationDelegate is instantiated automatically as an
+// outlet of NSApp's instance
 @interface SquirrelApplicationDelegate : NSObject
 
-@property(nonatomic, copy) IBOutlet NSMenu *menu;
-@property(nonatomic, strong) IBOutlet SquirrelPanel *panel;
-@property(nonatomic, strong) IBOutlet id updater;
+@property(nonatomic, weak) IBOutlet NSMenu* menu;
+@property(nonatomic, weak) IBOutlet SquirrelPanel* panel;
+@property(nonatomic, weak) IBOutlet id updater;
 
-@property(nonatomic, readonly, strong) SquirrelConfig *config;
+@property(nonatomic, readonly, strong) SquirrelConfig* config;
 @property(nonatomic, readonly) BOOL enableNotifications;
 
--(IBAction)deploy:(id)sender;
--(IBAction)syncUserData:(id)sender;
--(IBAction)configure:(id)sender;
--(IBAction)openWiki:(id)sender;
+- (IBAction)deploy:(id)sender;
+- (IBAction)syncUserData:(id)sender;
+- (IBAction)configure:(id)sender;
+- (IBAction)openWiki:(id)sender;
 
--(void)setupRime;
--(void)startRimeWithFullCheck:(BOOL)fullCheck;
--(void)loadSettings;
--(void)loadSchemaSpecificSettings:(NSString *)schemaId;
+- (void)setupRime;
+- (void)startRimeWithFullCheck:(BOOL)fullCheck;
+- (void)loadSettings;
+- (void)loadSchemaSpecificSettings:(NSString*)schemaId;
 
-@property (nonatomic, readonly) BOOL problematicLaunchDetected;
+@property(nonatomic, readonly) BOOL problematicLaunchDetected;
 
 @end
 
 @interface NSApplication (SquirrelApp)
 
-@property(nonatomic, readonly, strong) SquirrelApplicationDelegate *squirrelAppDelegate;
+@property(nonatomic, readonly, strong)
+    SquirrelApplicationDelegate* squirrelAppDelegate;
 
 @end