diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index f3d39f082..fde264151 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -24,12 +24,12 @@ jobs: swiftlint - name: Unit Test env: - DEVELOPER_DIR: /Applications/Xcode_15.3.app + DEVELOPER_DIR: /Applications/Xcode_16.0-beta.app run: | set -o pipefail xcodebuild test -project CotEditor.xcodeproj -scheme CotEditor CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c - name: Unit Test for SyntaxMap run: | - cd SyntaxMap + cd Packages/SyntaxMap swift build - swift test 2>&1 | xcpretty -c + swift test diff --git a/.swiftlint.yml b/.swiftlint.yml index 69b0d978a..175de0ad2 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -1,5 +1,5 @@ deployment_target: - macOS_deployment_target: 13 + macOS_deployment_target: 14 excluded: - "*/.build" @@ -37,7 +37,6 @@ opt_in_rules: - legacy_multiple - let_var_whitespace - lower_acl_than_parent - - missing_docs - multiline_function_chains - multiline_parameters - multiline_parameters_brackets diff --git a/CHANGELOG.md b/CHANGELOG.md index 1236bfd9d..505aa3768 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,43 @@ # Change Log +4.9.0 (unreleased) +-------------------------- + +### New Features + +- Support __macOS 15 Sequoia__. +- [AppStore ver.] Now the user can donate to the CotEditor project via in-app purchase in the new Donate settings pane. +- Add new “Select Enclosing Symbols” and “Split Selection by Lines” commands to the Edit > Select menu. +- Support the alpha channel for the current line in theme settings. +- Add Assembly syntax. +- Add new “Resinifictrix (Dark)” theme. + + +### Improvements + +- Change the system requirement to __macOS 14 Sonoma and later__. +- Add “Select Column Up/Down“ commands to the Edit > Select menu. +- Change the unit of character ranges handled in CotEditor Scripting for AppleScript from UTF-16 based to the Unicode grapheme cluster-based (This is to follow the specification change in AppleScript 2.0 introduced in Mac OS X 10.5). +- Improve VoiceOver support in the Quick Action bar. +- Remove Solarized themes from the bundle. +- Update all the bundled themes to have a 70% opacity in the current line highlight. +- Improve the performance of counting values in the editor for the status bar and the document inspector to avoid flicking. +- Make more table columns sortable. +- [trivial] Organize the structure of the Edit menu. +- [trivial] Suppress display of the “Extracting” message on the navigation bar in instantaneous parsing. +- [trivial] Make names of code contributors in the About window selectable. +- [dev] Update the build environment to Xcode 16. +- [dev] Migrate all unit tests to Swift Testing. +- [dev] Migrate the navigation bar and the Snippets settings view to SwiftUI. + + +### TODO + +- Improve Assembly syntax. +- Localized strings added. + + + 4.8.6 (655) -------------------------- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fde4e74b6..200a8e7cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ Currently, the CotEditor project only accepts new localizations whose provider c You have two options to add a new localization to CotEditor.app. Choose one of them depending on your knowledge and preference: - Option 1: Add a new localization in Xcode by yourself and make a pull-request (for those who get used to git and Xcode projects): - - Open CotEditor.xcodeproj in Xcode, go to Project > CotEditor > Info > Localizations, and then add your language to the table. In the Resources group in the project, you can find all strings files (.xcstrings) both in the Localizations and Storyboards subgroups. The new language you added will automatically be appeared in the catalog list. Select your language and fill each cell of your language column in the table. Note that you don't need to localize the UnicodeBlock.strings file. It will be done by @1024jp based on the localization data by Apple. + - Open CotEditor.xcodeproj in Xcode, go to Project > CotEditor > Info > Localizations, and then add your language to the table. In the Resources group in the project, you can find all strings files (.xcstrings) both in the Localizations and Storyboards subgroups. The new language you added will automatically be appeared in the catalog list. Select your language and fill each cell of your language column in the table. Note that you don't need to localize the UnicodeBlock.strings file in Packages/Libraries/Sources/CharacterInfo/. It will be done by @1024jp based on the localization data by Apple. - CotEditor currently uses the String Catalog format (.xcstrings) first introduced in Xcode 15 released in 2023. cf. [Localizing and varying text with a string catalog](https://developer.apple.com/documentation/xcode/localizing-and-varying-text-with-a-string-catalog) - Option 2: Communicate with the maintainer personally and work with provided localization template (.xcloc file): - Send a message to the maintainer (@1024jp) either by creating a new issue on GitHub or by e-mail to ask to get the localization template (.xcloc file) for your language. When you receiving the .xcloc file, open it in Xcode and fill each cell of your language column in the tables. When finished, send back the template file to the maintainer. diff --git a/CotEditor.xcodeproj/project.pbxproj b/CotEditor.xcodeproj/project.pbxproj index 7e32cc5f8..a80b4f137 100644 --- a/CotEditor.xcodeproj/project.pbxproj +++ b/CotEditor.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 63; + objectVersion = 73; objects = { /* Begin PBXAggregateTarget section */ @@ -42,8 +42,8 @@ 2A0A602C27ABD74500725B70 /* FilterField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0A602A27ABD74500725B70 /* FilterField.swift */; }; 2A0BF8A81DD8E7F90088961B /* TextSizeTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0BF8A71DD8E7F90088961B /* TextSizeTouchBar.swift */; }; 2A0BF8A91DD8E7F90088961B /* TextSizeTouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0BF8A71DD8E7F90088961B /* TextSizeTouchBar.swift */; }; - 2A0DD6331E655C4A001CAAA3 /* TokenTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6321E655C4A001CAAA3 /* TokenTextView.swift */; }; - 2A0DD6341E655C4A001CAAA3 /* TokenTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6321E655C4A001CAAA3 /* TokenTextView.swift */; }; + 2A0DD6331E655C4A001CAAA3 /* TokenTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6321E655C4A001CAAA3 /* TokenTextEditor.swift */; }; + 2A0DD6341E655C4A001CAAA3 /* TokenTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6321E655C4A001CAAA3 /* TokenTextEditor.swift */; }; 2A0DD6361E655FE6001CAAA3 /* Tokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6351E655FE6001CAAA3 /* Tokenizer.swift */; }; 2A0DD6371E655FE6001CAAA3 /* Tokenizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A0DD6351E655FE6001CAAA3 /* Tokenizer.swift */; }; 2A1083F02944837E00751DAE /* InsetTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1083EF2944837E00751DAE /* InsetTextField.swift */; }; @@ -55,7 +55,7 @@ 2A10C5FA1FD25D04002AB5AE /* Selector+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A10C5F91FD25D04002AB5AE /* Selector+Codable.swift */; }; 2A10C5FB1FD25D04002AB5AE /* Selector+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A10C5F91FD25D04002AB5AE /* Selector+Codable.swift */; }; 2A10D10A1E708CDF0027192A /* KeyBindingTreeView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1081E708CDF0027192A /* KeyBindingTreeView.storyboard */; }; - 2A10D1281E714D230027192A /* ThemeView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1261E714D230027192A /* ThemeView.storyboard */; }; + 2A10D1281E714D230027192A /* ThemeListView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1261E714D230027192A /* ThemeListView.storyboard */; }; 2A10D1381E715E5B0027192A /* SyntaxListView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1361E715E5B0027192A /* SyntaxListView.storyboard */; }; 2A1125C123F180FF006A1DB2 /* LineRangeCacheableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1125C023F180FF006A1DB2 /* LineRangeCacheableTests.swift */; }; 2A1125C323F1A86B006A1DB2 /* LineRangeCacheable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1125C223F1A86B006A1DB2 /* LineRangeCacheable.swift */; }; @@ -64,8 +64,6 @@ 2A1125C723F6EFB2006A1DB2 /* URLDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1125C523F6EFB2006A1DB2 /* URLDetector.swift */; }; 2A11F2131E669BFA005E1675 /* PointerBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A11F2121E669BFA005E1675 /* PointerBridge.swift */; }; 2A11F2141E669BFA005E1675 /* PointerBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A11F2121E669BFA005E1675 /* PointerBridge.swift */; }; - 2A1235462121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1235452121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift */; }; - 2A1235472121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1235452121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift */; }; 2A1311D62127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1311D52127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift */; }; 2A1311D72127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1311D52127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift */; }; 2A158C1C2945A6B1000A4EC1 /* HeadingMenuItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A158C1B2945A6B1000A4EC1 /* HeadingMenuItem.swift */; }; @@ -99,11 +97,8 @@ 2A1893AA1FFF422D00AD244F /* LineSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1893A91FFF422D00AD244F /* LineSort.swift */; }; 2A1893AB1FFF422D00AD244F /* LineSort.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1893A91FFF422D00AD244F /* LineSort.swift */; }; 2A1893AD1FFF6A0100AD244F /* LineSortTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1893AC1FFF6A0100AD244F /* LineSortTests.swift */; }; - 2A18A5BF1C4A746A00BAD817 /* Encodings in Resources */ = {isa = PBXBuildFile; fileRef = 2A18A5BE1C4A746A00BAD817 /* Encodings */; }; 2A19AF862AE0D15300EFFDCB /* FormPopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A19AF852AE0D15300EFFDCB /* FormPopUpButton.swift */; }; 2A19AF872AE0D15300EFFDCB /* FormPopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A19AF852AE0D15300EFFDCB /* FormPopUpButton.swift */; }; - 2A1A4EAC24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1A4EAB24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift */; }; - 2A1A4EAD24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1A4EAB24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift */; }; 2A1A4EB024FB9D9300B50AA0 /* Combine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1A4EAF24FB9D9300B50AA0 /* Combine.swift */; }; 2A1A4EB124FB9D9300B50AA0 /* Combine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1A4EAF24FB9D9300B50AA0 /* Combine.swift */; }; 2A1ABC9B27F056E60054795D /* BidiScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1ABC9A27F056E60054795D /* BidiScrollView.swift */; }; @@ -137,8 +132,8 @@ 2A1FAD5820A74D0A00566D7C /* MutableCopying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1FAD5720A74D0A00566D7C /* MutableCopying.swift */; }; 2A1FAD5920A74D0A00566D7C /* MutableCopying.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1FAD5720A74D0A00566D7C /* MutableCopying.swift */; }; 2A2179F61A07093B002C4AB1 /* SyntaxMap.json in Resources */ = {isa = PBXBuildFile; fileRef = 2A2179F51A07093B002C4AB1 /* SyntaxMap.json */; }; - 2A222C3024FA8E0500251084 /* UserDefaults.Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A222C2F24FA8E0500251084 /* UserDefaults.Publisher.swift */; }; - 2A222C3124FA8E0500251084 /* UserDefaults.Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A222C2F24FA8E0500251084 /* UserDefaults.Publisher.swift */; }; + 2A21E6732BB44D5E0054C8A1 /* DonationSettings.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A21E6722BB44D5E0054C8A1 /* DonationSettings.xcstrings */; }; + 2A21E6742BB44D5E0054C8A1 /* DonationSettings.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A21E6722BB44D5E0054C8A1 /* DonationSettings.xcstrings */; }; 2A231A251E7B4EDC00C2A909 /* MultipleReplace+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A241E7B4EDC00C2A909 /* MultipleReplace+Codable.swift */; }; 2A231A261E7B4EDC00C2A909 /* MultipleReplace+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A241E7B4EDC00C2A909 /* MultipleReplace+Codable.swift */; }; 2A231A281E7BD82700C2A909 /* Binding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A271E7BD82700C2A909 /* Binding.swift */; }; @@ -149,6 +144,12 @@ 2A231A371E7C30F000C2A909 /* MultipleReplaceSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A351E7C30F000C2A909 /* MultipleReplaceSplitViewController.swift */; }; 2A231A391E7C31F400C2A909 /* MultipleReplaceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A381E7C31F400C2A909 /* MultipleReplaceListViewController.swift */; }; 2A231A3A1E7C31F400C2A909 /* MultipleReplaceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A231A381E7C31F400C2A909 /* MultipleReplaceListViewController.swift */; }; + 2A24F9102BEDDFEF00CB6CCF /* WhatsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A24F90F2BEDDFEF00CB6CCF /* WhatsNewView.swift */; }; + 2A24F9112BEDDFEF00CB6CCF /* WhatsNewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A24F90F2BEDDFEF00CB6CCF /* WhatsNewView.swift */; }; + 2A24F9132BEDF6D000CB6CCF /* CapsuleButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A24F9122BEDF6D000CB6CCF /* CapsuleButtonStyle.swift */; }; + 2A24F9142BEDF6D000CB6CCF /* CapsuleButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A24F9122BEDF6D000CB6CCF /* CapsuleButtonStyle.swift */; }; + 2A24F9162BEDFD9400CB6CCF /* WhatsNew.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A24F9152BEDFD9400CB6CCF /* WhatsNew.xcstrings */; }; + 2A24F9172BEDFD9400CB6CCF /* WhatsNew.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A24F9152BEDFD9400CB6CCF /* WhatsNew.xcstrings */; }; 2A25C52820F06BE80003AE1A /* CustomTabWidthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A25C52720F06BE80003AE1A /* CustomTabWidthView.swift */; }; 2A25C52920F06BE80003AE1A /* CustomTabWidthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A25C52720F06BE80003AE1A /* CustomTabWidthView.swift */; }; 2A26156E2977B87F008C2240 /* StepperNumberField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A26156D2977B87F008C2240 /* StepperNumberField.swift */; }; @@ -171,18 +172,25 @@ 2A26158A2977FCF6008C2240 /* SubmitButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2615882977FCF6008C2240 /* SubmitButtonGroup.swift */; }; 2A26158C2979052C008C2240 /* SyntaxObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A26158B2979052C008C2240 /* SyntaxObject.swift */; }; 2A26158D2979052C008C2240 /* SyntaxObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A26158B2979052C008C2240 /* SyntaxObject.swift */; }; - 2A2792921D1DACC400F3FC5D /* ThemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792911D1DACC400F3FC5D /* ThemeViewController.swift */; }; - 2A2792931D1DACC400F3FC5D /* ThemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792911D1DACC400F3FC5D /* ThemeViewController.swift */; }; + 2A2792921D1DACC400F3FC5D /* ThemeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792911D1DACC400F3FC5D /* ThemeListViewController.swift */; }; + 2A2792931D1DACC400F3FC5D /* ThemeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792911D1DACC400F3FC5D /* ThemeListViewController.swift */; }; 2A2792951D1DBDAC00F3FC5D /* String+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792941D1DBDAC00F3FC5D /* String+Constants.swift */; }; 2A2792961D1DBDAC00F3FC5D /* String+Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792941D1DBDAC00F3FC5D /* String+Constants.swift */; }; 2A2792981D1E57DA00F3FC5D /* SyntaxListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792971D1E57DA00F3FC5D /* SyntaxListViewController.swift */; }; 2A2792991D1E57DA00F3FC5D /* SyntaxListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2792971D1E57DA00F3FC5D /* SyntaxListViewController.swift */; }; 2A2B086028046E3B0028D733 /* WarningInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2B085F28046E3B0028D733 /* WarningInspectorView.swift */; }; 2A2B086128046E3B0028D733 /* WarningInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2B085F28046E3B0028D733 /* WarningInspectorView.swift */; }; + 2A2E56D72C018ADB00416F9E /* ComparableTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2E56D62C018ADB00416F9E /* ComparableTests.swift */; }; + 2A2E56DB2C057FBF00416F9E /* BracePair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2E56DA2C057FBF00416F9E /* BracePair.swift */; }; + 2A2E56DC2C057FBF00416F9E /* BracePair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2E56DA2C057FBF00416F9E /* BracePair.swift */; }; 2A2EEF182B778BB1001FEDFB /* WrappingHStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2EEF172B778BB1001FEDFB /* WrappingHStack.swift */; }; 2A2EEF192B778BB1001FEDFB /* WrappingHStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2EEF172B778BB1001FEDFB /* WrappingHStack.swift */; }; 2A30C7DB2B1380BE002F6381 /* ShortcutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A30C7DA2B1380BE002F6381 /* ShortcutView.swift */; }; 2A30C7DC2B1380BE002F6381 /* ShortcutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A30C7DA2B1380BE002F6381 /* ShortcutView.swift */; }; + 2A32688E2C1B504500CF1AAF /* Shortcut in Frameworks */ = {isa = PBXBuildFile; productRef = 2A32688D2C1B504500CF1AAF /* Shortcut */; }; + 2A3268902C1B504B00CF1AAF /* Shortcut in Frameworks */ = {isa = PBXBuildFile; productRef = 2A32688F2C1B504B00CF1AAF /* Shortcut */; }; + 2A3268932C1C580800CF1AAF /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3268922C1C580800CF1AAF /* Defaults */; }; + 2A3268952C1C580D00CF1AAF /* Defaults in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3268942C1C580D00CF1AAF /* Defaults */; }; 2A33D07E1D1C75B8005977B9 /* SyntaxValidationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A33D07D1D1C75B8005977B9 /* SyntaxValidationView.swift */; }; 2A33D07F1D1C75B8005977B9 /* SyntaxValidationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A33D07D1D1C75B8005977B9 /* SyntaxValidationView.swift */; }; 2A341D1A281EE23C00B85CB6 /* UserActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A341D19281EE23C00B85CB6 /* UserActivity.swift */; }; @@ -196,8 +204,8 @@ 2A36CE7C1FF654C000020702 /* NSTextView+Snippet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A36CE7B1FF654C000020702 /* NSTextView+Snippet.swift */; }; 2A36CE7D1FF654C000020702 /* NSTextView+Snippet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A36CE7B1FF654C000020702 /* NSTextView+Snippet.swift */; }; 2A36E36F2AF9ED0B00A73534 /* Sparkle.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A36E3702AF9ED0B00A73534 /* Sparkle.xcstrings */; }; - 2A38FAFD1D1C67050032231A /* DraggableArrayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A38FAFC1D1C67050032231A /* DraggableArrayController.swift */; }; - 2A38FAFE1D1C67050032231A /* DraggableArrayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A38FAFC1D1C67050032231A /* DraggableArrayController.swift */; }; + 2A3853682C1AF42C00C282C0 /* FilePermissions in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3853672C1AF42C00C282C0 /* FilePermissions */; }; + 2A38536A2C1AF43100C282C0 /* FilePermissions in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3853692C1AF43100C282C0 /* FilePermissions */; }; 2A39AC472B8B5C9700E216C9 /* OutlineItem+AttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A39AC462B8B5C9700E216C9 /* OutlineItem+AttributedString.swift */; }; 2A39AC482B8B5C9700E216C9 /* OutlineItem+AttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A39AC462B8B5C9700E216C9 /* OutlineItem+AttributedString.swift */; }; 2A39AC812B8CDFC800E216C9 /* EncodingList.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A39AC802B8CDFC800E216C9 /* EncodingList.xcstrings */; }; @@ -261,21 +269,15 @@ 2A47CD3921D340040094F62F /* NSValidatedUserInterfaceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A47CD3721D340030094F62F /* NSValidatedUserInterfaceItem.swift */; }; 2A484A39236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A484A38236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift */; }; 2A484A3A236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A484A38236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift */; }; - 2A4A7D132856FF340085D2E7 /* HelpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4A7D122856FF340085D2E7 /* HelpButton.swift */; }; - 2A4A7D142856FF340085D2E7 /* HelpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4A7D122856FF340085D2E7 /* HelpButton.swift */; }; 2A4AF76720759BE500C47606 /* RegexFindPanelTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4AF76620759BE500C47606 /* RegexFindPanelTextView.swift */; }; 2A4AF76820759BE500C47606 /* RegexFindPanelTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4AF76620759BE500C47606 /* RegexFindPanelTextView.swift */; }; 2A4CCBB41D45173000294067 /* EditorTextView+LineProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4CCBB31D45173000294067 /* EditorTextView+LineProcessing.swift */; }; 2A4CCBB51D45173000294067 /* EditorTextView+LineProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4CCBB31D45173000294067 /* EditorTextView+LineProcessing.swift */; }; - 2A4D69291D40032300FBBD0B /* EncodingDetectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A18A5BC1C4A730D00BAD817 /* EncodingDetectionTests.swift */; }; + 2A4D69291D40032300FBBD0B /* EncodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A18A5BC1C4A730D00BAD817 /* EncodingTests.swift */; }; 2A4E638020ADC45F0033CE63 /* NSBezierPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4E637F20ADC45F0033CE63 /* NSBezierPath.swift */; }; 2A4E638120ADC45F0033CE63 /* NSBezierPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4E637F20ADC45F0033CE63 /* NSBezierPath.swift */; }; - 2A505C052988D44E002080AA /* ShortcutFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A505C042988D44E002080AA /* ShortcutFormatter.swift */; }; - 2A505C062988D44E002080AA /* ShortcutFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A505C042988D44E002080AA /* ShortcutFormatter.swift */; }; - 2A505C09298A88DD002080AA /* SnippetsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A505C08298A88DD002080AA /* SnippetsViewController.swift */; }; - 2A505C0A298A88DD002080AA /* SnippetsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A505C08298A88DD002080AA /* SnippetsViewController.swift */; }; - 2A50AA62204D513500D10A10 /* DocumentFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A50AA61204D513500D10A10 /* DocumentFile.swift */; }; - 2A50AA63204D513500D10A10 /* DocumentFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A50AA61204D513500D10A10 /* DocumentFile.swift */; }; + 2A50AA62204D513500D10A10 /* FileAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A50AA61204D513500D10A10 /* FileAttributes.swift */; }; + 2A50AA63204D513500D10A10 /* FileAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A50AA61204D513500D10A10 /* FileAttributes.swift */; }; 2A53F56727585A0E00ED16DF /* RegularExpressionReferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A53F56627585A0E00ED16DF /* RegularExpressionReferenceView.swift */; }; 2A53F56827585A0E00ED16DF /* RegularExpressionReferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A53F56627585A0E00ED16DF /* RegularExpressionReferenceView.swift */; }; 2A54BE2C1D40EB24000816B0 /* LineEndingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A54BE2B1D40EB24000816B0 /* LineEndingTests.swift */; }; @@ -340,17 +342,15 @@ 2A5E6FC82A723F3C00E33EA7 /* ServicesMenu.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A5E6FC62A723F3C00E33EA7 /* ServicesMenu.xcstrings */; }; 2A5EDDBB241B649C00A07810 /* moof.textClipping in Resources */ = {isa = PBXBuildFile; fileRef = 2A5EDDBA241B649C00A07810 /* moof.textClipping */; }; 2A5EDDBD241B64EB00A07810 /* TextClippingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5EDDBC241B64EB00A07810 /* TextClippingTests.swift */; }; - 2A5F7CA51D152589001D83BC /* NavigationBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A5F7CA31D152589001D83BC /* NavigationBar.storyboard */; }; - 2A63A9D824E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63A9D724E8C8F70017ACBB /* OutlinePopUpButton.swift */; }; - 2A63A9D924E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63A9D724E8C8F70017ACBB /* OutlinePopUpButton.swift */; }; + 2A63A9D824E8C8F70017ACBB /* OutlinePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63A9D724E8C8F70017ACBB /* OutlinePicker.swift */; }; + 2A63A9D924E8C8F70017ACBB /* OutlinePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63A9D724E8C8F70017ACBB /* OutlinePicker.swift */; }; 2A63CEC41D0B06D800ED8186 /* SyntaxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63CEC31D0B06D800ED8186 /* SyntaxTests.swift */; }; 2A63CEC91D0B0D4600ED8186 /* Syntaxes in Resources */ = {isa = PBXBuildFile; fileRef = 2A3A758D19E77C84001DAB88 /* Syntaxes */; }; 2A63CECB1D0B0E7800ED8186 /* sample.html in Resources */ = {isa = PBXBuildFile; fileRef = 2A63CECA1D0B0E7800ED8186 /* sample.html */; }; - 2A63FBE31D1D90E70081C84E /* ThemeEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63FBE21D1D90E70081C84E /* ThemeEditorView.swift */; }; - 2A63FBE41D1D90E70081C84E /* ThemeEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63FBE21D1D90E70081C84E /* ThemeEditorView.swift */; }; + 2A63FBE31D1D90E70081C84E /* ThemeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63FBE21D1D90E70081C84E /* ThemeView.swift */; }; + 2A63FBE41D1D90E70081C84E /* ThemeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A63FBE21D1D90E70081C84E /* ThemeView.swift */; }; 2A6416A31D2F9F7200FA9E1A /* LineNumberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6416A21D2F9F7200FA9E1A /* LineNumberView.swift */; }; 2A6416A41D2F9F7200FA9E1A /* LineNumberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6416A21D2F9F7200FA9E1A /* LineNumberView.swift */; }; - 2A64A2362387754000646BE4 /* UserDefaultsObservationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64A2352387754000646BE4 /* UserDefaultsObservationTests.swift */; }; 2A64F2421D256FCB001B229F /* KeyBindingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64F2411D256FCB001B229F /* KeyBindingManager.swift */; }; 2A64F2431D256FCB001B229F /* KeyBindingManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64F2411D256FCB001B229F /* KeyBindingManager.swift */; }; 2A64F2451D259E49001B229F /* SnippetManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64F2441D259E49001B229F /* SnippetManager.swift */; }; @@ -360,8 +360,6 @@ 2A64F24B1D26615A001B229F /* KeyBindingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64F24A1D26615A001B229F /* KeyBindingItem.swift */; }; 2A64F24C1D26615A001B229F /* KeyBindingItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A64F24A1D26615A001B229F /* KeyBindingItem.swift */; }; 2A6566E92B73BBB400008669 /* SyntaxEditor.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AA6E0B82B744FF300E536F8 /* SyntaxEditor.xcstrings */; }; - 2A657D1D2033ED6B00C2611C /* DefaultInitializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A657D1C2033ED6B00C2611C /* DefaultInitializable.swift */; }; - 2A657D1E2033ED6B00C2611C /* DefaultInitializable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A657D1C2033ED6B00C2611C /* DefaultInitializable.swift */; }; 2A65EC262B80C01B008096C5 /* FontPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A65EC252B80C01B008096C5 /* FontPicker.swift */; }; 2A65EC272B80C01B008096C5 /* FontPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A65EC252B80C01B008096C5 /* FontPicker.swift */; }; 2A65EC2A2B80C168008096C5 /* AppearanceSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A65EC292B80C168008096C5 /* AppearanceSettingsView.swift */; }; @@ -389,19 +387,14 @@ 2A6FD9D21D38933100A59784 /* EditorTextViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9D01D38933100A59784 /* EditorTextViewController.swift */; }; 2A6FD9DA1D38F93100A59784 /* EditorTextView+Indenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9D71D38C94100A59784 /* EditorTextView+Indenting.swift */; }; 2A6FD9DB1D38F93300A59784 /* EditorTextView+Indenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9D71D38C94100A59784 /* EditorTextView+Indenting.swift */; }; - 2A6FD9E01D393F9100A59784 /* SplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9DF1D393F9100A59784 /* SplitViewController.swift */; }; - 2A6FD9E11D393F9100A59784 /* SplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9DF1D393F9100A59784 /* SplitViewController.swift */; }; 2A6FD9E71D394F5900A59784 /* LayoutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9E61D394F5900A59784 /* LayoutManager.swift */; }; 2A6FD9E81D394F5900A59784 /* LayoutManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9E61D394F5900A59784 /* LayoutManager.swift */; }; 2A6FD9EA1D3A819500A59784 /* EditorTextView+Commenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9E91D3A819500A59784 /* EditorTextView+Commenting.swift */; }; 2A6FD9EB1D3A819500A59784 /* EditorTextView+Commenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9E91D3A819500A59784 /* EditorTextView+Commenting.swift */; }; 2A6FD9ED1D3A85D700A59784 /* NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9EC1D3A85D700A59784 /* NSString.swift */; }; 2A6FD9EE1D3A85D700A59784 /* NSString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9EC1D3A85D700A59784 /* NSString.swift */; }; - 2A6FD9F31D3ACEB500A59784 /* DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9F21D3ACEB500A59784 /* DefaultKey.swift */; }; - 2A6FD9F41D3ACEB500A59784 /* DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9F21D3ACEB500A59784 /* DefaultKey.swift */; }; 2A6FD9F61D3AE29E00A59784 /* Syntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9F51D3AE29E00A59784 /* Syntax.swift */; }; 2A6FD9F71D3AE29E00A59784 /* Syntax.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A6FD9F51D3AE29E00A59784 /* Syntax.swift */; }; - 2A7135831CFFDC6600ADA555 /* FilePermissionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7135821CFFDC6600ADA555 /* FilePermissionTests.swift */; }; 2A719F6623CD92370026F877 /* FuzzyRangeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A719F6523CD92370026F877 /* FuzzyRangeTests.swift */; }; 2A71BC7B1DDC50530085AE1C /* DocumentViewController+TouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A71BC7A1DDC50530085AE1C /* DocumentViewController+TouchBar.swift */; }; 2A71BC7C1DDC50530085AE1C /* DocumentViewController+TouchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A71BC7A1DDC50530085AE1C /* DocumentViewController+TouchBar.swift */; }; @@ -411,10 +404,6 @@ 2A72DA11209B778B005242B9 /* NSTextView+MultiCursor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A72DA0F209B778B005242B9 /* NSTextView+MultiCursor.swift */; }; 2A733E8920BBB4AC0090D7CB /* String+Case.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A733E8820BBB4AC0090D7CB /* String+Case.swift */; }; 2A733E8A20BBB4AC0090D7CB /* String+Case.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A733E8820BBB4AC0090D7CB /* String+Case.swift */; }; - 2A73B5B61D4675350025337F /* Unicode.Scalar+ControlCharacter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B5B31D4675350025337F /* Unicode.Scalar+ControlCharacter.swift */; }; - 2A73B5B71D4675350025337F /* Unicode.Scalar+ControlCharacter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B5B31D4675350025337F /* Unicode.Scalar+ControlCharacter.swift */; }; - 2A73B5BC1D468DD30025337F /* Unicode.Scalar+Information.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B5BB1D468DD30025337F /* Unicode.Scalar+Information.swift */; }; - 2A73B5BD1D468DD30025337F /* Unicode.Scalar+Information.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B5BB1D468DD30025337F /* Unicode.Scalar+Information.swift */; }; 2A73B9332A8F6620002F3A16 /* RegexTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B9322A8F6620002F3A16 /* RegexTextField.swift */; }; 2A73B9342A8F6620002F3A16 /* RegexTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A73B9322A8F6620002F3A16 /* RegexTextField.swift */; }; 2A7470692B12FA5700669A7B /* NSTextStorage+TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7470682B12FA5700669A7B /* NSTextStorage+TextView.swift */; }; @@ -434,14 +423,14 @@ 2A7B279924E435FE00F02304 /* OutlineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7B279824E435FE00F02304 /* OutlineTests.swift */; }; 2A7C92FC29FD64A8008343C8 /* DefaultKey+FontType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7C92FB29FD64A8008343C8 /* DefaultKey+FontType.swift */; }; 2A7C92FD29FD64A8008343C8 /* DefaultKey+FontType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7C92FB29FD64A8008343C8 /* DefaultKey+FontType.swift */; }; + 2A7E06E82C1A745400E5396D /* CharacterInfo in Frameworks */ = {isa = PBXBuildFile; productRef = 2A7E06E72C1A745400E5396D /* CharacterInfo */; }; + 2A7E06EA2C1A745E00E5396D /* CharacterInfo in Frameworks */ = {isa = PBXBuildFile; productRef = 2A7E06E92C1A745E00E5396D /* CharacterInfo */; }; 2A7F4DFF2871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A7F4E022871F46D0029CE66 /* PrintPanelAccessory.storyboard */; }; 2A7F4E002871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A7F4E022871F46D0029CE66 /* PrintPanelAccessory.storyboard */; }; 2A7FCC46280A367C0070EAB3 /* ValueRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7FCC45280A367C0070EAB3 /* ValueRange.swift */; }; 2A7FCC47280A367C0070EAB3 /* ValueRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A7FCC45280A367C0070EAB3 /* ValueRange.swift */; }; 2A7FEF0B2B90B05C0042BEFF /* FilterField.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A7FEF0A2B90B05C0042BEFF /* FilterField.xcstrings */; }; 2A7FEF0C2B90B05C0042BEFF /* FilterField.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A7FEF0A2B90B05C0042BEFF /* FilterField.xcstrings */; }; - 2A7FEF332B90E1C20042BEFF /* Character.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A7FEF322B90E1C20042BEFF /* Character.xcstrings */; }; - 2A7FEF342B90E1C20042BEFF /* Character.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A7FEF322B90E1C20042BEFF /* Character.xcstrings */; }; 2A80BE8D27FFA61700D2F7FF /* LineEndingScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A80BE8C27FFA61700D2F7FF /* LineEndingScanner.swift */; }; 2A80BE8E27FFA61700D2F7FF /* LineEndingScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A80BE8C27FFA61700D2F7FF /* LineEndingScanner.swift */; }; 2A80BE9227FFFA8900D2F7FF /* LineEndingScannerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A80BE8F27FFFA8900D2F7FF /* LineEndingScannerTests.swift */; }; @@ -451,15 +440,9 @@ 2A836DA02AB1528700B4D458 /* ModeSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A836D9E2AB1528700B4D458 /* ModeSettingsView.swift */; }; 2A836F801D572A5D0044E8EC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A836F7E1D572A5D0044E8EC /* Main.storyboard */; }; 2A836F811D572A5D0044E8EC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A836F7E1D572A5D0044E8EC /* Main.storyboard */; }; - 2A86C47B20371DBE00B9357C /* FilePermissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A86C47A20371DBE00B9357C /* FilePermissions.swift */; }; - 2A86C47C20371DBE00B9357C /* FilePermissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A86C47A20371DBE00B9357C /* FilePermissions.swift */; }; 2A885E331D5C3A1B00288723 /* Comparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A885E321D5C3A1B00288723 /* Comparable.swift */; }; 2A885E341D5C3A1B00288723 /* Comparable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A885E321D5C3A1B00288723 /* Comparable.swift */; }; - 2A88E7711E81A2C7000019C6 /* OrderedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A88E7701E81A2C7000019C6 /* OrderedSet.swift */; }; - 2A88E7721E81A2C7000019C6 /* OrderedSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A88E7701E81A2C7000019C6 /* OrderedSet.swift */; }; 2A89160C2394B87100AC13EE /* NSLayoutManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A89160B2394B87100AC13EE /* NSLayoutManagerTests.swift */; }; - 2A8918E3294C33C900A23347 /* AppStorage+DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8918E2294C33C900A23347 /* AppStorage+DefaultKey.swift */; }; - 2A8918E4294C33C900A23347 /* AppStorage+DefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8918E2294C33C900A23347 /* AppStorage+DefaultKey.swift */; }; 2A8961921DB76A3400E9E0EC /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8961911DB76A3400E9E0EC /* MainMenu.swift */; }; 2A8961931DB76A3400E9E0EC /* MainMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8961911DB76A3400E9E0EC /* MainMenu.swift */; }; 2A8C338F1D3E1C040005B0B7 /* IncompatibleCharacter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8C338E1D3E1C040005B0B7 /* IncompatibleCharacter.swift */; }; @@ -468,8 +451,6 @@ 2A8DA9451D286C53003D0C4B /* ScriptManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8DA9431D286C53003D0C4B /* ScriptManager.swift */; }; 2A8DA9471D28ED93003D0C4B /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8DA9461D28ED93003D0C4B /* URL.swift */; }; 2A8DA9481D28ED93003D0C4B /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8DA9461D28ED93003D0C4B /* URL.swift */; }; - 2A8E25BB24DC59C400FCC33A /* FileEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E25BA24DC59C400FCC33A /* FileEncoding.swift */; }; - 2A8E25BC24DC59C400FCC33A /* FileEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E25BA24DC59C400FCC33A /* FileEncoding.swift */; }; 2A8E47E2299A2314006A40D8 /* EditedRangeSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E47E1299A2314006A40D8 /* EditedRangeSet.swift */; }; 2A8E47E3299A2314006A40D8 /* EditedRangeSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E47E1299A2314006A40D8 /* EditedRangeSet.swift */; }; 2A8E47E5299A2401006A40D8 /* EditedRangeSetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A8E47E4299A2401006A40D8 /* EditedRangeSetTests.swift */; }; @@ -500,8 +481,6 @@ 2A91C3191D1BE91E007CF8BE /* DefaultSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C3171D1BE91E007CF8BE /* DefaultSettings.swift */; }; 2A91C31B1D1BFE47007CF8BE /* UTType+SettingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C31A1D1BFE47007CF8BE /* UTType+SettingFile.swift */; }; 2A91C31C1D1BFE47007CF8BE /* UTType+SettingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C31A1D1BFE47007CF8BE /* UTType+SettingFile.swift */; }; - 2A91C3211D1C40E4007CF8BE /* FileDropViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C3201D1C40E4007CF8BE /* FileDropViewController.swift */; }; - 2A91C3221D1C40E4007CF8BE /* FileDropViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A91C3201D1C40E4007CF8BE /* FileDropViewController.swift */; }; 2A938ACC297E4BA9007FBE5F /* SettingsPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A938ACB297E4BA9007FBE5F /* SettingsPane.swift */; }; 2A938ACD297E4BA9007FBE5F /* SettingsPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A938ACB297E4BA9007FBE5F /* SettingsPane.swift */; }; 2A938ACF297E4D7B007FBE5F /* SettingsWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A938ACE297E4D7B007FBE5F /* SettingsWindowController.swift */; }; @@ -514,17 +493,16 @@ 2A9AC938244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9AC936244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift */; }; 2A9B134E27E2D84E009954A4 /* NSDraggingInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9B134D27E2D84E009954A4 /* NSDraggingInfo.swift */; }; 2A9B134F27E2D84E009954A4 /* NSDraggingInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9B134D27E2D84E009954A4 /* NSDraggingInfo.swift */; }; + 2A9BC2782BDE00B1008B58B5 /* Donation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BC2772BDE00B1008B58B5 /* Donation.swift */; }; + 2A9BC2792BDE00B1008B58B5 /* Donation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BC2772BDE00B1008B58B5 /* Donation.swift */; }; 2A9BF3C41D382BB100E3D3E2 /* EditorTextView+Transformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3C31D382BB100E3D3E2 /* EditorTextView+Transformation.swift */; }; 2A9BF3C51D382BB100E3D3E2 /* EditorTextView+Transformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3C31D382BB100E3D3E2 /* EditorTextView+Transformation.swift */; }; 2A9BF3C71D38325200E3D3E2 /* String+FullwidthTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3C61D38325200E3D3E2 /* String+FullwidthTransform.swift */; }; 2A9BF3C81D38325200E3D3E2 /* String+FullwidthTransform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3C61D38325200E3D3E2 /* String+FullwidthTransform.swift */; }; - 2A9BF3CB1D3842FA00E3D3E2 /* String+Normalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3CA1D3842FA00E3D3E2 /* String+Normalization.swift */; }; - 2A9BF3CC1D3842FA00E3D3E2 /* String+Normalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9BF3CA1D3842FA00E3D3E2 /* String+Normalization.swift */; }; 2A9C07561CF9F982006D672D /* IncompatibleCharacterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9C07551CF9F982006D672D /* IncompatibleCharacterTests.swift */; }; 2A9C370B1D66E99400774BA4 /* Pair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9C370A1D66E99400774BA4 /* Pair.swift */; }; 2A9C370C1D66E99400774BA4 /* Pair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9C370A1D66E99400774BA4 /* Pair.swift */; }; 2A9C370E1D672A1F00774BA4 /* BracePairTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9C370D1D672A1F00774BA4 /* BracePairTests.swift */; }; - 2A9DE0132B55605300E8FD2A /* ShiftJISTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A9DE0122B55605200E8FD2A /* ShiftJISTests.swift */; }; 2AA056AD26FCA171000E0CB2 /* Arithmetics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA056AC26FCA171000E0CB2 /* Arithmetics.swift */; }; 2AA056AE26FCA171000E0CB2 /* Arithmetics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA056AC26FCA171000E0CB2 /* Arithmetics.swift */; }; 2AA106B02470F05F00979CB7 /* EncodingListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5DCE881D18FFDB00D5D74C /* EncodingListView.swift */; }; @@ -540,18 +518,13 @@ 2AA175FB2AC5634500F6462C /* PopoverHolderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA175F92AC5634500F6462C /* PopoverHolderView.swift */; }; 2AA2C6FC24399A920017D1EC /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 2AA2C6FB24399A920017D1EC /* Yams */; }; 2AA2C6FE24399AA20017D1EC /* Yams in Frameworks */ = {isa = PBXBuildFile; productRef = 2AA2C6FD24399AA20017D1EC /* Yams */; }; - 2AA2E0101BFDE0190087BDD6 /* CharacterInfoTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA2E00F1BFDE0190087BDD6 /* CharacterInfoTests.swift */; }; - 2AA2E0131BFE12620087BDD6 /* UnicodeBlock.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2AA2E0111BFE12620087BDD6 /* UnicodeBlock.strings */; }; - 2AA2E0141BFE12620087BDD6 /* UnicodeBlock.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2AA2E0111BFE12620087BDD6 /* UnicodeBlock.strings */; }; 2AA2E0261C0454730087BDD6 /* StringIndentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA2E0251C0454730087BDD6 /* StringIndentationTests.swift */; }; - 2AA375441D403F100080C27C /* String+Encoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4D69261D3FF61C00FBBD0B /* String+Encoding.swift */; }; - 2AA375451D403F110080C27C /* String+Encoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A4D69261D3FF61C00FBBD0B /* String+Encoding.swift */; }; 2AA375471D40BDCB0080C27C /* LineEnding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA375461D40BDCB0080C27C /* LineEnding.swift */; }; 2AA375481D40BDCB0080C27C /* LineEnding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA375461D40BDCB0080C27C /* LineEnding.swift */; }; 2AA45A4B1D2E871900A1A401 /* EditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A4A1D2E871900A1A401 /* EditorViewController.swift */; }; 2AA45A4C1D2E871900A1A401 /* EditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A4A1D2E871900A1A401 /* EditorViewController.swift */; }; - 2AA45A511D2E938500A1A401 /* NavigationBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A501D2E938500A1A401 /* NavigationBarController.swift */; }; - 2AA45A521D2E938500A1A401 /* NavigationBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A501D2E938500A1A401 /* NavigationBarController.swift */; }; + 2AA45A511D2E938500A1A401 /* NavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A501D2E938500A1A401 /* NavigationBar.swift */; }; + 2AA45A521D2E938500A1A401 /* NavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A501D2E938500A1A401 /* NavigationBar.swift */; }; 2AA45A541D2F22C600A1A401 /* NSFont+Size.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A531D2F22C600A1A401 /* NSFont+Size.swift */; }; 2AA45A551D2F22C600A1A401 /* NSFont+Size.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA45A531D2F22C600A1A401 /* NSFont+Size.swift */; }; 2AA4D3741D1AA0AC001D261D /* KeyBindingsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA4D3731D1AA0AC001D261D /* KeyBindingsSettingsView.swift */; }; @@ -581,6 +554,8 @@ 2AA6E0C82B75AC4900E536F8 /* SyntaxEditor.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AA6E0B82B744FF300E536F8 /* SyntaxEditor.xcstrings */; }; 2AA704CE2987878B008CBCB5 /* Node.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA704CD2987878B008CBCB5 /* Node.swift */; }; 2AA704CF2987878B008CBCB5 /* Node.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA704CD2987878B008CBCB5 /* Node.swift */; }; + 2AA71A532BE366520084EC0A /* Observation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA71A522BE366520084EC0A /* Observation.swift */; }; + 2AA71A542BE366520084EC0A /* Observation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA71A522BE366520084EC0A /* Observation.swift */; }; 2AA749C31D3C263300850802 /* DocumentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA749C21D3C263300850802 /* DocumentWindowController.swift */; }; 2AA749C41D3C263300850802 /* DocumentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA749C21D3C263300850802 /* DocumentWindowController.swift */; }; 2AA761351D45634400031AAF /* String+Counting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA761341D45634400031AAF /* String+Counting.swift */; }; @@ -589,6 +564,10 @@ 2AA7613B1D457BD500031AAF /* String+Indentation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA761391D457BD500031AAF /* String+Indentation.swift */; }; 2AA79C7821CB7251005AD6AD /* SettingsWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA79C7721CB7251005AD6AD /* SettingsWindow.swift */; }; 2AA79C7921CB7251005AD6AD /* SettingsWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA79C7721CB7251005AD6AD /* SettingsWindow.swift */; }; + 2AA7BDD62C1B0CC10075BB6C /* UnicodeNormalization in Frameworks */ = {isa = PBXBuildFile; productRef = 2AA7BDD52C1B0CC10075BB6C /* UnicodeNormalization */; }; + 2AA7BDD82C1B0CC70075BB6C /* UnicodeNormalization in Frameworks */ = {isa = PBXBuildFile; productRef = 2AA7BDD72C1B0CC70075BB6C /* UnicodeNormalization */; }; + 2AA7BDDB2C1B10CB0075BB6C /* UnicodeNormalizationForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA7BDDA2C1B10C80075BB6C /* UnicodeNormalizationForm.swift */; }; + 2AA7BDDC2C1B10CB0075BB6C /* UnicodeNormalizationForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA7BDDA2C1B10C80075BB6C /* UnicodeNormalizationForm.swift */; }; 2AA7E97D1DBAAC950083B7ED /* Script.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA7E97C1DBAAC950083B7ED /* Script.swift */; }; 2AA7E97E1DBAAC950083B7ED /* Script.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA7E97C1DBAAC950083B7ED /* Script.swift */; }; 2AA86282212ED91400BB75C9 /* NSSplitView+Autosave.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */; }; @@ -602,20 +581,16 @@ 2AAB4C001D2444930049A68B /* InspectorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAB4BFE1D2444930049A68B /* InspectorViewController.swift */; }; 2AACB1CD1D195ABD0073775B /* ShortcutField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AACB1CC1D195ABD0073775B /* ShortcutField.swift */; }; 2AACB1CE1D195ABD0073775B /* ShortcutField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AACB1CC1D195ABD0073775B /* ShortcutField.swift */; }; - 2AAD61EC1D2A4CE5008FE772 /* Shortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61EB1D2A4CE5008FE772 /* Shortcut.swift */; }; - 2AAD61ED1D2A4CE5008FE772 /* Shortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61EB1D2A4CE5008FE772 /* Shortcut.swift */; }; 2AAD61F01D2B0856008FE772 /* FuzzyRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61EF1D2B0856008FE772 /* FuzzyRange.swift */; }; 2AAD61F11D2B0856008FE772 /* FuzzyRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61EF1D2B0856008FE772 /* FuzzyRange.swift */; }; 2AAD61F41D2BA0E0008FE772 /* OutlineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61F31D2BA0E0008FE772 /* OutlineItem.swift */; }; 2AAD61F51D2BA0E0008FE772 /* OutlineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61F31D2BA0E0008FE772 /* OutlineItem.swift */; }; 2AAD61F81D2BA3F5008FE772 /* HighlightParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61F71D2BA3F5008FE772 /* HighlightParser.swift */; }; 2AAD61F91D2BA3F5008FE772 /* HighlightParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61F71D2BA3F5008FE772 /* HighlightParser.swift */; }; - 2AAD61FC1D2BD102008FE772 /* String+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */; }; - 2AAD61FD1D2BD102008FE772 /* String+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */; }; + 2AAD61FC1D2BD102008FE772 /* String+LineRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+LineRange.swift */; }; + 2AAD61FD1D2BD102008FE772 /* String+LineRange.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAD61FB1D2BD102008FE772 /* String+LineRange.swift */; }; 2AAE8E622AF8AE3B008954B5 /* Syntax+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAE8E612AF8AE3B008954B5 /* Syntax+Codable.swift */; }; 2AAE8E632AF8AE3B008954B5 /* Syntax+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAE8E612AF8AE3B008954B5 /* Syntax+Codable.swift */; }; - 2AAF6E9129BB8B45003DFF4B /* NSMenuItem+Shortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAF6E9029BB8B45003DFF4B /* NSMenuItem+Shortcut.swift */; }; - 2AAF6E9229BB8B45003DFF4B /* NSMenuItem+Shortcut.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AAF6E9029BB8B45003DFF4B /* NSMenuItem+Shortcut.swift */; }; 2AAF93562A73DEE600CCC4A7 /* LineEnding.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF93552A73DEE600CCC4A7 /* LineEnding.xcstrings */; }; 2AAF93572A73DEE600CCC4A7 /* LineEnding.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF93552A73DEE600CCC4A7 /* LineEnding.xcstrings */; }; 2AAFA7BC2B7A2DB000A2B228 /* MultipleReplaceListView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2AAFA7BA2B7A2DAF00A2B228 /* MultipleReplaceListView.storyboard */; }; @@ -626,8 +601,6 @@ 2AB1BD20287D747200C6FEAF /* SizeGetter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB1BD1E287D747200C6FEAF /* SizeGetter.swift */; }; 2AB1BD24287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB1BD23287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift */; }; 2AB1BD25287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB1BD23287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift */; }; - 2AB2913E245AAD74004CC203 /* Unicode.GeneralCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB2913D245AAD74004CC203 /* Unicode.GeneralCategory.swift */; }; - 2AB2913F245AAD74004CC203 /* Unicode.GeneralCategory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB2913D245AAD74004CC203 /* Unicode.GeneralCategory.swift */; }; 2AB541DA20A5B6A400367DD5 /* NSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB541D920A5B6A400367DD5 /* NSView.swift */; }; 2AB541DB20A5B6A400367DD5 /* NSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB541D920A5B6A400367DD5 /* NSView.swift */; }; 2AB857E82B922D7D0079CFA2 /* ModeManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB857E72B922D7D0079CFA2 /* ModeManager.swift */; }; @@ -646,11 +619,20 @@ 2ABF49E4221A54AD00239278 /* TextClipping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF49E2221A54AD00239278 /* TextClipping.swift */; }; 2ABF86BD208C3C630082D52B /* AudioToolbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF86BC208C3C630082D52B /* AudioToolbox.swift */; }; 2ABF86BE208C3C630082D52B /* AudioToolbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF86BC208C3C630082D52B /* AudioToolbox.swift */; }; - 2ABFF6D71D02856A00BE2795 /* ShortcutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABFF6D61D02856A00BE2795 /* ShortcutTests.swift */; }; + 2ABF9E932C1E8CFF0033D5E6 /* EditingContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E922C1E8CFB0033D5E6 /* EditingContext.swift */; }; + 2ABF9E942C1E8CFF0033D5E6 /* EditingContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E922C1E8CFB0033D5E6 /* EditingContext.swift */; }; + 2ABF9E962C1E8D7E0033D5E6 /* String+LineProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E952C1E8D780033D5E6 /* String+LineProcessing.swift */; }; + 2ABF9E972C1E8D7E0033D5E6 /* String+LineProcessing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E952C1E8D780033D5E6 /* String+LineProcessing.swift */; }; + 2ABF9E9C2C1EC2A50033D5E6 /* String+Escaping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E9B2C1EC29D0033D5E6 /* String+Escaping.swift */; }; + 2ABF9E9D2C1EC2A50033D5E6 /* String+Escaping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E9B2C1EC29D0033D5E6 /* String+Escaping.swift */; }; + 2ABF9E9F2C1EC8620033D5E6 /* String+Filename.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E9E2C1EC8590033D5E6 /* String+Filename.swift */; }; + 2ABF9EA02C1EC8620033D5E6 /* String+Filename.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9E9E2C1EC8590033D5E6 /* String+Filename.swift */; }; + 2ABF9EA22C1ED4BF0033D5E6 /* String+Commenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9EA12C1ED4B90033D5E6 /* String+Commenting.swift */; }; + 2ABF9EA32C1ED4BF0033D5E6 /* String+Commenting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ABF9EA12C1ED4B90033D5E6 /* String+Commenting.swift */; }; 2AC13A0924F112D800799A93 /* CommandLineToolManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC13A0824F112D800799A93 /* CommandLineToolManager.swift */; }; 2AC13A0A24F112D800799A93 /* CommandLineToolManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC13A0824F112D800799A93 /* CommandLineToolManager.swift */; }; - 2AC186DA1E2F414D002F4D27 /* NSDocument+ErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186D91E2F414D002F4D27 /* NSDocument+ErrorHandling.swift */; }; - 2AC186DB1E2F414D002F4D27 /* NSDocument+ErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186D91E2F414D002F4D27 /* NSDocument+ErrorHandling.swift */; }; + 2AC186DA1E2F414D002F4D27 /* NSDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186D91E2F414D002F4D27 /* NSDocument.swift */; }; + 2AC186DB1E2F414D002F4D27 /* NSDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186D91E2F414D002F4D27 /* NSDocument.swift */; }; 2AC186DD1E2F4264002F4D27 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186DC1E2F4264002F4D27 /* Debug.swift */; }; 2AC186DE1E2F4264002F4D27 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC186DC1E2F4264002F4D27 /* Debug.swift */; }; 2AC2462E1D1BC70C00E46CFA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AC2462D1D1BC70C00E46CFA /* AppDelegate.swift */; }; @@ -711,9 +693,7 @@ 2ACDC0A41D173250009B72D6 /* InspectorTabSegmentedControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC0A21D173250009B72D6 /* InspectorTabSegmentedControl.swift */; }; 2ACDC0A61D17350A009B72D6 /* InspectorTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC0A51D17350A009B72D6 /* InspectorTabView.swift */; }; 2ACDC0A71D17350A009B72D6 /* InspectorTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ACDC0A51D17350A009B72D6 /* InspectorTabView.swift */; }; - 2ACDE28D2406B9C000FC31EC /* ThemeView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1261E714D230027192A /* ThemeView.storyboard */; }; - 2ACDE2962406B9C000FC31EC /* NavigationBar.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A5F7CA31D152589001D83BC /* NavigationBar.storyboard */; }; - 2ACDE2992406B9C000FC31EC /* SnippetsPane.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2ADF3BFF1E6D7345009125BB /* SnippetsPane.storyboard */; }; + 2ACDE28D2406B9C000FC31EC /* ThemeListView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1261E714D230027192A /* ThemeListView.storyboard */; }; 2ACDE29A2406B9C000FC31EC /* FindPanelFieldView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A5D13401D1FE34F00D38E6A /* FindPanelFieldView.storyboard */; }; 2ACDE29C2406B9C000FC31EC /* SyntaxListView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1361E715E5B0027192A /* SyntaxListView.storyboard */; }; 2ACDE2A22406B9C000FC31EC /* KeyBindingTreeView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2A10D1081E708CDF0027192A /* KeyBindingTreeView.storyboard */; }; @@ -736,8 +716,8 @@ 2AD69B861D3E42F700FBD998 /* TextSelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD69B841D3E42F700FBD998 /* TextSelection.swift */; }; 2AD69B881D3E4FCD00FBD998 /* NSTextView+ScriptingSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD69B871D3E4FCD00FBD998 /* NSTextView+ScriptingSupport.swift */; }; 2AD69B891D3E4FCD00FBD998 /* NSTextView+ScriptingSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD69B871D3E4FCD00FBD998 /* NSTextView+ScriptingSupport.swift */; }; - 2AD7B9AF1D3E832E00E5D6D7 /* DocumentAnalyzer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD7B9AE1D3E832E00E5D6D7 /* DocumentAnalyzer.swift */; }; - 2AD7B9B01D3E832E00E5D6D7 /* DocumentAnalyzer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD7B9AE1D3E832E00E5D6D7 /* DocumentAnalyzer.swift */; }; + 2AD7B9AF1D3E832E00E5D6D7 /* EditorCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD7B9AE1D3E832E00E5D6D7 /* EditorCounter.swift */; }; + 2AD7B9B01D3E832E00E5D6D7 /* EditorCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD7B9AE1D3E832E00E5D6D7 /* EditorCounter.swift */; }; 2AD8D74A2064AD83000BEFDB /* NumberTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD8D7492064AD83000BEFDB /* NumberTextField.swift */; }; 2AD8D74B2064AD83000BEFDB /* NumberTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AD8D7492064AD83000BEFDB /* NumberTextField.swift */; }; 2ADA15EE21C5073D00C6608B /* Collection+IndexSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADA15ED21C5073D00C6608B /* Collection+IndexSet.swift */; }; @@ -748,7 +728,8 @@ 2ADBC91621C9F30000B884FF /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADBC91421C9F30000B884FF /* Atomic.swift */; }; 2ADD0AD8217A967200F78732 /* NSTextView+LineNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADD0AD7217A967200F78732 /* NSTextView+LineNumber.swift */; }; 2ADD0AD9217A967200F78732 /* NSTextView+LineNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2ADD0AD7217A967200F78732 /* NSTextView+LineNumber.swift */; }; - 2ADF3C011E6D7345009125BB /* SnippetsPane.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2ADF3BFF1E6D7345009125BB /* SnippetsPane.storyboard */; }; + 2ADF96412C1B05CD00B6B722 /* FileEncoding in Frameworks */ = {isa = PBXBuildFile; productRef = 2ADF96402C1B05CD00B6B722 /* FileEncoding */; }; + 2ADF96432C1B05D300B6B722 /* FileEncoding in Frameworks */ = {isa = PBXBuildFile; productRef = 2ADF96422C1B05D300B6B722 /* FileEncoding */; }; 2AE12DFB1E7DB47000681F72 /* Collection+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE12DFA1E7DB47000681F72 /* Collection+String.swift */; }; 2AE12DFC1E7DB47000681F72 /* Collection+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE12DFA1E7DB47000681F72 /* Collection+String.swift */; }; 2AE12DFE1E7DB7D200681F72 /* StringCollectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE12DFD1E7DB7D200681F72 /* StringCollectionTests.swift */; }; @@ -760,12 +741,24 @@ 2AE144B72B00A963005E8CF1 /* Identifiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144B52B00A963005E8CF1 /* Identifiable.swift */; }; 2AE144B92B00DCB7005E8CF1 /* View+Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144B82B00DCB7005E8CF1 /* View+Alert.swift */; }; 2AE144BA2B00DCB7005E8CF1 /* View+Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144B82B00DCB7005E8CF1 /* View+Alert.swift */; }; + 2AE144BC2B01E341005E8CF1 /* DonationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144BB2B01E341005E8CF1 /* DonationSettingsView.swift */; }; + 2AE144BD2B01E341005E8CF1 /* DonationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144BB2B01E341005E8CF1 /* DonationSettingsView.swift */; }; 2AE144C42B0222DB005E8CF1 /* LiveTextInsertionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144C32B0222DB005E8CF1 /* LiveTextInsertionView.swift */; }; 2AE144C52B0222DB005E8CF1 /* LiveTextInsertionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE144C32B0222DB005E8CF1 /* LiveTextInsertionView.swift */; }; + 2AE214E22BEB3011007EF0E9 /* CSVFormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE214E12BEB3011007EF0E9 /* CSVFormatStyle.swift */; }; + 2AE214E32BEB3011007EF0E9 /* CSVFormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE214E12BEB3011007EF0E9 /* CSVFormatStyle.swift */; }; + 2AE214E52BEBAD1A007EF0E9 /* UUID+Transferable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE214E42BEBAD1A007EF0E9 /* UUID+Transferable.swift */; }; + 2AE214E62BEBAD1A007EF0E9 /* UUID+Transferable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE214E42BEBAD1A007EF0E9 /* UUID+Transferable.swift */; }; 2AE3F3181D3F8A1F005B8724 /* NSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE3F3171D3F8A1F005B8724 /* NSAttributedString.swift */; }; 2AE3F3191D3F8A1F005B8724 /* NSAttributedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE3F3171D3F8A1F005B8724 /* NSAttributedString.swift */; }; - 2AE52F1B1D17493B00D60A32 /* FilePermissions+FormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE52F1A1D17493B00D60A32 /* FilePermissions+FormatStyle.swift */; }; - 2AE52F1C1D17493B00D60A32 /* FilePermissions+FormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE52F1A1D17493B00D60A32 /* FilePermissions+FormatStyle.swift */; }; + 2AE44DB82BE65C1F002A787D /* OutlineNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE44DB72BE65C1F002A787D /* OutlineNavigator.swift */; }; + 2AE44DB92BE65C1F002A787D /* OutlineNavigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE44DB72BE65C1F002A787D /* OutlineNavigator.swift */; }; + 2AE44DBB2BE67F81002A787D /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE44DBA2BE67F81002A787D /* ContentViewController.swift */; }; + 2AE44DBC2BE67F81002A787D /* ContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE44DBA2BE67F81002A787D /* ContentViewController.swift */; }; + 2AE44DCE2BE7C34D002A787D /* InAppPurchase.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A65520A2BDF4D880082B7D6 /* InAppPurchase.xcstrings */; }; + 2AE44DCF2BE7C355002A787D /* InAppPurchase.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2A65520A2BDF4D880082B7D6 /* InAppPurchase.xcstrings */; }; + 2AE44DD12BE7CF48002A787D /* Donation.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AE44DD02BE7CF48002A787D /* Donation.xcstrings */; }; + 2AE44DD22BE7CF48002A787D /* Donation.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 2AE44DD02BE7CF48002A787D /* Donation.xcstrings */; }; 2AE52F281D176B8500D60A32 /* FindPanelSplitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE52F271D176B8500D60A32 /* FindPanelSplitView.swift */; }; 2AE52F291D176B8500D60A32 /* FindPanelSplitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE52F271D176B8500D60A32 /* FindPanelSplitView.swift */; }; 2AE73F3D2039A29300D8903B /* URL+ExtendedAttribute.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE73F3C2039A29300D8903B /* URL+ExtendedAttribute.swift */; }; @@ -778,6 +771,8 @@ 2AE7A8DA20450FE600830830 /* OutlineInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */; }; 2AE95A1A2A86270000E85CF5 /* HoleContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE95A192A86270000E85CF5 /* HoleContentView.swift */; }; 2AE95A1B2A86270000E85CF5 /* HoleContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AE95A192A86270000E85CF5 /* HoleContentView.swift */; }; + 2AEAA1432C00B37300B5332F /* NSMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEAA1422C00B37300B5332F /* NSMenu.swift */; }; + 2AEAA1442C00B37300B5332F /* NSMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEAA1422C00B37300B5332F /* NSMenu.swift */; }; 2AEAA8232096380C001A175C /* HighlightExtractors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEAA8222096380C001A175C /* HighlightExtractors.swift */; }; 2AEAA8242096380C001A175C /* HighlightExtractors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEAA8222096380C001A175C /* HighlightExtractors.swift */; }; 2AEBD25A246BB4C200EC97A3 /* NSAttributedStringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEBD259246BB4C200EC97A3 /* NSAttributedStringTests.swift */; }; @@ -794,8 +789,6 @@ 2AEE84B31E8158D700BA7982 /* WriteToConsoleCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AEE84B11E8158D700BA7982 /* WriteToConsoleCommand.swift */; }; 2AF073E31D33C3AB00770BA6 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF073E21D33C3AB00770BA6 /* Theme.swift */; }; 2AF073E41D33C3AB00770BA6 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF073E21D33C3AB00770BA6 /* Theme.swift */; }; - 2AF073FB1D34587500770BA6 /* CharacterInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF073FA1D34587500770BA6 /* CharacterInfo.swift */; }; - 2AF073FC1D34587500770BA6 /* CharacterInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF073FA1D34587500770BA6 /* CharacterInfo.swift */; }; 2AF0C1251D3DA44900B6FCB6 /* FourCharCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF0C1241D3DA44900B6FCB6 /* FourCharCode.swift */; }; 2AF0C1261D3DA44900B6FCB6 /* FourCharCode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF0C1241D3DA44900B6FCB6 /* FourCharCode.swift */; }; 2AF0C1281D3DA6F800B6FCB6 /* FourCharCodeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF0C1271D3DA6F800B6FCB6 /* FourCharCodeTests.swift */; }; @@ -805,8 +798,6 @@ 2AF1D85921B8D9250060BC04 /* NSRegularExpression+Additions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF1D85721B8D9250060BC04 /* NSRegularExpression+Additions.swift */; }; 2AF29EC42882EE7700DF31D2 /* AdvancedCharacterCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF29EC32882EE7700DF31D2 /* AdvancedCharacterCounter.swift */; }; 2AF29EC52882EE7700DF31D2 /* AdvancedCharacterCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF29EC32882EE7700DF31D2 /* AdvancedCharacterCounter.swift */; }; - 2AF45E1E1E6C0D920030CD60 /* EditorCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF45E1D1E6C0D920030CD60 /* EditorCounter.swift */; }; - 2AF45E1F1E6C0D920030CD60 /* EditorCounter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF45E1D1E6C0D920030CD60 /* EditorCounter.swift */; }; 2AF5D0E5286D9AB3000BE826 /* ArithmeticsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF5D0E4286D9AB3000BE826 /* ArithmeticsTests.swift */; }; 2AF63BA82A6FA4D900E1258E /* NSTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF63BA72A6FA4D900E1258E /* NSTableView.swift */; }; 2AF63BA92A6FA4D900E1258E /* NSTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF63BA72A6FA4D900E1258E /* NSTableView.swift */; }; @@ -827,8 +818,6 @@ 2AFD218A27E0434100E83E88 /* UTType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD218927E0434100E83E88 /* UTType.swift */; }; 2AFD218B27E0434100E83E88 /* UTType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD218927E0434100E83E88 /* UTType.swift */; }; 2AFD218D27E0442B00E83E88 /* UTTypeExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD218C27E0442B00E83E88 /* UTTypeExtensionTests.swift */; }; - 2AFD328929482D53000ED1C5 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD328829482D53000ED1C5 /* Color.swift */; }; - 2AFD328A29482D53000ED1C5 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD328829482D53000ED1C5 /* Color.swift */; }; 2AFD328F2949B34A000ED1C5 /* RegularExpressionSyntaxTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFD328E2949B34A000ED1C5 /* RegularExpressionSyntaxTests.swift */; }; 2AFE848622AE71130001C4ED /* TextContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFE848522AE71130001C4ED /* TextContainer.swift */; }; 2AFE848722AE71130001C4ED /* TextContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AFE848522AE71130001C4ED /* TextContainer.swift */; }; @@ -883,8 +872,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 08C28FB2279CBE530016693E /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/UnicodeBlock.strings; sourceTree = ""; }; - 0D51D5922274EF5300A5D747 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UnicodeBlock.strings; sourceTree = ""; }; 2A04E9BA27FD6911008C82D8 /* SnippetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnippetTests.swift; sourceTree = ""; }; 2A05081223D6B9E900602F5E /* NSViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSViewController.swift; sourceTree = ""; }; 2A0778602072040500876277 /* RegularExpressionSyntaxType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegularExpressionSyntaxType.swift; sourceTree = ""; }; @@ -895,20 +882,19 @@ 2A07E8471DF160600022FF9C /* NSTouchBar+Validation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTouchBar+Validation.swift"; sourceTree = ""; }; 2A0A602A27ABD74500725B70 /* FilterField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterField.swift; sourceTree = ""; }; 2A0BF8A71DD8E7F90088961B /* TextSizeTouchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextSizeTouchBar.swift; sourceTree = ""; }; - 2A0DD6321E655C4A001CAAA3 /* TokenTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenTextView.swift; sourceTree = ""; }; + 2A0DD6321E655C4A001CAAA3 /* TokenTextEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenTextEditor.swift; sourceTree = ""; }; 2A0DD6351E655FE6001CAAA3 /* Tokenizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tokenizer.swift; sourceTree = ""; }; 2A1083EF2944837E00751DAE /* InsetTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InsetTextField.swift; sourceTree = ""; }; 2A10B6F421450A3B00B4205E /* NSAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAppearance.swift; sourceTree = ""; }; 2A10C5F61FD19237002AB5AE /* KeyBinding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyBinding.swift; sourceTree = ""; }; 2A10C5F91FD25D04002AB5AE /* Selector+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Selector+Codable.swift"; sourceTree = ""; }; 2A10D1091E708CDF0027192A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/KeyBindingTreeView.storyboard; sourceTree = ""; }; - 2A10D1271E714D230027192A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ThemeView.storyboard; sourceTree = ""; }; + 2A10D1271E714D230027192A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/ThemeListView.storyboard; sourceTree = ""; }; 2A10D1371E715E5B0027192A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SyntaxListView.storyboard; sourceTree = ""; }; 2A1125C023F180FF006A1DB2 /* LineRangeCacheableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineRangeCacheableTests.swift; sourceTree = ""; }; 2A1125C223F1A86B006A1DB2 /* LineRangeCacheable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineRangeCacheable.swift; sourceTree = ""; }; 2A1125C523F6EFB2006A1DB2 /* URLDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLDetector.swift; sourceTree = ""; }; 2A11F2121E669BFA005E1675 /* PointerBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PointerBridge.swift; sourceTree = ""; }; - 2A1235452121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Unicode.UTF32.CodeUnit+BlockName.swift"; sourceTree = ""; }; 2A1311D52127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+CurrentLineHighlighting.swift"; sourceTree = ""; }; 2A158C1B2945A6B1000A4EC1 /* HeadingMenuItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadingMenuItem.swift; sourceTree = ""; }; 2A158C1E2945E423000A4EC1 /* SavePanelAccessory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SavePanelAccessory.swift; sourceTree = ""; }; @@ -926,10 +912,8 @@ 2A1893A61FFF16A400AD244F /* PatternSortView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatternSortView.swift; sourceTree = ""; }; 2A1893A91FFF422D00AD244F /* LineSort.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineSort.swift; sourceTree = ""; }; 2A1893AC1FFF6A0100AD244F /* LineSortTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineSortTests.swift; sourceTree = ""; }; - 2A18A5BC1C4A730D00BAD817 /* EncodingDetectionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncodingDetectionTests.swift; sourceTree = ""; }; - 2A18A5BE1C4A746A00BAD817 /* Encodings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Encodings; path = TestFiles/Encodings; sourceTree = ""; }; + 2A18A5BC1C4A730D00BAD817 /* EncodingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncodingTests.swift; sourceTree = ""; }; 2A19AF852AE0D15300EFFDCB /* FormPopUpButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormPopUpButton.swift; sourceTree = ""; }; - 2A1A4EAB24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+DefaultKey.swift"; sourceTree = ""; }; 2A1A4EAF24FB9D9300B50AA0 /* Combine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Combine.swift; sourceTree = ""; }; 2A1ABC9A27F056E60054795D /* BidiScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BidiScrollView.swift; sourceTree = ""; }; 2A1ABCA427F079120054795D /* BidiScroller.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BidiScroller.swift; sourceTree = ""; }; @@ -948,14 +932,16 @@ 2A1EB5C319AD469500C1E37E /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2A1FAD5720A74D0A00566D7C /* MutableCopying.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutableCopying.swift; sourceTree = ""; }; 2A2179F51A07093B002C4AB1 /* SyntaxMap.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = SyntaxMap.json; sourceTree = ""; }; - 2A222C2F24FA8E0500251084 /* UserDefaults.Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.Publisher.swift; sourceTree = ""; }; + 2A21E6722BB44D5E0054C8A1 /* DonationSettings.xcstrings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json.xcstrings; path = DonationSettings.xcstrings; sourceTree = ""; }; 2A231A241E7B4EDC00C2A909 /* MultipleReplace+Codable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "MultipleReplace+Codable.swift"; sourceTree = ""; }; 2A231A271E7BD82700C2A909 /* Binding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Binding.swift; sourceTree = ""; }; 2A231A2C1E7BE8B700C2A909 /* FindProgress.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FindProgress.swift; sourceTree = ""; }; 2A231A351E7C30F000C2A909 /* MultipleReplaceSplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultipleReplaceSplitViewController.swift; sourceTree = ""; }; 2A231A381E7C31F400C2A909 /* MultipleReplaceListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultipleReplaceListViewController.swift; sourceTree = ""; }; + 2A24F90F2BEDDFEF00CB6CCF /* WhatsNewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhatsNewView.swift; sourceTree = ""; }; + 2A24F9122BEDF6D000CB6CCF /* CapsuleButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CapsuleButtonStyle.swift; sourceTree = ""; }; + 2A24F9152BEDFD9400CB6CCF /* WhatsNew.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = WhatsNew.xcstrings; sourceTree = ""; }; 2A25C52720F06BE80003AE1A /* CustomTabWidthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomTabWidthView.swift; sourceTree = ""; }; - 2A25D74C2AA714FC004D6681 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/NavigationBar.xcstrings; sourceTree = ""; }; 2A26156D2977B87F008C2240 /* StepperNumberField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepperNumberField.swift; sourceTree = ""; }; 2A2615732977CB48008C2240 /* SyntaxHighlightEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyntaxHighlightEditView.swift; sourceTree = ""; }; 2A2615762977D30E008C2240 /* SyntaxOutlineEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyntaxOutlineEditView.swift; sourceTree = ""; }; @@ -966,10 +952,12 @@ 2A2615852977F7E2008C2240 /* SyntaxEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyntaxEditView.swift; sourceTree = ""; }; 2A2615882977FCF6008C2240 /* SubmitButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubmitButtonGroup.swift; sourceTree = ""; }; 2A26158B2979052C008C2240 /* SyntaxObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyntaxObject.swift; sourceTree = ""; }; - 2A2792911D1DACC400F3FC5D /* ThemeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeViewController.swift; sourceTree = ""; }; + 2A2792911D1DACC400F3FC5D /* ThemeListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeListViewController.swift; sourceTree = ""; }; 2A2792941D1DBDAC00F3FC5D /* String+Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Constants.swift"; sourceTree = ""; }; 2A2792971D1E57DA00F3FC5D /* SyntaxListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyntaxListViewController.swift; sourceTree = ""; }; 2A2B085F28046E3B0028D733 /* WarningInspectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarningInspectorView.swift; sourceTree = ""; }; + 2A2E56D62C018ADB00416F9E /* ComparableTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComparableTests.swift; sourceTree = ""; }; + 2A2E56DA2C057FBF00416F9E /* BracePair.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BracePair.swift; sourceTree = ""; }; 2A2EEF172B778BB1001FEDFB /* WrappingHStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrappingHStack.swift; sourceTree = ""; }; 2A30C7DA2B1380BE002F6381 /* ShortcutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutView.swift; sourceTree = ""; }; 2A33D07D1D1C75B8005977B9 /* SyntaxValidationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyntaxValidationView.swift; sourceTree = ""; }; @@ -979,7 +967,6 @@ 2A3643E51E7C3D2400EA3CE8 /* ReplacementManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplacementManager.swift; sourceTree = ""; }; 2A36CE7B1FF654C000020702 /* NSTextView+Snippet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+Snippet.swift"; sourceTree = ""; }; 2A36E3702AF9ED0B00A73534 /* Sparkle.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Sparkle.xcstrings; sourceTree = ""; }; - 2A38FAFC1D1C67050032231A /* DraggableArrayController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DraggableArrayController.swift; sourceTree = ""; }; 2A39AC462B8B5C9700E216C9 /* OutlineItem+AttributedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OutlineItem+AttributedString.swift"; sourceTree = ""; }; 2A39AC802B8CDFC800E216C9 /* EncodingList.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = EncodingList.xcstrings; sourceTree = ""; }; 2A39AC912B8CE40400E216C9 /* GoToLine.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = GoToLine.xcstrings; sourceTree = ""; }; @@ -999,7 +986,6 @@ 2A3F18F7203270BE002F1CA7 /* UI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 2A3F18F9203270BE002F1CA7 /* UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = ""; }; 2A3F8F672429E04000CBBA89 /* DebouncerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebouncerTests.swift; sourceTree = ""; }; - 2A401FE81D9AF7CA00ACE036 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/UnicodeBlock.strings; sourceTree = ""; }; 2A40D2892AA8AEF000402373 /* FindPanelOptionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FindPanelOptionView.swift; sourceTree = ""; }; 2A41EC191DC4AD4A00F0C236 /* EditorTextView+TouchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+TouchBar.swift"; sourceTree = ""; }; 2A4257A61D22E0660086DAAD /* EncodingManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncodingManager.swift; sourceTree = ""; }; @@ -1017,15 +1003,10 @@ 2A478F3E22BE743200AEA45E /* NSTextView+Ligature.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+Ligature.swift"; sourceTree = ""; }; 2A47CD3721D340030094F62F /* NSValidatedUserInterfaceItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSValidatedUserInterfaceItem.swift; sourceTree = ""; }; 2A484A38236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSLayoutManager+ValidationIgnorable.swift"; sourceTree = ""; }; - 2A4A7D122856FF340085D2E7 /* HelpButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpButton.swift; sourceTree = ""; }; 2A4AF76620759BE500C47606 /* RegexFindPanelTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegexFindPanelTextView.swift; sourceTree = ""; }; 2A4CCBB31D45173000294067 /* EditorTextView+LineProcessing.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+LineProcessing.swift"; sourceTree = ""; }; - 2A4D69261D3FF61C00FBBD0B /* String+Encoding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Encoding.swift"; sourceTree = ""; }; 2A4E637F20ADC45F0033CE63 /* NSBezierPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSBezierPath.swift; sourceTree = ""; }; - 2A505C042988D44E002080AA /* ShortcutFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortcutFormatter.swift; sourceTree = ""; }; - 2A505C08298A88DD002080AA /* SnippetsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnippetsViewController.swift; sourceTree = ""; }; - 2A50AA61204D513500D10A10 /* DocumentFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentFile.swift; sourceTree = ""; }; - 2A51CF402BB45940001896F1 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/UnicodeBlock.strings; sourceTree = ""; }; + 2A50AA61204D513500D10A10 /* FileAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileAttributes.swift; sourceTree = ""; }; 2A53F56627585A0E00ED16DF /* RegularExpressionReferenceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegularExpressionReferenceView.swift; sourceTree = ""; }; 2A54BE2B1D40EB24000816B0 /* LineEndingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineEndingTests.swift; sourceTree = ""; }; 2A55D5D72B7A728A0092DE48 /* AdvancedCharacterCount.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = AdvancedCharacterCount.xcstrings; sourceTree = ""; }; @@ -1063,18 +1044,17 @@ 2A5EA1672A88F70C00D16730 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/Main.xcstrings; sourceTree = ""; }; 2A5EDDBA241B649C00A07810 /* moof.textClipping */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; name = moof.textClipping; path = TestFiles/moof.textClipping; sourceTree = ""; }; 2A5EDDBC241B64EB00A07810 /* TextClippingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextClippingTests.swift; sourceTree = ""; }; - 2A5F7CA41D152589001D83BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/NavigationBar.storyboard; sourceTree = ""; }; - 2A63A9D724E8C8F70017ACBB /* OutlinePopUpButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlinePopUpButton.swift; sourceTree = ""; }; + 2A63A9D724E8C8F70017ACBB /* OutlinePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlinePicker.swift; sourceTree = ""; }; 2A63CEC31D0B06D800ED8186 /* SyntaxTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyntaxTests.swift; sourceTree = ""; }; 2A63CECA1D0B0E7800ED8186 /* sample.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = sample.html; path = TestFiles/sample.html; sourceTree = ""; }; - 2A63FBE21D1D90E70081C84E /* ThemeEditorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeEditorView.swift; sourceTree = ""; }; + 2A63FBE21D1D90E70081C84E /* ThemeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeView.swift; sourceTree = ""; }; 2A6416A21D2F9F7200FA9E1A /* LineNumberView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineNumberView.swift; sourceTree = ""; }; - 2A64A2352387754000646BE4 /* UserDefaultsObservationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsObservationTests.swift; sourceTree = ""; }; 2A64F2411D256FCB001B229F /* KeyBindingManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyBindingManager.swift; sourceTree = ""; }; 2A64F2441D259E49001B229F /* SnippetManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnippetManager.swift; sourceTree = ""; }; 2A64F2471D26327C001B229F /* Shortcut+Error.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Shortcut+Error.swift"; sourceTree = ""; }; 2A64F24A1D26615A001B229F /* KeyBindingItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyBindingItem.swift; sourceTree = ""; }; - 2A657D1C2033ED6B00C2611C /* DefaultInitializable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefaultInitializable.swift; sourceTree = ""; }; + 2A65520A2BDF4D880082B7D6 /* InAppPurchase.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = InAppPurchase.xcstrings; sourceTree = ""; }; + 2A65520B2BE001A10082B7D6 /* CotEditor.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = CotEditor.storekit; sourceTree = ""; }; 2A65EC252B80C01B008096C5 /* FontPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontPicker.swift; sourceTree = ""; }; 2A65EC292B80C168008096C5 /* AppearanceSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppearanceSettingsView.swift; sourceTree = ""; }; 2A65EC3A2B80C667008096C5 /* ThemeEditor.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = ThemeEditor.xcstrings; sourceTree = ""; }; @@ -1088,21 +1068,16 @@ 2A6F0E091B55043800C2D03C /* CotEditor.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = CotEditor.entitlements; sourceTree = ""; }; 2A6FD9D01D38933100A59784 /* EditorTextViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorTextViewController.swift; sourceTree = ""; }; 2A6FD9D71D38C94100A59784 /* EditorTextView+Indenting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+Indenting.swift"; sourceTree = ""; }; - 2A6FD9DF1D393F9100A59784 /* SplitViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SplitViewController.swift; sourceTree = ""; }; 2A6FD9E61D394F5900A59784 /* LayoutManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayoutManager.swift; sourceTree = ""; }; 2A6FD9E91D3A819500A59784 /* EditorTextView+Commenting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+Commenting.swift"; sourceTree = ""; }; 2A6FD9EC1D3A85D700A59784 /* NSString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSString.swift; sourceTree = ""; }; - 2A6FD9F21D3ACEB500A59784 /* DefaultKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultKey.swift; sourceTree = ""; }; 2A6FD9F51D3AE29E00A59784 /* Syntax.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Syntax.swift; sourceTree = ""; }; - 2A7135821CFFDC6600ADA555 /* FilePermissionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilePermissionTests.swift; sourceTree = ""; }; 2A715E21261AC5960060CF84 /* CotEditor-Sparkle.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "CotEditor-Sparkle.entitlements"; sourceTree = ""; }; 2A719F6523CD92370026F877 /* FuzzyRangeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FuzzyRangeTests.swift; sourceTree = ""; }; 2A71BC7A1DDC50530085AE1C /* DocumentViewController+TouchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DocumentViewController+TouchBar.swift"; sourceTree = ""; }; 2A71BC7D1DDC70A80085AE1C /* NSImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSImage.swift; sourceTree = ""; }; 2A72DA0F209B778B005242B9 /* NSTextView+MultiCursor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+MultiCursor.swift"; sourceTree = ""; }; 2A733E8820BBB4AC0090D7CB /* String+Case.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Case.swift"; sourceTree = ""; }; - 2A73B5B31D4675350025337F /* Unicode.Scalar+ControlCharacter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Unicode.Scalar+ControlCharacter.swift"; sourceTree = ""; }; - 2A73B5BB1D468DD30025337F /* Unicode.Scalar+Information.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Unicode.Scalar+Information.swift"; sourceTree = ""; }; 2A73B9322A8F6620002F3A16 /* RegexTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegexTextField.swift; sourceTree = ""; }; 2A7470682B12FA5700669A7B /* NSTextStorage+TextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextStorage+TextView.swift"; sourceTree = ""; }; 2A75ACCA19E86DDB00444894 /* CotEditor.sdef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = CotEditor.sdef; sourceTree = ""; }; @@ -1115,26 +1090,22 @@ 2A78BFBB1D1B376000A583D2 /* ServicesProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServicesProvider.swift; sourceTree = ""; }; 2A7B279824E435FE00F02304 /* OutlineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineTests.swift; sourceTree = ""; }; 2A7C92FB29FD64A8008343C8 /* DefaultKey+FontType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DefaultKey+FontType.swift"; sourceTree = ""; }; + 2A7E06E52C1A711B00E5396D /* Libraries */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Libraries; sourceTree = ""; }; 2A7F4E012871F46D0029CE66 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/PrintPanelAccessory.storyboard; sourceTree = ""; }; 2A7FCC45280A367C0070EAB3 /* ValueRange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValueRange.swift; sourceTree = ""; }; 2A7FEF0A2B90B05C0042BEFF /* FilterField.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = FilterField.xcstrings; sourceTree = ""; }; - 2A7FEF322B90E1C20042BEFF /* Character.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Character.xcstrings; sourceTree = ""; }; 2A80BE8C27FFA61700D2F7FF /* LineEndingScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineEndingScanner.swift; sourceTree = ""; }; 2A80BE8F27FFFA8900D2F7FF /* LineEndingScannerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LineEndingScannerTests.swift; sourceTree = ""; }; 2A8321732980C41600F87D35 /* Image+Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image+Status.swift"; sourceTree = ""; }; 2A836D9E2AB1528700B4D458 /* ModeSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModeSettingsView.swift; sourceTree = ""; }; 2A836F7F1D572A5D0044E8EC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 2A8544E6267872E0006EF01A /* SyntaxMap */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SyntaxMap; sourceTree = ""; }; - 2A86C47A20371DBE00B9357C /* FilePermissions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilePermissions.swift; sourceTree = ""; }; 2A885E321D5C3A1B00288723 /* Comparable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Comparable.swift; sourceTree = ""; }; - 2A88E7701E81A2C7000019C6 /* OrderedSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderedSet.swift; sourceTree = ""; }; 2A89160B2394B87100AC13EE /* NSLayoutManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSLayoutManagerTests.swift; sourceTree = ""; }; - 2A8918E2294C33C900A23347 /* AppStorage+DefaultKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppStorage+DefaultKey.swift"; sourceTree = ""; }; 2A8961911DB76A3400E9E0EC /* MainMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainMenu.swift; sourceTree = ""; }; 2A8C338E1D3E1C040005B0B7 /* IncompatibleCharacter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncompatibleCharacter.swift; sourceTree = ""; }; 2A8DA9431D286C53003D0C4B /* ScriptManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScriptManager.swift; sourceTree = ""; }; 2A8DA9461D28ED93003D0C4B /* URL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = ""; }; - 2A8E25BA24DC59C400FCC33A /* FileEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileEncoding.swift; sourceTree = ""; }; 2A8E47E1299A2314006A40D8 /* EditedRangeSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditedRangeSet.swift; sourceTree = ""; }; 2A8E47E4299A2401006A40D8 /* EditedRangeSetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditedRangeSetTests.swift; sourceTree = ""; }; 2A8E47E6299B2F5C006A40D8 /* NSRangeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSRangeTests.swift; sourceTree = ""; }; @@ -1152,34 +1123,28 @@ 2A9082F11D32A9B500228F50 /* ThemeManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThemeManager.swift; sourceTree = ""; }; 2A91C3171D1BE91E007CF8BE /* DefaultSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultSettings.swift; sourceTree = ""; }; 2A91C31A1D1BFE47007CF8BE /* UTType+SettingFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UTType+SettingFile.swift"; sourceTree = ""; }; - 2A91C3201D1C40E4007CF8BE /* FileDropViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileDropViewController.swift; sourceTree = ""; }; 2A938ACB297E4BA9007FBE5F /* SettingsPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPane.swift; sourceTree = ""; }; 2A938ACE297E4D7B007FBE5F /* SettingsWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindowController.swift; sourceTree = ""; }; 2A94FC781BE2256F00B454A8 /* cot */ = {isa = PBXFileReference; explicitFileType = text.script.python; name = cot; path = cot/cot; sourceTree = SOURCE_ROOT; }; 2A954B232AB28B010070FB74 /* TextFind.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = TextFind.xcstrings; sourceTree = ""; }; 2A9AC936244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSLayoutManager+InvisibleDrawing.swift"; sourceTree = ""; }; 2A9B134D27E2D84E009954A4 /* NSDraggingInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSDraggingInfo.swift; sourceTree = ""; }; + 2A9BC2772BDE00B1008B58B5 /* Donation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Donation.swift; sourceTree = ""; }; 2A9BF3C31D382BB100E3D3E2 /* EditorTextView+Transformation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+Transformation.swift"; sourceTree = ""; }; 2A9BF3C61D38325200E3D3E2 /* String+FullwidthTransform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+FullwidthTransform.swift"; sourceTree = ""; }; - 2A9BF3CA1D3842FA00E3D3E2 /* String+Normalization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Normalization.swift"; sourceTree = ""; }; 2A9C07551CF9F982006D672D /* IncompatibleCharacterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncompatibleCharacterTests.swift; sourceTree = ""; }; 2A9C370A1D66E99400774BA4 /* Pair.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pair.swift; sourceTree = ""; }; 2A9C370D1D672A1F00774BA4 /* BracePairTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BracePairTests.swift; sourceTree = ""; }; - 2A9DE0122B55605200E8FD2A /* ShiftJISTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShiftJISTests.swift; sourceTree = ""; }; 2AA056AC26FCA171000E0CB2 /* Arithmetics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arithmetics.swift; sourceTree = ""; }; 2AA14CF71FA47E8900EAF586 /* ScriptDescriptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptDescriptor.swift; sourceTree = ""; }; 2AA14CFB1FA4983500EAF586 /* AppleScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppleScript.swift; sourceTree = ""; }; 2AA14CFE1FA498E900EAF586 /* UnixScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnixScript.swift; sourceTree = ""; }; 2AA14D011FA4999200EAF586 /* PersistentOSAScript.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersistentOSAScript.swift; sourceTree = ""; }; 2AA175F92AC5634500F6462C /* PopoverHolderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverHolderView.swift; sourceTree = ""; }; - 2AA2E00F1BFDE0190087BDD6 /* CharacterInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterInfoTests.swift; sourceTree = ""; }; - 2AA2E0121BFE12620087BDD6 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/UnicodeBlock.strings; sourceTree = ""; }; - 2AA2E0151BFE14310087BDD6 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UnicodeBlock.strings"; sourceTree = ""; }; - 2AA2E0161BFE14320087BDD6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/UnicodeBlock.strings; sourceTree = ""; }; 2AA2E0251C0454730087BDD6 /* StringIndentationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringIndentationTests.swift; sourceTree = ""; }; 2AA375461D40BDCB0080C27C /* LineEnding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineEnding.swift; sourceTree = ""; }; 2AA45A4A1D2E871900A1A401 /* EditorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorViewController.swift; sourceTree = ""; }; - 2AA45A501D2E938500A1A401 /* NavigationBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationBarController.swift; sourceTree = ""; }; + 2AA45A501D2E938500A1A401 /* NavigationBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationBar.swift; sourceTree = ""; }; 2AA45A531D2F22C600A1A401 /* NSFont+Size.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSFont+Size.swift"; sourceTree = ""; }; 2AA4D3731D1AA0AC001D261D /* KeyBindingsSettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyBindingsSettingsView.swift; sourceTree = ""; }; 2AA4EE3C28D55CE80014B045 /* DelegateContext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DelegateContext.swift; sourceTree = ""; }; @@ -1196,23 +1161,23 @@ 2AA6E0B82B744FF300E536F8 /* SyntaxEditor.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = SyntaxEditor.xcstrings; sourceTree = ""; }; 2AA6E0BE2B74728700E536F8 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/FindPanelFieldView.xcstrings; sourceTree = ""; }; 2AA704CD2987878B008CBCB5 /* Node.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Node.swift; sourceTree = ""; }; + 2AA71A522BE366520084EC0A /* Observation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Observation.swift; sourceTree = ""; }; 2AA749C21D3C263300850802 /* DocumentWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentWindowController.swift; sourceTree = ""; }; 2AA761341D45634400031AAF /* String+Counting.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Counting.swift"; sourceTree = ""; }; 2AA761391D457BD500031AAF /* String+Indentation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Indentation.swift"; sourceTree = ""; }; 2AA79C7721CB7251005AD6AD /* SettingsWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindow.swift; sourceTree = ""; }; + 2AA7BDDA2C1B10C80075BB6C /* UnicodeNormalizationForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnicodeNormalizationForm.swift; sourceTree = ""; }; 2AA7E97C1DBAAC950083B7ED /* Script.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Script.swift; sourceTree = ""; }; 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSSplitView+Autosave.swift"; sourceTree = ""; }; 2AAB4BF81D2435AC0049A68B /* DocumentInspectorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentInspectorView.swift; sourceTree = ""; }; 2AAB4BFB1D2437EA0049A68B /* IncompatibleCharactersView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncompatibleCharactersView.swift; sourceTree = ""; }; 2AAB4BFE1D2444930049A68B /* InspectorViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InspectorViewController.swift; sourceTree = ""; }; 2AACB1CC1D195ABD0073775B /* ShortcutField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShortcutField.swift; sourceTree = ""; }; - 2AAD61EB1D2A4CE5008FE772 /* Shortcut.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Shortcut.swift; sourceTree = ""; }; 2AAD61EF1D2B0856008FE772 /* FuzzyRange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FuzzyRange.swift; sourceTree = ""; }; 2AAD61F31D2BA0E0008FE772 /* OutlineItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OutlineItem.swift; sourceTree = ""; }; 2AAD61F71D2BA3F5008FE772 /* HighlightParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HighlightParser.swift; sourceTree = ""; }; - 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Additions.swift"; sourceTree = ""; }; + 2AAD61FB1D2BD102008FE772 /* String+LineRange.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+LineRange.swift"; sourceTree = ""; }; 2AAE8E612AF8AE3B008954B5 /* Syntax+Codable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Syntax+Codable.swift"; sourceTree = ""; }; - 2AAF6E9029BB8B45003DFF4B /* NSMenuItem+Shortcut.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMenuItem+Shortcut.swift"; sourceTree = ""; }; 2AAF93552A73DEE600CCC4A7 /* LineEnding.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = LineEnding.xcstrings; sourceTree = ""; }; 2AAFA7BB2B7A2DAF00A2B228 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MultipleReplaceListView.storyboard; sourceTree = ""; }; 2AAFA7D42B7A2F5800A2B228 /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/MultipleReplaceView.xcstrings; sourceTree = ""; }; @@ -1220,7 +1185,6 @@ 2AB1BD1B287D60DF00C6FEAF /* CharacterCountOptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterCountOptionsView.swift; sourceTree = ""; }; 2AB1BD1E287D747200C6FEAF /* SizeGetter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SizeGetter.swift; sourceTree = ""; }; 2AB1BD23287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterCountOptionsSheetView.swift; sourceTree = ""; }; - 2AB2913D245AAD74004CC203 /* Unicode.GeneralCategory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Unicode.GeneralCategory.swift; sourceTree = ""; }; 2AB541D920A5B6A400367DD5 /* NSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSView.swift; sourceTree = ""; }; 2AB857E72B922D7D0079CFA2 /* ModeManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModeManager.swift; sourceTree = ""; }; 2AB857EA2B93050E0079CFA2 /* ModeOptions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModeOptions.swift; sourceTree = ""; }; @@ -1231,15 +1195,17 @@ 2ABEFB6923DC0CA0008769F4 /* EditorCounterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorCounterTests.swift; sourceTree = ""; }; 2ABF49E2221A54AD00239278 /* TextClipping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextClipping.swift; sourceTree = ""; }; 2ABF86BC208C3C630082D52B /* AudioToolbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioToolbox.swift; sourceTree = ""; }; - 2ABFF6D61D02856A00BE2795 /* ShortcutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShortcutTests.swift; sourceTree = ""; }; + 2ABF9E922C1E8CFB0033D5E6 /* EditingContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditingContext.swift; sourceTree = ""; }; + 2ABF9E952C1E8D780033D5E6 /* String+LineProcessing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+LineProcessing.swift"; sourceTree = ""; }; + 2ABF9E9B2C1EC29D0033D5E6 /* String+Escaping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Escaping.swift"; sourceTree = ""; }; + 2ABF9E9E2C1EC8590033D5E6 /* String+Filename.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Filename.swift"; sourceTree = ""; }; + 2ABF9EA12C1ED4B90033D5E6 /* String+Commenting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Commenting.swift"; sourceTree = ""; }; 2AC13A0824F112D800799A93 /* CommandLineToolManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandLineToolManager.swift; sourceTree = ""; }; - 2AC186D91E2F414D002F4D27 /* NSDocument+ErrorHandling.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSDocument+ErrorHandling.swift"; sourceTree = ""; }; + 2AC186D91E2F414D002F4D27 /* NSDocument.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSDocument.swift; sourceTree = ""; }; 2AC186DC1E2F4264002F4D27 /* Debug.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Debug.swift; sourceTree = ""; }; 2AC2462D1D1BC70C00E46CFA /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 2AC39F721E8AC80E009F97D5 /* CollectionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionTests.swift; sourceTree = ""; }; - 2AC4E5D127A6C0300052A4DD /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/UnicodeBlock.strings"; sourceTree = ""; }; 2AC52BDA1D48CC0E007D6371 /* DispatchQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DispatchQueue.swift; sourceTree = ""; }; - 2AC605AE2B64CDE300E93E5B /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/UnicodeBlock.strings; sourceTree = ""; }; 2AC6069A20416ADE00F9C839 /* OpenPanelAccessory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenPanelAccessory.swift; sourceTree = ""; }; 2AC6BFD021D00ABD00FF325C /* NSTextView+RegexParse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+RegexParse.swift"; sourceTree = ""; }; 2AC7044724EBB76B00454706 /* NSToolbarItem+Validatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSToolbarItem+Validatable.swift"; sourceTree = ""; }; @@ -1275,23 +1241,27 @@ 2AD616CB1D3E583D0016EFB6 /* DocumentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentController.swift; sourceTree = ""; }; 2AD69B841D3E42F700FBD998 /* TextSelection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextSelection.swift; sourceTree = ""; }; 2AD69B871D3E4FCD00FBD998 /* NSTextView+ScriptingSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSTextView+ScriptingSupport.swift"; sourceTree = ""; }; - 2AD7B9AE1D3E832E00E5D6D7 /* DocumentAnalyzer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentAnalyzer.swift; sourceTree = ""; }; + 2AD7B9AE1D3E832E00E5D6D7 /* EditorCounter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorCounter.swift; sourceTree = ""; }; 2AD8D7492064AD83000BEFDB /* NumberTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberTextField.swift; sourceTree = ""; }; 2ADA15ED21C5073D00C6608B /* Collection+IndexSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+IndexSet.swift"; sourceTree = ""; }; 2ADB04AB2A89F14D00C4F562 /* AddRemoveButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddRemoveButton.swift; sourceTree = ""; }; 2ADBC91421C9F30000B884FF /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = ""; }; 2ADD0AD7217A967200F78732 /* NSTextView+LineNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+LineNumber.swift"; sourceTree = ""; }; - 2ADF3C001E6D7345009125BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/SnippetsPane.storyboard; sourceTree = ""; }; 2AE12DFA1E7DB47000681F72 /* Collection+String.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Collection+String.swift"; sourceTree = ""; }; 2AE12DFD1E7DB7D200681F72 /* StringCollectionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringCollectionTests.swift; sourceTree = ""; }; 2AE12DFF1E7DDB1B00681F72 /* EditorTextView+SurroundSelection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "EditorTextView+SurroundSelection.swift"; sourceTree = ""; }; 2AE12E061E7DDF0700681F72 /* CustomSurroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomSurroundView.swift; sourceTree = ""; }; 2AE144B52B00A963005E8CF1 /* Identifiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Identifiable.swift; sourceTree = ""; }; 2AE144B82B00DCB7005E8CF1 /* View+Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Alert.swift"; sourceTree = ""; }; + 2AE144BB2B01E341005E8CF1 /* DonationSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DonationSettingsView.swift; sourceTree = ""; }; 2AE144C32B0222DB005E8CF1 /* LiveTextInsertionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveTextInsertionView.swift; sourceTree = ""; }; + 2AE214E12BEB3011007EF0E9 /* CSVFormatStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSVFormatStyle.swift; sourceTree = ""; }; + 2AE214E42BEBAD1A007EF0E9 /* UUID+Transferable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UUID+Transferable.swift"; sourceTree = ""; }; 2AE3F3171D3F8A1F005B8724 /* NSAttributedString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NSAttributedString.swift; sourceTree = ""; }; + 2AE44DB72BE65C1F002A787D /* OutlineNavigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineNavigator.swift; sourceTree = ""; }; + 2AE44DBA2BE67F81002A787D /* ContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentViewController.swift; sourceTree = ""; }; + 2AE44DD02BE7CF48002A787D /* Donation.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Donation.xcstrings; sourceTree = ""; }; 2AE4658627A5A7CE00D2904F /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = ""; }; - 2AE52F1A1D17493B00D60A32 /* FilePermissions+FormatStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FilePermissions+FormatStyle.swift"; sourceTree = ""; }; 2AE52F271D176B8500D60A32 /* FindPanelSplitView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FindPanelSplitView.swift; sourceTree = ""; }; 2AE56CC6265F2F4C00B8A278 /* AdvancedCharacterCounterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedCharacterCounterView.swift; sourceTree = ""; }; 2AE73F3C2039A29300D8903B /* URL+ExtendedAttribute.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+ExtendedAttribute.swift"; sourceTree = ""; }; @@ -1299,6 +1269,7 @@ 2AE73F42203E753C00D8903B /* NSTextView+Selection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTextView+Selection.swift"; sourceTree = ""; }; 2AE7A8D820450FE600830830 /* OutlineInspectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineInspectorView.swift; sourceTree = ""; }; 2AE95A192A86270000E85CF5 /* HoleContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HoleContentView.swift; sourceTree = ""; }; + 2AEAA1422C00B37300B5332F /* NSMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSMenu.swift; sourceTree = ""; }; 2AEAA8222096380C001A175C /* HighlightExtractors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HighlightExtractors.swift; sourceTree = ""; }; 2AEBD259246BB4C200EC97A3 /* NSAttributedStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSAttributedStringTests.swift; sourceTree = ""; }; 2AEC48321E641E4F00FB0F89 /* Snippet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Snippet.swift; sourceTree = ""; }; @@ -1308,17 +1279,14 @@ 2AED70ED1D2E36EF006FFBCE /* DocumentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentViewController.swift; sourceTree = ""; }; 2AEE84B11E8158D700BA7982 /* WriteToConsoleCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WriteToConsoleCommand.swift; sourceTree = ""; }; 2AF073E21D33C3AB00770BA6 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = ""; }; - 2AF073FA1D34587500770BA6 /* CharacterInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharacterInfo.swift; sourceTree = ""; }; 2AF0C1241D3DA44900B6FCB6 /* FourCharCode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FourCharCode.swift; sourceTree = ""; }; 2AF0C1271D3DA6F800B6FCB6 /* FourCharCodeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FourCharCodeTests.swift; sourceTree = ""; }; 2AF0C12C1D3DABD000B6FCB6 /* Document+ScriptingSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Document+ScriptingSupport.swift"; sourceTree = ""; }; - 2AF1229E2B7A3D50004BA1FF /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/ThemeView.xcstrings; sourceTree = ""; }; + 2AF1229E2B7A3D50004BA1FF /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/ThemeListView.xcstrings; sourceTree = ""; }; 2AF1229F2B7A3D50004BA1FF /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/KeyBindingTreeView.xcstrings; sourceTree = ""; }; 2AF122A22B7A3D50004BA1FF /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/SyntaxListView.xcstrings; sourceTree = ""; }; - 2AF122A42B7A3D50004BA1FF /* mul */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; name = mul; path = mul.lproj/SnippetsPane.xcstrings; sourceTree = ""; }; 2AF1D85721B8D9250060BC04 /* NSRegularExpression+Additions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSRegularExpression+Additions.swift"; sourceTree = ""; }; 2AF29EC32882EE7700DF31D2 /* AdvancedCharacterCounter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedCharacterCounter.swift; sourceTree = ""; }; - 2AF45E1D1E6C0D920030CD60 /* EditorCounter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorCounter.swift; sourceTree = ""; }; 2AF482D9279288CF00A86481 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = ""; }; 2AF482DA279288CF00A86481 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 2AF5D0E4286D9AB3000BE826 /* ArithmeticsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArithmeticsTests.swift; sourceTree = ""; }; @@ -1332,7 +1300,6 @@ 2AFB5AE71D597ABB003895A7 /* DefaultSettings+Encodings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DefaultSettings+Encodings.swift"; sourceTree = ""; }; 2AFD218927E0434100E83E88 /* UTType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTType.swift; sourceTree = ""; }; 2AFD218C27E0442B00E83E88 /* UTTypeExtensionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTTypeExtensionTests.swift; sourceTree = ""; }; - 2AFD328829482D53000ED1C5 /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; 2AFD328E2949B34A000ED1C5 /* RegularExpressionSyntaxTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegularExpressionSyntaxTests.swift; sourceTree = ""; }; 2AFE848522AE71130001C4ED /* TextContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextContainer.swift; sourceTree = ""; }; 2AFECF592171C0E60065A7DE /* Bundle+AppInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+AppInfo.swift"; sourceTree = ""; }; @@ -1346,11 +1313,8 @@ 5454B92D243C8257009275BC /* CotEditor-Sparkle.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "CotEditor-Sparkle.xcconfig"; sourceTree = ""; }; 5454B92E243C8257009275BC /* CotEditor.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CotEditor.xcconfig; sourceTree = ""; }; 5454B933243C8271009275BC /* CotEditor-AdHoc.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "CotEditor-AdHoc.entitlements"; sourceTree = ""; }; - 57ED31741FFD892900F16CAD /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/UnicodeBlock.strings; sourceTree = ""; }; - 5B91B7D4282A6851005CBD5C /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/UnicodeBlock.strings"; sourceTree = ""; }; 8D15AC360486D014006FF6A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8D15AC370486D014006FF6A4 /* CotEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CotEditor.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 99A8630F2A753A8400EEEE75 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/UnicodeBlock.strings; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1358,8 +1322,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2A3268932C1C580800CF1AAF /* Defaults in Frameworks */, + 2A38536A2C1AF43100C282C0 /* FilePermissions in Frameworks */, 2ACD02BF22A87F0400893051 /* ColorCode in Frameworks */, + 2AA7BDD62C1B0CC10075BB6C /* UnicodeNormalization in Frameworks */, 2AA2C6FC24399A920017D1EC /* Yams in Frameworks */, + 2A32688E2C1B504500CF1AAF /* Shortcut in Frameworks */, + 2ADF96412C1B05CD00B6B722 /* FileEncoding in Frameworks */, + 2A7E06E82C1A745400E5396D /* CharacterInfo in Frameworks */, 2ACAAC1C2B85E74C0041B095 /* SyntaxMap in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1368,8 +1338,14 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2A7E06EA2C1A745E00E5396D /* CharacterInfo in Frameworks */, + 2A3853682C1AF42C00C282C0 /* FilePermissions in Frameworks */, + 2A3268902C1B504B00CF1AAF /* Shortcut in Frameworks */, + 2AA7BDD82C1B0CC70075BB6C /* UnicodeNormalization in Frameworks */, + 2A3268952C1C580D00CF1AAF /* Defaults in Frameworks */, 2AAAE6E526DB82F800C5F0AC /* Sparkle in Frameworks */, 2ACD02BD22A87EFD00893051 /* ColorCode in Frameworks */, + 2ADF96432C1B05D300B6B722 /* FileEncoding in Frameworks */, 2ACAAC1E2B85E7530041B095 /* SyntaxMap in Frameworks */, 2AA2C6FE24399AA20017D1EC /* Yams in Frameworks */, ); @@ -1404,7 +1380,6 @@ 2A04E9C127FEF737008C82D8 /* SwiftUI */ = { isa = PBXGroup; children = ( - 2AFD328829482D53000ED1C5 /* Color.swift */, 2A8321732980C41600F87D35 /* Image+Status.swift */, 2AE144B82B00DCB7005E8CF1 /* View+Alert.swift */, 2A231A271E7BD82700C2A909 /* Binding.swift */, @@ -1425,9 +1400,8 @@ 2A149DAF19016AD800A9D6EF /* Settings */ = { isa = PBXGroup; children = ( - 2A10D1261E714D230027192A /* ThemeView.storyboard */, + 2A10D1261E714D230027192A /* ThemeListView.storyboard */, 2A10D1361E715E5B0027192A /* SyntaxListView.storyboard */, - 2ADF3BFF1E6D7345009125BB /* SnippetsPane.storyboard */, 2A10D1081E708CDF0027192A /* KeyBindingTreeView.storyboard */, ); name = Settings; @@ -1444,6 +1418,7 @@ 2AFFA7C22B16E93B005652CD /* FormatSettingsView.swift */, 2ACDA2522B813FA500B2EBA8 /* SnippetsSettingsView.swift */, 2AA4D3731D1AA0AC001D261D /* KeyBindingsSettingsView.swift */, + 2AE144BB2B01E341005E8CF1 /* DonationSettingsView.swift */, ); name = Panes; sourceTree = ""; @@ -1454,7 +1429,7 @@ 2A836F7E1D572A5D0044E8EC /* Main.storyboard */, 2A149DAF19016AD800A9D6EF /* Settings */, 2A2D6C1A1A602D7E002451FF /* Text Finder */, - 2A436DDC1A426EAE00275FD4 /* Document Window */, + 2A436DDC1A426EAE00275FD4 /* Accessories */, ); name = Storyboards; sourceTree = ""; @@ -1480,10 +1455,8 @@ 2A15832B18E3A25C00601026 /* Utilities */ = { isa = PBXGroup; children = ( - 2A1A4EAE24FB7BEF00B50AA0 /* UserDefaults */, 2A3E61C627C4962B00C6E5B6 /* Formatters */, 2AC186DC1E2F4264002F4D27 /* Debug.swift */, - 2A88E7701E81A2C7000019C6 /* OrderedSet.swift */, 2A8E47E1299A2314006A40D8 /* EditedRangeSet.swift */, 2AA704CD2987878B008CBCB5 /* Node.swift */, 2A11F2121E669BFA005E1675 /* PointerBridge.swift */, @@ -1492,8 +1465,6 @@ 2AFB30DE1E4B8F5B00BFAEF3 /* Debouncer.swift */, 2AD238792939AC7200209834 /* UserUnixTask.swift */, 2ACFE5861D2037800005233A /* DetachablePopoverViewController.swift */, - 2A38FAFC1D1C67050032231A /* DraggableArrayController.swift */, - 2A657D1C2033ED6B00C2611C /* DefaultInitializable.swift */, ); name = Utilities; sourceTree = ""; @@ -1506,12 +1477,10 @@ 2AE95A192A86270000E85CF5 /* HoleContentView.swift */, 2A68722E288A5C44006D6B41 /* DraggableHostingView.swift */, 2ACDC0901D1726BD009B72D6 /* DotView.swift */, - 2A0DD6321E655C4A001CAAA3 /* TokenTextView.swift */, 2AD8D7492064AD83000BEFDB /* NumberTextField.swift */, 2AACB1CC1D195ABD0073775B /* ShortcutField.swift */, 2A5DCE4E1D185F1B00D5D74C /* CharacterField.swift */, 2A1814BD21CFC9CF00602214 /* RegularExpressionTextField.swift */, - 2A63A9D724E8C8F70017ACBB /* OutlinePopUpButton.swift */, 2A19AF852AE0D15300EFFDCB /* FormPopUpButton.swift */, 2ACDC0961D172B2A009B72D6 /* PaddingTextFieldCell.swift */, 2A158C1B2945A6B1000A4EC1 /* HeadingMenuItem.swift */, @@ -1541,6 +1510,7 @@ 2A8961911DB76A3400E9E0EC /* MainMenu.swift */, 2A78BFBB1D1B376000A583D2 /* ServicesProvider.swift */, 2A78BFB21D1B240900A583D2 /* UpdaterManager.swift */, + 2A9BC2772BDE00B1008B58B5 /* Donation.swift */, 2AFB5AEA1D597AFC003895A7 /* Defaults */, ); name = Application; @@ -1558,17 +1528,6 @@ name = TextKit; sourceTree = ""; }; - 2A1A4EAE24FB7BEF00B50AA0 /* UserDefaults */ = { - isa = PBXGroup; - children = ( - 2A6FD9F21D3ACEB500A59784 /* DefaultKey.swift */, - 2A1A4EAB24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift */, - 2A222C2F24FA8E0500251084 /* UserDefaults.Publisher.swift */, - 2A8918E2294C33C900A23347 /* AppStorage+DefaultKey.swift */, - ); - name = UserDefaults; - sourceTree = ""; - }; 2A1A4EB224FBA28100B50AA0 /* Swift */ = { isa = PBXGroup; children = ( @@ -1577,6 +1536,7 @@ 2A5ADE831D2168FC00F6CE26 /* Collection.swift */, 2A5C00332814698000700CAE /* Collection+BinarySearch.swift */, 2A1A4EAF24FB9D9300B50AA0 /* Combine.swift */, + 2AA71A522BE366520084EC0A /* Observation.swift */, ); name = Swift; sourceTree = ""; @@ -1611,15 +1571,19 @@ name = Window; sourceTree = ""; }; - 2A2184221D043D7E00522EF5 /* Document View */ = { + 2A2184221D043D7E00522EF5 /* Content View */ = { isa = PBXGroup; children = ( + 2AE44DBA2BE67F81002A787D /* ContentViewController.swift */, + 2AD21FCB1D2E3BE80018C8D1 /* StatusBar.swift */, 2AED70ED1D2E36EF006FFBCE /* DocumentViewController.swift */, 2A71BC7A1DDC50530085AE1C /* DocumentViewController+TouchBar.swift */, - 2A6FD9DF1D393F9100A59784 /* SplitViewController.swift */, - 2AD21FCB1D2E3BE80018C8D1 /* StatusBar.swift */, + 2AA45A4A1D2E871900A1A401 /* EditorViewController.swift */, + 2AA45A501D2E938500A1A401 /* NavigationBar.swift */, + 2A6FD9D01D38933100A59784 /* EditorTextViewController.swift */, + 2AE44DB72BE65C1F002A787D /* OutlineNavigator.swift */, ); - name = "Document View"; + name = "Content View"; sourceTree = ""; }; 2A231A2A1E7BD92F00C2A909 /* Models */ = { @@ -1678,12 +1642,13 @@ 2A10B6F421450A3B00B4205E /* NSAppearance.swift */, 2A9003B8267715E500EC766F /* NSApplication.swift */, 2A359DFD1DAE93EE00FEF7AA /* NSWindow+Responder.swift */, - 2AC186D91E2F414D002F4D27 /* NSDocument+ErrorHandling.swift */, + 2AC186D91E2F414D002F4D27 /* NSDocument.swift */, 2A05081223D6B9E900602F5E /* NSViewController.swift */, 2AB541D920A5B6A400367DD5 /* NSView.swift */, 2AA86281212ED91400BB75C9 /* NSSplitView+Autosave.swift */, 2A1ABCA727F07CED0054795D /* NSScroller.swift */, 2AF9961F235ACDD60041872E /* NSPrintInfo.swift */, + 2AEAA1422C00B37300B5332F /* NSMenu.swift */, 2A47CD3721D340030094F62F /* NSValidatedUserInterfaceItem.swift */, 2A07E8471DF160600022FF9C /* NSTouchBar+Validation.swift */, 2A9B134D27E2D84E009954A4 /* NSDraggingInfo.swift */, @@ -1700,20 +1665,23 @@ 2ADA15ED21C5073D00C6608B /* Collection+IndexSet.swift */, 2AE12DFA1E7DB47000681F72 /* Collection+String.swift */, 2A2792941D1DBDAC00F3FC5D /* String+Constants.swift */, - 2AAD61FB1D2BD102008FE772 /* String+Additions.swift */, + 2ABF9E9B2C1EC29D0033D5E6 /* String+Escaping.swift */, + 2AAD61FB1D2BD102008FE772 /* String+LineRange.swift */, 2AA761341D45634400031AAF /* String+Counting.swift */, 2AA5BCF924FFB21C00618F83 /* String+Match.swift */, - 2A9BF3CA1D3842FA00E3D3E2 /* String+Normalization.swift */, 2A9BF3C61D38325200E3D3E2 /* String+FullwidthTransform.swift */, 2A733E8820BBB4AC0090D7CB /* String+Case.swift */, - 2A4D69261D3FF61C00FBBD0B /* String+Encoding.swift */, 2AA761391D457BD500031AAF /* String+Indentation.swift */, + 2ABF9EA12C1ED4B90033D5E6 /* String+Commenting.swift */, + 2ABF9E952C1E8D780033D5E6 /* String+LineProcessing.swift */, + 2ABF9E9E2C1EC8590033D5E6 /* String+Filename.swift */, 2A8E47E8299C6064006A40D8 /* NSRange.swift */, 2A6FD9EC1D3A85D700A59784 /* NSString.swift */, 2AE3F3171D3F8A1F005B8724 /* NSAttributedString.swift */, 2AF1D85721B8D9250060BC04 /* NSRegularExpression+Additions.swift */, 2A8DA9461D28ED93003D0C4B /* URL.swift */, 2AE73F3C2039A29300D8903B /* URL+ExtendedAttribute.swift */, + 2AE214E42BEBAD1A007EF0E9 /* UUID+Transferable.swift */, 2AC52BDA1D48CC0E007D6371 /* DispatchQueue.swift */, 2A10C5F91FD25D04002AB5AE /* Selector+Codable.swift */, 2A685F692027729000A130A4 /* NSAppleEventManager+Additions.swift */, @@ -1737,7 +1705,7 @@ 2A37F4AFFDCFA73011CA2CEA /* Scripts */, 2AC71DE01BF0BDBC002E1434 /* Tests */, 2A3F18F8203270BE002F1CA7 /* UI Tests */, - 2A8544E6267872E0006EF01A /* SyntaxMap */, + 2A7E06EB2C1A79B600E5396D /* Packages */, 19C28FB0FE9D524F11CA2CBB /* Products */, ); name = CotEditor; @@ -1781,7 +1749,6 @@ 2A1EB5C319AD469500C1E37E /* Assets.xcassets */, 2A149DC91902BC3900A9D6EF /* Storyboards */, 2AC94B262B6E2E110086F9F2 /* Localizables */, - 2AA2E0111BFE12620087BDD6 /* UnicodeBlock.strings */, 2A8EAE3D2BA3B15D00448875 /* Credits.json */, 2A2179F51A07093B002C4AB1 /* SyntaxMap.json */, 2A3A758D19E77C84001DAB88 /* Syntaxes */, @@ -1816,8 +1783,7 @@ isa = PBXGroup; children = ( 2A1814B721CF8BD500602214 /* RegularExpressionFormatter.swift */, - 2A505C042988D44E002080AA /* ShortcutFormatter.swift */, - 2AE52F1A1D17493B00D60A32 /* FilePermissions+FormatStyle.swift */, + 2AE214E12BEB3011007EF0E9 /* CSVFormatStyle.swift */, 2A57B98E294ED75900771696 /* RangedIntegerFormatStyle.swift */, ); name = Formatters; @@ -1831,6 +1797,7 @@ 2A715E21261AC5960060CF84 /* CotEditor-Sparkle.entitlements */, 5454B933243C8271009275BC /* CotEditor-AdHoc.entitlements */, 2A75ACCA19E86DDB00444894 /* CotEditor.sdef */, + 2A65520B2BE001A10082B7D6 /* CotEditor.storekit */, 2A6E3F3C19B5218300A63E97 /* CotEditor.help */, ); name = "Supporting Files"; @@ -1882,7 +1849,6 @@ children = ( 2AD616CB1D3E583D0016EFB6 /* DocumentController.swift */, 2A1679E51D3CE07100E8261D /* Document.swift */, - 2A50AA61204D513500D10A10 /* DocumentFile.swift */, ); name = Document; sourceTree = ""; @@ -1894,62 +1860,58 @@ 2A17A3121D2D16F1001DD717 /* WindowContentViewController.swift */, 2A2184121D0426E800522EF5 /* Window */, 2ADD36941CFCAD4200F3175D /* Inspector */, - 2A2184221D043D7E00522EF5 /* Document View */, - 2AD2861919856F3100C9342F /* Editor */, + 2A2184221D043D7E00522EF5 /* Content View */, 2A6602EB1D05E04E003E8D87 /* Accessory Views */, 2A0E160B18E7240C00AAD872 /* Print */, ); name = "Document Window"; sourceTree = ""; }; - 2A436DDC1A426EAE00275FD4 /* Document Window */ = { + 2A436DDC1A426EAE00275FD4 /* Accessories */ = { isa = PBXGroup; children = ( - 2A5F7CA31D152589001D83BC /* NavigationBar.storyboard */, 2A7F4E022871F46D0029CE66 /* PrintPanelAccessory.storyboard */, ); - name = "Document Window"; + name = Accessories; sourceTree = ""; }; 2A476CAF1D09CA640088E37A /* Models */ = { isa = PBXGroup; children = ( - 2AA2E00D1BFDD3AE0087BDD6 /* Character */, 2A89847C1C3CE1CE006290FF /* Syntax */, 2AA14CFA1FA47E9000EAF586 /* Script */, - 2A505C07298952E5002080AA /* Shortcut */, + 2A505C07298952E5002080AA /* KeyBinding */, 2A78F571298C90520084B8B4 /* Snippet */, 2AC6BFCF21D00A8500FF325C /* Regex Parser */, + 2ABF9E922C1E8CFB0033D5E6 /* EditingContext.swift */, 2AA375461D40BDCB0080C27C /* LineEnding.swift */, - 2A8E25BA24DC59C400FCC33A /* FileEncoding.swift */, 2A8C338E1D3E1C040005B0B7 /* IncompatibleCharacter.swift */, 2AAD61EF1D2B0856008FE772 /* FuzzyRange.swift */, 2A4257BB1D239F850086DAAD /* Invisible.swift */, + 2A50AA61204D513500D10A10 /* FileAttributes.swift */, 2AF073E21D33C3AB00770BA6 /* Theme.swift */, 2ACF23AD26302A4C002B5E10 /* Theme+Syntax.swift */, 2A1E7DD32B8C5A23004F0C07 /* Mode.swift */, 2AB857EA2B93050E0079CFA2 /* ModeOptions.swift */, 2A9C370A1D66E99400774BA4 /* Pair.swift */, + 2A2E56DA2C057FBF00416F9E /* BracePair.swift */, 2A7FCC45280A367C0070EAB3 /* ValueRange.swift */, 2ABF49E2221A54AD00239278 /* TextClipping.swift */, 2A1893A91FFF422D00AD244F /* LineSort.swift */, - 2A86C47A20371DBE00B9357C /* FilePermissions.swift */, 2A341D19281EE23C00B85CB6 /* UserActivity.swift */, 2A55D5E92B7A86190092DE48 /* IssueReport.swift */, ); name = Models; sourceTree = ""; }; - 2A505C07298952E5002080AA /* Shortcut */ = { + 2A505C07298952E5002080AA /* KeyBinding */ = { isa = PBXGroup; children = ( - 2AAD61EB1D2A4CE5008FE772 /* Shortcut.swift */, 2A64F2471D26327C001B229F /* Shortcut+Error.swift */, - 2AAF6E9029BB8B45003DFF4B /* NSMenuItem+Shortcut.swift */, 2A10C5F61FD19237002AB5AE /* KeyBinding.swift */, 2A64F24A1D26615A001B229F /* KeyBindingItem.swift */, ); - name = Shortcut; + name = KeyBinding; sourceTree = ""; }; 2A53F5692758912600ED16DF /* SwiftUI */ = { @@ -1969,6 +1931,7 @@ 2A359E001DAEA0EE00FEF7AA /* AppKit */, 2A180F462854E58400EBAF66 /* TextKit */, 2A04E9C127FEF737008C82D8 /* SwiftUI */, + 2AA7BDD92C1B10A80075BB6C /* Libraries */, ); name = Extensions; sourceTree = ""; @@ -2025,6 +1988,15 @@ name = "Text Finder"; sourceTree = ""; }; + 2A7E06EB2C1A79B600E5396D /* Packages */ = { + isa = PBXGroup; + children = ( + 2A7E06E52C1A711B00E5396D /* Libraries */, + 2A8544E6267872E0006EF01A /* SyntaxMap */, + ); + path = Packages; + sourceTree = ""; + }; 2A7FEF0D2B90B1800042BEFF /* Views */ = { isa = PBXGroup; children = ( @@ -2040,6 +2012,7 @@ isa = PBXGroup; children = ( 2A07A8F92BABC182007CABFD /* About.xcstrings */, + 2A24F9152BEDFD9400CB6CCF /* WhatsNew.xcstrings */, 2A1E7E4E2B8D9706004F0C07 /* Console.xcstrings */, 2ACDA2882B81E2AC00B2EBA8 /* ColorCode.xcstrings */, 2A07A9022BABC1FA007CABFD /* CommandBar.xcstrings */, @@ -2050,8 +2023,7 @@ 2A80BE9327FFFBAB00D2F7FF /* Scanners */ = { isa = PBXGroup; children = ( - 2AD7B9AE1D3E832E00E5D6D7 /* DocumentAnalyzer.swift */, - 2AF45E1D1E6C0D920030CD60 /* EditorCounter.swift */, + 2AD7B9AE1D3E832E00E5D6D7 /* EditorCounter.swift */, 2A80BE8C27FFA61700D2F7FF /* LineEndingScanner.swift */, 2A1125C523F6EFB2006A1DB2 /* URLDetector.swift */, ); @@ -2079,13 +2051,11 @@ 2A91C3231D1C5840007CF8BE /* Other Views */ = { isa = PBXGroup; children = ( - 2A2792911D1DACC400F3FC5D /* ThemeViewController.swift */, - 2A63FBE21D1D90E70081C84E /* ThemeEditorView.swift */, + 2A63FBE21D1D90E70081C84E /* ThemeView.swift */, + 2A2792911D1DACC400F3FC5D /* ThemeListViewController.swift */, 2A2792971D1E57DA00F3FC5D /* SyntaxListViewController.swift */, 2A5DCE881D18FFDB00D5D74C /* EncodingListView.swift */, 2A5DCE851D1888D800D5D74C /* SyntaxMappingConflictView.swift */, - 2A505C08298A88DD002080AA /* SnippetsViewController.swift */, - 2A91C3201D1C40E4007CF8BE /* FileDropViewController.swift */, ); name = "Other Views"; sourceTree = ""; @@ -2114,22 +2084,9 @@ name = Script; sourceTree = ""; }; - 2AA2E00D1BFDD3AE0087BDD6 /* Character */ = { - isa = PBXGroup; - children = ( - 2AF073FA1D34587500770BA6 /* CharacterInfo.swift */, - 2A73B5BB1D468DD30025337F /* Unicode.Scalar+Information.swift */, - 2A73B5B31D4675350025337F /* Unicode.Scalar+ControlCharacter.swift */, - 2AB2913D245AAD74004CC203 /* Unicode.GeneralCategory.swift */, - 2A1235452121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift */, - ); - name = Character; - sourceTree = ""; - }; 2AA6725B2B8F74D900B8F7E6 /* Models */ = { isa = PBXGroup; children = ( - 2A7FEF322B90E1C20042BEFF /* Character.xcstrings */, 2AAF93552A73DEE600CCC4A7 /* LineEnding.xcstrings */, 2A5E6FC02A72342700E33EA7 /* UnicodeNormalization.xcstrings */, 2A07A8FC2BABC1C3007CABFD /* Syntax.xcstrings */, @@ -2138,6 +2095,7 @@ 2AA6727D2B8F784700B8F7E6 /* Snippet.xcstrings */, 2AA6728F2B8F7DF100B8F7E6 /* Shortcut.xcstrings */, 2ACDA29F2B81E8C300B2EBA8 /* IssueReport.xcstrings */, + 2AE44DD02BE7CF48002A787D /* Donation.xcstrings */, ); name = Models; sourceTree = ""; @@ -2163,10 +2121,19 @@ 2AB9E4C22B830902004E5BDC /* FormatSettings.xcstrings */, 2ACDA29C2B81E8BF00B2EBA8 /* SnippetsSettings.xcstrings */, 2A1E7DCB2B889A1F004F0C07 /* KeyBindingsSettings.xcstrings */, + 2A21E6722BB44D5E0054C8A1 /* DonationSettings.xcstrings */, ); name = Panes; sourceTree = ""; }; + 2AA7BDD92C1B10A80075BB6C /* Libraries */ = { + isa = PBXGroup; + children = ( + 2AA7BDDA2C1B10C80075BB6C /* UnicodeNormalizationForm.swift */, + ); + path = Libraries; + sourceTree = ""; + }; 2AB1BD21287D752300C6FEAF /* Views */ = { isa = PBXGroup; children = ( @@ -2241,6 +2208,7 @@ 2A5E6FC32A723CE900E33EA7 /* InfoPlist.xcstrings */, 2A5E6FC62A723F3C00E33EA7 /* ServicesMenu.xcstrings */, 2A36E3702AF9ED0B00A73534 /* Sparkle.xcstrings */, + 2A65520A2BDF4D880082B7D6 /* InAppPurchase.xcstrings */, ); path = Localizables; sourceTree = ""; @@ -2249,6 +2217,7 @@ isa = PBXGroup; children = ( 2AF5D0E4286D9AB3000BE826 /* ArithmeticsTests.swift */, + 2A2E56D62C018ADB00416F9E /* ComparableTests.swift */, 2A9082EE1D325ED900228F50 /* GeometryTests.swift */, 2AC39F721E8AC80E009F97D5 /* CollectionTests.swift */, 2AE12DFD1E7DB7D200681F72 /* StringCollectionTests.swift */, @@ -2256,7 +2225,7 @@ 2AA2E0251C0454730087BDD6 /* StringIndentationTests.swift */, 2A902B99236E3AA600A6A9BB /* StringCommentingTests.swift */, 2A8EF013241F0A8A001BDBC0 /* StringLineProcessingTests.swift */, - 2A18A5BC1C4A730D00BAD817 /* EncodingDetectionTests.swift */, + 2A18A5BC1C4A730D00BAD817 /* EncodingTests.swift */, 2A476CAD1D09C8C80088E37A /* URLExtensionsTests.swift */, 2AFD218C27E0442B00E83E88 /* UTTypeExtensionTests.swift */, 2A476CB01D09D0500088E37A /* FontExtensionTests.swift */, @@ -2264,7 +2233,6 @@ 2A8E47E6299B2F5C006A40D8 /* NSRangeTests.swift */, 2AEBD259246BB4C200EC97A3 /* NSAttributedStringTests.swift */, 2A89160B2394B87100AC13EE /* NSLayoutManagerTests.swift */, - 2A9DE0122B55605200E8FD2A /* ShiftJISTests.swift */, ); name = Extensions; sourceTree = ""; @@ -2272,20 +2240,16 @@ 2ACC65301C9802D4000574DC /* Models */ = { isa = PBXGroup; children = ( - 2AA2E00F1BFDE0190087BDD6 /* CharacterInfoTests.swift */, 2A63CEC31D0B06D800ED8186 /* SyntaxTests.swift */, 2ACC65311C98033D000574DC /* ThemeTests.swift */, 2A9C07551CF9F982006D672D /* IncompatibleCharacterTests.swift */, 2A54BE2B1D40EB24000816B0 /* LineEndingTests.swift */, - 2ABFF6D61D02856A00BE2795 /* ShortcutTests.swift */, 2A9C370D1D672A1F00774BA4 /* BracePairTests.swift */, 2AED46721E43942300751C45 /* TextFindTests.swift */, - 2A7135821CFFDC6600ADA555 /* FilePermissionTests.swift */, 2A1893AC1FFF6A0100AD244F /* LineSortTests.swift */, 2A7B279824E435FE00F02304 /* OutlineTests.swift */, 2AC72EA1253478D5001D3CA0 /* FileDropItemTests.swift */, 2A5EDDBC241B64EB00A07810 /* TextClippingTests.swift */, - 2A64A2352387754000646BE4 /* UserDefaultsObservationTests.swift */, 2A719F6523CD92370026F877 /* FuzzyRangeTests.swift */, 2ABEFB6923DC0CA0008769F4 /* EditorCounterTests.swift */, 2A1125C023F180FF006A1DB2 /* LineRangeCacheableTests.swift */, @@ -2304,21 +2268,10 @@ children = ( 2A63CECA1D0B0E7800ED8186 /* sample.html */, 2A5EDDBA241B649C00A07810 /* moof.textClipping */, - 2A18A5BE1C4A746A00BAD817 /* Encodings */, ); name = Resources; sourceTree = ""; }; - 2AD2861919856F3100C9342F /* Editor */ = { - isa = PBXGroup; - children = ( - 2AA45A4A1D2E871900A1A401 /* EditorViewController.swift */, - 2AA45A501D2E938500A1A401 /* NavigationBarController.swift */, - 2A6FD9D01D38933100A59784 /* EditorTextViewController.swift */, - ); - name = Editor; - sourceTree = ""; - }; 2ADD36941CFCAD4200F3175D /* Inspector */ = { isa = PBXGroup; children = ( @@ -2351,14 +2304,15 @@ 2A1083EF2944837E00751DAE /* InsetTextField.swift */, 2A65EC252B80C01B008096C5 /* FontPicker.swift */, 2A59B7022957089A0094F03B /* LinkButton.swift */, - 2A4A7D122856FF340085D2E7 /* HelpButton.swift */, 2ADB04AB2A89F14D00C4F562 /* AddRemoveButton.swift */, 2A2615882977FCF6008C2240 /* SubmitButtonGroup.swift */, 2ACDA24F2B81201A00B2EBA8 /* OpacitySlider.swift */, 2A5D13121D1EE8FF00D38E6A /* HUDView.swift */, 2AA175F92AC5634500F6462C /* PopoverHolderView.swift */, 2AE144C32B0222DB005E8CF1 /* LiveTextInsertionView.swift */, + 2A63A9D724E8C8F70017ACBB /* OutlinePicker.swift */, 2A2EEF172B778BB1001FEDFB /* WrappingHStack.swift */, + 2A0DD6321E655C4A001CAAA3 /* TokenTextEditor.swift */, ); name = Views; sourceTree = ""; @@ -2366,6 +2320,7 @@ 2AF601CC296F925900F6F1E8 /* Helpers */ = { isa = PBXGroup; children = ( + 2A24F9122BEDF6D000CB6CCF /* CapsuleButtonStyle.swift */, 2AB1BD1E287D747200C6FEAF /* SizeGetter.swift */, ); name = Helpers; @@ -2399,6 +2354,7 @@ isa = PBXGroup; children = ( 2A8EAE402BA3C3DC00448875 /* AboutView.swift */, + 2A24F90F2BEDDFEF00CB6CCF /* WhatsNewView.swift */, 2A5D13091D1ED10400D38E6A /* ConsolePanelController.swift */, 2A4257AF1D22FD490086DAAD /* ColorCodePanelController.swift */, 2A5E410D2B0CE4DB00D5EA20 /* Command Bar */, @@ -2461,6 +2417,12 @@ 2ACD02BE22A87F0400893051 /* ColorCode */, 2AA2C6FB24399A920017D1EC /* Yams */, 2ACAAC1B2B85E74C0041B095 /* SyntaxMap */, + 2A7E06E72C1A745400E5396D /* CharacterInfo */, + 2A3268922C1C580800CF1AAF /* Defaults */, + 2A3853692C1AF43100C282C0 /* FilePermissions */, + 2ADF96402C1B05CD00B6B722 /* FileEncoding */, + 2AA7BDD52C1B0CC10075BB6C /* UnicodeNormalization */, + 2A32688D2C1B504500CF1AAF /* Shortcut */, ); productInstallPath = "$(HOME)/Applications"; productName = CotEditor; @@ -2506,6 +2468,12 @@ 2AA2C6FD24399AA20017D1EC /* Yams */, 2AAAE6E426DB82F800C5F0AC /* Sparkle */, 2ACAAC1D2B85E7530041B095 /* SyntaxMap */, + 2A7E06E92C1A745E00E5396D /* CharacterInfo */, + 2A3853672C1AF42C00C282C0 /* FilePermissions */, + 2ADF96422C1B05D300B6B722 /* FileEncoding */, + 2A3268942C1C580D00CF1AAF /* Defaults */, + 2AA7BDD72C1B0CC70075BB6C /* UnicodeNormalization */, + 2A32688F2C1B504B00CF1AAF /* Shortcut */, ); productInstallPath = "$(HOME)/Applications"; productName = CotEditor; @@ -2521,7 +2489,7 @@ BuildIndependentTargetsInParallel = YES; CLASSPREFIX = ""; LastSwiftUpdateCheck = 1240; - LastUpgradeCheck = 1510; + LastUpgradeCheck = 1530; ORGANIZATIONNAME = "CotEditor Project"; TargetAttributes = { 2A3E847D1D07296200070A54 = { @@ -2567,7 +2535,6 @@ }; }; buildConfigurationList = 8C71D95708640EDF00C9C0BD /* Build configuration list for PBXProject "CotEditor" */; - compatibilityVersion = "Xcode 15.3"; developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( @@ -2592,6 +2559,7 @@ 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */, 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */, ); + preferredProjectObjectVersion = 73; projectDirPath = ""; projectRoot = ""; targets = ( @@ -2620,11 +2588,11 @@ 2AA6731C2B9178AB00B8F7E6 /* Localizable.xcstrings in Resources */, 2A5E6FC42A723CEA00E33EA7 /* InfoPlist.xcstrings in Resources */, 2A5E6FC72A723F3C00E33EA7 /* ServicesMenu.xcstrings in Resources */, + 2AE44DCE2BE7C34D002A787D /* InAppPurchase.xcstrings in Resources */, 2A07A8FA2BABC182007CABFD /* About.xcstrings in Resources */, 2A39ACFC2B8CEE2F00E216C9 /* AddRemoveButton.xcstrings in Resources */, 2A55D5D82B7A728A0092DE48 /* AdvancedCharacterCount.xcstrings in Resources */, 2ACDA2A52B81EE0E00B2EBA8 /* AppearanceSettings.xcstrings in Resources */, - 2A7FEF332B90E1C20042BEFF /* Character.xcstrings in Resources */, 2A1E7E3B2B8D7D48004F0C07 /* CharacterInspector.xcstrings in Resources */, 2ACDA2892B81E2AC00B2EBA8 /* ColorCode.xcstrings in Resources */, 2A07A9032BABC1FA007CABFD /* CommandBar.xcstrings in Resources */, @@ -2632,6 +2600,8 @@ 2A39ACB92B8CE6DE00E216C9 /* CustomSurround.xcstrings in Resources */, 2A39ACF92B8CED8B00E216C9 /* CustomTabWidth.xcstrings in Resources */, 2AA672A22B8F8AA300B8F7E6 /* Document.xcstrings in Resources */, + 2AE44DD12BE7CF48002A787D /* Donation.xcstrings in Resources */, + 2A21E6732BB44D5E0054C8A1 /* DonationSettings.xcstrings in Resources */, 2A1E7E192B8D715F004F0C07 /* EditorOpacity.xcstrings in Resources */, 2ACDA2942B81E8B700B2EBA8 /* EditSettings.xcstrings in Resources */, 2A39AC812B8CDFC800E216C9 /* EncodingList.xcstrings in Resources */, @@ -2666,18 +2636,16 @@ 2A65EC3B2B80C667008096C5 /* ThemeEditor.xcstrings in Resources */, 2A39ACD52B8CE97800E216C9 /* UnicodeInput.xcstrings in Resources */, 2A5E6FC12A72342700E33EA7 /* UnicodeNormalization.xcstrings in Resources */, + 2A24F9162BEDFD9400CB6CCF /* WhatsNew.xcstrings in Resources */, 2ACDA2972B81E8BB00B2EBA8 /* WindowSettings.xcstrings in Resources */, - 2AA2E0141BFE12620087BDD6 /* UnicodeBlock.strings in Resources */, 2A836F811D572A5D0044E8EC /* Main.storyboard in Resources */, 2ACDE29A2406B9C000FC31EC /* FindPanelFieldView.storyboard in Resources */, 2ACDE29C2406B9C000FC31EC /* SyntaxListView.storyboard in Resources */, 2ACDE2A22406B9C000FC31EC /* KeyBindingTreeView.storyboard in Resources */, 2AAFA7BC2B7A2DB000A2B228 /* MultipleReplaceListView.storyboard in Resources */, 2ACDE2A32406B9C000FC31EC /* MultipleReplaceView.storyboard in Resources */, - 2ACDE2962406B9C000FC31EC /* NavigationBar.storyboard in Resources */, 2A7F4DFF2871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */, - 2ACDE2992406B9C000FC31EC /* SnippetsPane.storyboard in Resources */, - 2ACDE28D2406B9C000FC31EC /* ThemeView.storyboard in Resources */, + 2ACDE28D2406B9C000FC31EC /* ThemeListView.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2687,7 +2655,6 @@ files = ( 2A63CEC91D0B0D4600ED8186 /* Syntaxes in Resources */, 2A3DEAF21CEB23F0007B7621 /* Themes in Resources */, - 2A18A5BF1C4A746A00BAD817 /* Encodings in Resources */, 2A63CECB1D0B0E7800ED8186 /* sample.html in Resources */, 2A5EDDBB241B649C00A07810 /* moof.textClipping in Resources */, ); @@ -2706,13 +2673,13 @@ 2A8EAE3F2BA3B15D00448875 /* Credits.json in Resources */, 2A2179F61A07093B002C4AB1 /* SyntaxMap.json in Resources */, 2AA6731D2B9178AB00B8F7E6 /* Localizable.xcstrings in Resources */, + 2AE44DCF2BE7C355002A787D /* InAppPurchase.xcstrings in Resources */, 2A5E6FC52A723CEA00E33EA7 /* InfoPlist.xcstrings in Resources */, 2A5E6FC82A723F3C00E33EA7 /* ServicesMenu.xcstrings in Resources */, 2A07A8FB2BABC182007CABFD /* About.xcstrings in Resources */, 2A39ACFD2B8CEE2F00E216C9 /* AddRemoveButton.xcstrings in Resources */, 2A55D5D92B7A728A0092DE48 /* AdvancedCharacterCount.xcstrings in Resources */, 2ACDA2A62B81EE0E00B2EBA8 /* AppearanceSettings.xcstrings in Resources */, - 2A7FEF342B90E1C20042BEFF /* Character.xcstrings in Resources */, 2A1E7E3C2B8D7D48004F0C07 /* CharacterInspector.xcstrings in Resources */, 2ACDA28A2B81E2B100B2EBA8 /* ColorCode.xcstrings in Resources */, 2A07A9042BABC1FA007CABFD /* CommandBar.xcstrings in Resources */, @@ -2720,6 +2687,8 @@ 2A39ACBA2B8CE6DE00E216C9 /* CustomSurround.xcstrings in Resources */, 2A39ACFA2B8CED8B00E216C9 /* CustomTabWidth.xcstrings in Resources */, 2AA672A32B8F8AA300B8F7E6 /* Document.xcstrings in Resources */, + 2AE44DD22BE7CF48002A787D /* Donation.xcstrings in Resources */, + 2A21E6742BB44D5E0054C8A1 /* DonationSettings.xcstrings in Resources */, 2A1E7E1A2B8D715F004F0C07 /* EditorOpacity.xcstrings in Resources */, 2ACDA2952B81E8B700B2EBA8 /* EditSettings.xcstrings in Resources */, 2A39AC822B8CDFCA00E216C9 /* EncodingList.xcstrings in Resources */, @@ -2754,19 +2723,17 @@ 2A65EC3C2B80C667008096C5 /* ThemeEditor.xcstrings in Resources */, 2A39ACD62B8CE97800E216C9 /* UnicodeInput.xcstrings in Resources */, 2A5E6FC22A72342700E33EA7 /* UnicodeNormalization.xcstrings in Resources */, + 2A24F9172BEDFD9400CB6CCF /* WhatsNew.xcstrings in Resources */, 2ACDA2982B81E8BB00B2EBA8 /* WindowSettings.xcstrings in Resources */, 2A36E36F2AF9ED0B00A73534 /* Sparkle.xcstrings in Resources */, - 2AA2E0131BFE12620087BDD6 /* UnicodeBlock.strings in Resources */, 2A836F801D572A5D0044E8EC /* Main.storyboard in Resources */, 2A5D13421D1FE34F00D38E6A /* FindPanelFieldView.storyboard in Resources */, 2A10D1381E715E5B0027192A /* SyntaxListView.storyboard in Resources */, 2A10D10A1E708CDF0027192A /* KeyBindingTreeView.storyboard in Resources */, 2AAFA7BD2B7A2DB000A2B228 /* MultipleReplaceListView.storyboard in Resources */, 2A3D63FB1E769DDF00F538E1 /* MultipleReplaceView.storyboard in Resources */, - 2A5F7CA51D152589001D83BC /* NavigationBar.storyboard in Resources */, 2A7F4E002871F46D0029CE66 /* PrintPanelAccessory.storyboard in Resources */, - 2ADF3C011E6D7345009125BB /* SnippetsPane.storyboard in Resources */, - 2A10D1281E714D230027192A /* ThemeView.storyboard in Resources */, + 2A10D1281E714D230027192A /* ThemeListView.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2881,24 +2848,23 @@ 2AC2462F1D1BC70C00E46CFA /* AppDelegate.swift in Sources */, 2A65EC2A2B80C168008096C5 /* AppearanceSettingsView.swift in Sources */, 2AA14CFD1FA4983500EAF586 /* AppleScript.swift in Sources */, - 2A8918E3294C33C900A23347 /* AppStorage+DefaultKey.swift in Sources */, 2AA056AD26FCA171000E0CB2 /* Arithmetics.swift in Sources */, 2ADBC91621C9F30000B884FF /* Atomic.swift in Sources */, 2ABF86BE208C3C630082D52B /* AudioToolbox.swift in Sources */, 2A1ABCA527F079120054795D /* BidiScroller.swift in Sources */, 2A1ABC9B27F056E60054795D /* BidiScrollView.swift in Sources */, 2A231A291E7BD82700C2A909 /* Binding.swift in Sources */, + 2A2E56DB2C057FBF00416F9E /* BracePair.swift in Sources */, 2AFECF5B2171C0E60065A7DE /* Bundle+AppInfo.swift in Sources */, + 2A24F9132BEDF6D000CB6CCF /* CapsuleButtonStyle.swift in Sources */, 2AB1BD24287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift in Sources */, 2AB1BD1C287D60DF00C6FEAF /* CharacterCountOptionsView.swift in Sources */, 2A5DCE501D185F1B00D5D74C /* CharacterField.swift in Sources */, - 2AF073FC1D34587500770BA6 /* CharacterInfo.swift in Sources */, 2A42823A2638DAEB00D03C5C /* CharacterInspectorView.swift in Sources */, 2A5ADE851D2168FC00F6CE26 /* Collection.swift in Sources */, 2A5C00342814698000700CAE /* Collection+BinarySearch.swift in Sources */, 2ADA15EF21C5073D00C6608B /* Collection+IndexSet.swift in Sources */, 2AE12DFC1E7DB47000681F72 /* Collection+String.swift in Sources */, - 2AFD328929482D53000ED1C5 /* Color.swift in Sources */, 2A4257B11D22FD490086DAAD /* ColorCodePanelController.swift in Sources */, 2A1A4EB024FB9D9300B50AA0 /* Combine.swift in Sources */, 2A5E41052B0AEFBB00D5EA20 /* CommandBarView.swift in Sources */, @@ -2906,12 +2872,12 @@ 2AC13A0924F112D800799A93 /* CommandLineToolManager.swift in Sources */, 2A885E341D5C3A1B00288723 /* Comparable.swift in Sources */, 2A5D130B1D1ED10400D38E6A /* ConsolePanelController.swift in Sources */, + 2AE44DBB2BE67F81002A787D /* ContentViewController.swift in Sources */, + 2AE214E22BEB3011007EF0E9 /* CSVFormatStyle.swift in Sources */, 2AE12E081E7DDF0700681F72 /* CustomSurroundView.swift in Sources */, 2A25C52920F06BE80003AE1A /* CustomTabWidthView.swift in Sources */, 2AFB30E01E4B8F5B00BFAEF3 /* Debouncer.swift in Sources */, 2AC186DE1E2F4264002F4D27 /* Debug.swift in Sources */, - 2A657D1E2033ED6B00C2611C /* DefaultInitializable.swift in Sources */, - 2A6FD9F41D3ACEB500A59784 /* DefaultKey.swift in Sources */, 2A7C92FC29FD64A8008343C8 /* DefaultKey+FontType.swift in Sources */, 2ACC21B61E52B8C50078241F /* DefaultKeys.swift in Sources */, 2ACC21B31E52B7920078241F /* DefaultOptions.swift in Sources */, @@ -2922,19 +2888,19 @@ 2AC52BDC1D48CC0E007D6371 /* DispatchQueue.swift in Sources */, 2A1679E71D3CE07100E8261D /* Document.swift in Sources */, 2AF0C12E1D3DABD000B6FCB6 /* Document+ScriptingSupport.swift in Sources */, - 2AD7B9B01D3E832E00E5D6D7 /* DocumentAnalyzer.swift in Sources */, 2AD616CD1D3E583D0016EFB6 /* DocumentController.swift in Sources */, - 2A50AA63204D513500D10A10 /* DocumentFile.swift in Sources */, 2AAB4BFA1D2435AC0049A68B /* DocumentInspectorView.swift in Sources */, 2AED70EF1D2E36EF006FFBCE /* DocumentViewController.swift in Sources */, 2A71BC7C1DDC50530085AE1C /* DocumentViewController+TouchBar.swift in Sources */, 2A17A3171D2D4319001DD717 /* DocumentWindow.swift in Sources */, 2AA749C41D3C263300850802 /* DocumentWindowController.swift in Sources */, + 2A9BC2782BDE00B1008B58B5 /* Donation.swift in Sources */, + 2AE144BC2B01E341005E8CF1 /* DonationSettingsView.swift in Sources */, 2ACDC0921D1726BD009B72D6 /* DotView.swift in Sources */, - 2A38FAFE1D1C67050032231A /* DraggableArrayController.swift in Sources */, 2A68722F288A5C44006D6B41 /* DraggableHostingView.swift in Sources */, 2A8E47E2299A2314006A40D8 /* EditedRangeSet.swift in Sources */, - 2AF45E1F1E6C0D920030CD60 /* EditorCounter.swift in Sources */, + 2ABF9E942C1E8CFF0033D5E6 /* EditingContext.swift in Sources */, + 2AD7B9B01D3E832E00E5D6D7 /* EditorCounter.swift in Sources */, 2A158C222945F54B000A4EC1 /* EditorOpacityView.swift in Sources */, 2AEC69C51D41A1BE0089F96F /* EditorTextView.swift in Sources */, 2A4257BA1D2392A40086DAAD /* EditorTextView+ColorCode.swift in Sources */, @@ -2951,11 +2917,8 @@ 2AFFA7C62B170097005652CD /* EditSettingsView.swift in Sources */, 2A5DCE8A1D18FFDB00D5D74C /* EncodingListView.swift in Sources */, 2A4257A81D22E0660086DAAD /* EncodingManager.swift in Sources */, + 2A50AA63204D513500D10A10 /* FileAttributes.swift in Sources */, 2A4682B31D2F6B580005410E /* FileDropItem.swift in Sources */, - 2A91C3221D1C40E4007CF8BE /* FileDropViewController.swift in Sources */, - 2A8E25BB24DC59C400FCC33A /* FileEncoding.swift in Sources */, - 2A86C47C20371DBE00B9357C /* FilePermissions.swift in Sources */, - 2AE52F1C1D17493B00D60A32 /* FilePermissions+FormatStyle.swift in Sources */, 2A0A602B27ABD74500725B70 /* FilterField.swift in Sources */, 2A5D13461D1FE66300D38E6A /* FindPanelButtonView.swift in Sources */, 2ACFE58C1D20730B0005233A /* FindPanelContentViewController.swift in Sources */, @@ -2970,8 +2933,8 @@ 2A231A2E1E7BE8B700C2A909 /* FindProgress.swift in Sources */, 2A5D13111D1EE66500D38E6A /* FindProgressView.swift in Sources */, 2AF98CAB294B9488009AD47F /* FindSettingsView.swift in Sources */, - 2AFFA7C32B16E93B005652CD /* FormatSettingsView.swift in Sources */, 2A65EC262B80C01B008096C5 /* FontPicker.swift in Sources */, + 2AFFA7C32B16E93B005652CD /* FormatSettingsView.swift in Sources */, 2A19AF862AE0D15300EFFDCB /* FormPopUpButton.swift in Sources */, 2AF0C1261D3DA44900B6FCB6 /* FourCharCode.swift in Sources */, 2AAD61F11D2B0856008FE772 /* FuzzyRange.swift in Sources */, @@ -2979,7 +2942,6 @@ 2A9082E61D324D9A00228F50 /* Geometry.swift in Sources */, 2A5D13171D1EF5AA00D38E6A /* GoToLineView.swift in Sources */, 2A158C1C2945A6B1000A4EC1 /* HeadingMenuItem.swift in Sources */, - 2A4A7D132856FF340085D2E7 /* HelpButton.swift in Sources */, 2AEAA8242096380C001A175C /* HighlightExtractors.swift in Sources */, 2AAD61F91D2BA3F5008FE772 /* HighlightParser.swift in Sources */, 2AE95A1A2A86270000E85CF5 /* HoleContentView.swift in Sources */, @@ -3020,7 +2982,7 @@ 2A231A371E7C30F000C2A909 /* MultipleReplaceSplitViewController.swift in Sources */, 2ACC5E421E7B08D300109ABC /* MultipleReplaceViewController.swift in Sources */, 2A1FAD5920A74D0A00566D7C /* MutableCopying.swift in Sources */, - 2AA45A521D2E938500A1A401 /* NavigationBarController.swift in Sources */, + 2AA45A521D2E938500A1A401 /* NavigationBar.swift in Sources */, 2AA704CE2987878B008CBCB5 /* Node.swift in Sources */, 2A10B6F621450A3B00B4205E /* NSAppearance.swift in Sources */, 2A685F6B2027729000A130A4 /* NSAppleEventManager+Additions.swift in Sources */, @@ -3028,7 +2990,7 @@ 2AE3F3191D3F8A1F005B8724 /* NSAttributedString.swift in Sources */, 2A4E638120ADC45F0033CE63 /* NSBezierPath.swift in Sources */, 2A5ADE891D216D4900F6CE26 /* NSColor+NamedColors.swift in Sources */, - 2AC186DB1E2F414D002F4D27 /* NSDocument+ErrorHandling.swift in Sources */, + 2AC186DB1E2F414D002F4D27 /* NSDocument.swift in Sources */, 2A9B134E27E2D84E009954A4 /* NSDraggingInfo.swift in Sources */, 2A5D2DC421908F4A006814D5 /* NSFont+Name.swift in Sources */, 2AA45A551D2F22C600A1A401 /* NSFont+Size.swift in Sources */, @@ -3036,7 +2998,7 @@ 2AE73F41203D2FBB00D8903B /* NSLayoutManager.swift in Sources */, 2A9AC937244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift in Sources */, 2A484A3A236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift in Sources */, - 2AAF6E9129BB8B45003DFF4B /* NSMenuItem+Shortcut.swift in Sources */, + 2AEAA1432C00B37300B5332F /* NSMenu.swift in Sources */, 2AF99621235ACDD60041872E /* NSPrintInfo.swift in Sources */, 2A8E47E9299C6064006A40D8 /* NSRange.swift in Sources */, 2AF1D85921B8D9250060BC04 /* NSRegularExpression+Additions.swift in Sources */, @@ -3045,8 +3007,8 @@ 2A6FD9EE1D3A85D700A59784 /* NSString.swift in Sources */, 2AF63BA82A6FA4D900E1258E /* NSTableView.swift in Sources */, 2A180F4B2854E71800EBAF66 /* NSTextSelectionDataSource.swift in Sources */, - 2A7470692B12FA5700669A7B /* NSTextStorage+TextView.swift in Sources */, 2ABBACA21E3F1D1C00A080E7 /* NSTextStorage+ScriptingSupport.swift in Sources */, + 2A7470692B12FA5700669A7B /* NSTextStorage+TextView.swift in Sources */, 2A3A19E3206C9A0700516DE4 /* NSTextView+BracePair.swift in Sources */, 2A1311D72127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift in Sources */, 2A9082E31D32456300228F50 /* NSTextView+Layout.swift in Sources */, @@ -3067,15 +3029,16 @@ 2A05081423D6B9E900602F5E /* NSViewController.swift in Sources */, 2A359DFF1DAE93EE00FEF7AA /* NSWindow+Responder.swift in Sources */, 2AD8D74B2064AD83000BEFDB /* NumberTextField.swift in Sources */, + 2AA71A532BE366520084EC0A /* Observation.swift in Sources */, 2ACDA2502B81201A00B2EBA8 /* OpacitySlider.swift in Sources */, 2AC6069C20416ADE00F9C839 /* OpenPanelAccessory.swift in Sources */, 2A3E61BF27C3795B00C6E5B6 /* OptionalMenu.swift in Sources */, - 2A88E7721E81A2C7000019C6 /* OrderedSet.swift in Sources */, 2A4714E7209630510093E27F /* OutlineExtractor.swift in Sources */, 2AE7A8DA20450FE600830830 /* OutlineInspectorView.swift in Sources */, 2AAD61F51D2BA0E0008FE772 /* OutlineItem.swift in Sources */, 2A39AC472B8B5C9700E216C9 /* OutlineItem+AttributedString.swift in Sources */, - 2A63A9D824E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */, + 2AE44DB82BE65C1F002A787D /* OutlineNavigator.swift in Sources */, + 2A63A9D824E8C8F70017ACBB /* OutlinePicker.swift in Sources */, 2ACDC0981D172B2A009B72D6 /* PaddingTextFieldCell.swift in Sources */, 2A9C370C1D66E99400774BA4 /* Pair.swift in Sources */, 2A1893A81FFF16A400AD244F /* PatternSortView.swift in Sources */, @@ -3104,34 +3067,33 @@ 2A44321D219AC1F8008A0A6B /* SettingsTabViewController.swift in Sources */, 2AA79C7921CB7251005AD6AD /* SettingsWindow.swift in Sources */, 2A938ACF297E4D7B007FBE5F /* SettingsWindowController.swift in Sources */, - 2AAD61ED1D2A4CE5008FE772 /* Shortcut.swift in Sources */, 2A64F2491D26327C001B229F /* Shortcut+Error.swift in Sources */, 2AACB1CE1D195ABD0073775B /* ShortcutField.swift in Sources */, - 2A505C052988D44E002080AA /* ShortcutFormatter.swift in Sources */, 2A30C7DB2B1380BE002F6381 /* ShortcutView.swift in Sources */, 2AB1BD1F287D747200C6FEAF /* SizeGetter.swift in Sources */, 2AEC48341E641E4F00FB0F89 /* Snippet.swift in Sources */, 2A64F2461D259E49001B229F /* SnippetManager.swift in Sources */, 2ACDA2532B813FA500B2EBA8 /* SnippetsSettingsView.swift in Sources */, - 2A505C09298A88DD002080AA /* SnippetsViewController.swift in Sources */, - 2A6FD9E11D393F9100A59784 /* SplitViewController.swift in Sources */, 2AD551EB20D8206C007279B1 /* StatableMenuToolbarItem.swift in Sources */, 2A5D13261D1F9D4100D38E6A /* StatableToolbarItem.swift in Sources */, 2AD21FCD1D2E3BE80018C8D1 /* StatusBar.swift in Sources */, 2A26156E2977B87F008C2240 /* StepperNumberField.swift in Sources */, - 2AAD61FD1D2BD102008FE772 /* String+Additions.swift in Sources */, 2A733E8A20BBB4AC0090D7CB /* String+Case.swift in Sources */, + 2ABF9EA32C1ED4BF0033D5E6 /* String+Commenting.swift in Sources */, 2A2792961D1DBDAC00F3FC5D /* String+Constants.swift in Sources */, 2AA761361D45634400031AAF /* String+Counting.swift in Sources */, - 2AA375441D403F100080C27C /* String+Encoding.swift in Sources */, + 2ABF9E9D2C1EC2A50033D5E6 /* String+Escaping.swift in Sources */, + 2ABF9EA02C1EC8620033D5E6 /* String+Filename.swift in Sources */, 2A9BF3C81D38325200E3D3E2 /* String+FullwidthTransform.swift in Sources */, 2AA7613B1D457BD500031AAF /* String+Indentation.swift in Sources */, + 2ABF9E972C1E8D7E0033D5E6 /* String+LineProcessing.swift in Sources */, + 2AAD61FD1D2BD102008FE772 /* String+LineRange.swift in Sources */, 2AA5BCFA24FFB21C00618F83 /* String+Match.swift in Sources */, - 2A9BF3CC1D3842FA00E3D3E2 /* String+Normalization.swift in Sources */, 2A2615892977FCF6008C2240 /* SubmitButtonGroup.swift in Sources */, 2A1B7E76216CBBEA002C7395 /* SynchronizedScrollView.swift in Sources */, 2A6FD9F71D3AE29E00A59784 /* Syntax.swift in Sources */, 2AAE8E622AF8AE3B008954B5 /* Syntax+Codable.swift in Sources */, + 2AB857EE2B930B070079CFA2 /* Syntax+Localization.swift in Sources */, 2A26157A2977D5E8008C2240 /* SyntaxCommentEditView.swift in Sources */, 2A26157D2977D706008C2240 /* SyntaxCompletionEditView.swift in Sources */, 2A2615862977F7E2008C2240 /* SyntaxEditView.swift in Sources */, @@ -3155,30 +3117,26 @@ 2A0BF8A91DD8E7F90088961B /* TextSizeTouchBar.swift in Sources */, 2AF073E41D33C3AB00770BA6 /* Theme.swift in Sources */, 2ACF23AE26302A4C002B5E10 /* Theme+Syntax.swift in Sources */, - 2A63FBE41D1D90E70081C84E /* ThemeEditorView.swift in Sources */, + 2A2792931D1DACC400F3FC5D /* ThemeListViewController.swift in Sources */, 2A9082F31D32A9B500228F50 /* ThemeManager.swift in Sources */, - 2AB857EE2B930B070079CFA2 /* Syntax+Localization.swift in Sources */, - 2A2792931D1DACC400F3FC5D /* ThemeViewController.swift in Sources */, + 2A63FBE41D1D90E70081C84E /* ThemeView.swift in Sources */, 2A0DD6371E655FE6001CAAA3 /* Tokenizer.swift in Sources */, - 2A0DD6341E655C4A001CAAA3 /* TokenTextView.swift in Sources */, - 2AB2913E245AAD74004CC203 /* Unicode.GeneralCategory.swift in Sources */, - 2A73B5B71D4675350025337F /* Unicode.Scalar+ControlCharacter.swift in Sources */, - 2A73B5BD1D468DD30025337F /* Unicode.Scalar+Information.swift in Sources */, - 2A1235472121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift in Sources */, + 2A0DD6341E655C4A001CAAA3 /* TokenTextEditor.swift in Sources */, 2A4257B71D23153B0086DAAD /* UnicodeInputView.swift in Sources */, + 2AA7BDDC2C1B10CB0075BB6C /* UnicodeNormalizationForm.swift in Sources */, 2AA14D001FA498E900EAF586 /* UnixScript.swift in Sources */, 2A8DA9481D28ED93003D0C4B /* URL.swift in Sources */, 2AE73F3E2039A29300D8903B /* URL+ExtendedAttribute.swift in Sources */, 2A1125C723F6EFB2006A1DB2 /* URLDetector.swift in Sources */, 2A341D1A281EE23C00B85CB6 /* UserActivity.swift in Sources */, - 2A222C3024FA8E0500251084 /* UserDefaults.Publisher.swift in Sources */, - 2A1A4EAC24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift in Sources */, 2AD2387A2939AC7200209834 /* UserUnixTask.swift in Sources */, 2AFD218A27E0434100E83E88 /* UTType.swift in Sources */, 2A91C31C1D1BFE47007CF8BE /* UTType+SettingFile.swift in Sources */, + 2AE214E52BEBAD1A007EF0E9 /* UUID+Transferable.swift in Sources */, 2A7FCC46280A367C0070EAB3 /* ValueRange.swift in Sources */, 2AE144B92B00DCB7005E8CF1 /* View+Alert.swift in Sources */, 2A2B086028046E3B0028D733 /* WarningInspectorView.swift in Sources */, + 2A24F9102BEDDFEF00CB6CCF /* WhatsNewView.swift in Sources */, 2A17A3141D2D16F1001DD717 /* WindowContentViewController.swift in Sources */, 2A78BFA51D1B02ED00A583D2 /* WindowSettingsView.swift in Sources */, 2A2EEF182B778BB1001FEDFB /* WrappingHStack.swift in Sources */, @@ -3192,14 +3150,13 @@ files = ( 2AF5D0E5286D9AB3000BE826 /* ArithmeticsTests.swift in Sources */, 2A9C370E1D672A1F00774BA4 /* BracePairTests.swift in Sources */, - 2AA2E0101BFDE0190087BDD6 /* CharacterInfoTests.swift in Sources */, 2AC39F731E8AC80E009F97D5 /* CollectionTests.swift in Sources */, + 2A2E56D72C018ADB00416F9E /* ComparableTests.swift in Sources */, 2A3F8F682429E04000CBBA89 /* DebouncerTests.swift in Sources */, - 2ABEFB6A23DC0CA0008769F4 /* EditorCounterTests.swift in Sources */, 2A8E47E5299A2401006A40D8 /* EditedRangeSetTests.swift in Sources */, - 2A4D69291D40032300FBBD0B /* EncodingDetectionTests.swift in Sources */, + 2ABEFB6A23DC0CA0008769F4 /* EditorCounterTests.swift in Sources */, + 2A4D69291D40032300FBBD0B /* EncodingTests.swift in Sources */, 2AC72EA2253478D5001D3CA0 /* FileDropItemTests.swift in Sources */, - 2A7135831CFFDC6600ADA555 /* FilePermissionTests.swift in Sources */, 2A476CB11D09D0500088E37A /* FontExtensionTests.swift in Sources */, 2A57B992294EDD9600771696 /* FormatStylesTests.swift in Sources */, 2AF0C1281D3DA6F800B6FCB6 /* FourCharCodeTests.swift in Sources */, @@ -3215,8 +3172,6 @@ 2A8E47E7299B2F5C006A40D8 /* NSRangeTests.swift in Sources */, 2A7B279924E435FE00F02304 /* OutlineTests.swift in Sources */, 2AFD328F2949B34A000ED1C5 /* RegularExpressionSyntaxTests.swift in Sources */, - 2A9DE0132B55605300E8FD2A /* ShiftJISTests.swift in Sources */, - 2ABFF6D71D02856A00BE2795 /* ShortcutTests.swift in Sources */, 2A04E9BB27FD6911008C82D8 /* SnippetTests.swift in Sources */, 2AE12DFE1E7DB7D200681F72 /* StringCollectionTests.swift in Sources */, 2A902B9A236E3AA600A6A9BB /* StringCommentingTests.swift in Sources */, @@ -3228,7 +3183,6 @@ 2AED46731E43942300751C45 /* TextFindTests.swift in Sources */, 2ACC65321C98033D000574DC /* ThemeTests.swift in Sources */, 2A476CAE1D09C8C80088E37A /* URLExtensionsTests.swift in Sources */, - 2A64A2362387754000646BE4 /* UserDefaultsObservationTests.swift in Sources */, 2AFD218D27E0442B00E83E88 /* UTTypeExtensionTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -3246,25 +3200,23 @@ 2AC2462E1D1BC70C00E46CFA /* AppDelegate.swift in Sources */, 2A65EC2B2B80C168008096C5 /* AppearanceSettingsView.swift in Sources */, 2AA14CFC1FA4983500EAF586 /* AppleScript.swift in Sources */, - 2A8918E4294C33C900A23347 /* AppStorage+DefaultKey.swift in Sources */, 2AA056AE26FCA171000E0CB2 /* Arithmetics.swift in Sources */, 2ADBC91521C9F30000B884FF /* Atomic.swift in Sources */, 2ABF86BD208C3C630082D52B /* AudioToolbox.swift in Sources */, 2A1ABCA627F079120054795D /* BidiScroller.swift in Sources */, 2A1ABC9C27F056E60054795D /* BidiScrollView.swift in Sources */, 2A231A281E7BD82700C2A909 /* Binding.swift in Sources */, - 2AB857EF2B930B070079CFA2 /* Syntax+Localization.swift in Sources */, + 2A2E56DC2C057FBF00416F9E /* BracePair.swift in Sources */, 2AFECF5A2171C0E60065A7DE /* Bundle+AppInfo.swift in Sources */, 2AB1BD25287DA73D00C6FEAF /* CharacterCountOptionsSheetView.swift in Sources */, + 2A24F9142BEDF6D000CB6CCF /* CapsuleButtonStyle.swift in Sources */, 2AB1BD1D287D60DF00C6FEAF /* CharacterCountOptionsView.swift in Sources */, 2A5DCE4F1D185F1B00D5D74C /* CharacterField.swift in Sources */, - 2AF073FB1D34587500770BA6 /* CharacterInfo.swift in Sources */, 2A42823B2638DAEB00D03C5C /* CharacterInspectorView.swift in Sources */, 2A5ADE841D2168FC00F6CE26 /* Collection.swift in Sources */, 2A5C00352814698000700CAE /* Collection+BinarySearch.swift in Sources */, 2ADA15EE21C5073D00C6608B /* Collection+IndexSet.swift in Sources */, 2AE12DFB1E7DB47000681F72 /* Collection+String.swift in Sources */, - 2AFD328A29482D53000ED1C5 /* Color.swift in Sources */, 2A4257B01D22FD490086DAAD /* ColorCodePanelController.swift in Sources */, 2A1A4EB124FB9D9300B50AA0 /* Combine.swift in Sources */, 2A5E41062B0AEFBB00D5EA20 /* CommandBarView.swift in Sources */, @@ -3272,12 +3224,12 @@ 2AC13A0A24F112D800799A93 /* CommandLineToolManager.swift in Sources */, 2A885E331D5C3A1B00288723 /* Comparable.swift in Sources */, 2A5D130A1D1ED10400D38E6A /* ConsolePanelController.swift in Sources */, + 2AE44DBC2BE67F81002A787D /* ContentViewController.swift in Sources */, + 2AE214E32BEB3011007EF0E9 /* CSVFormatStyle.swift in Sources */, 2AE12E071E7DDF0700681F72 /* CustomSurroundView.swift in Sources */, 2A25C52820F06BE80003AE1A /* CustomTabWidthView.swift in Sources */, 2AFB30DF1E4B8F5B00BFAEF3 /* Debouncer.swift in Sources */, 2AC186DD1E2F4264002F4D27 /* Debug.swift in Sources */, - 2A657D1D2033ED6B00C2611C /* DefaultInitializable.swift in Sources */, - 2A6FD9F31D3ACEB500A59784 /* DefaultKey.swift in Sources */, 2A7C92FD29FD64A8008343C8 /* DefaultKey+FontType.swift in Sources */, 2ACC21B51E52B8C50078241F /* DefaultKeys.swift in Sources */, 2ACC21B21E52B7920078241F /* DefaultOptions.swift in Sources */, @@ -3288,20 +3240,20 @@ 2AC52BDB1D48CC0E007D6371 /* DispatchQueue.swift in Sources */, 2A1679E61D3CE07100E8261D /* Document.swift in Sources */, 2AF0C12D1D3DABD000B6FCB6 /* Document+ScriptingSupport.swift in Sources */, - 2AD7B9AF1D3E832E00E5D6D7 /* DocumentAnalyzer.swift in Sources */, 2AD616CC1D3E583D0016EFB6 /* DocumentController.swift in Sources */, - 2A50AA62204D513500D10A10 /* DocumentFile.swift in Sources */, 2AAB4BF91D2435AC0049A68B /* DocumentInspectorView.swift in Sources */, 2AED70EE1D2E36EF006FFBCE /* DocumentViewController.swift in Sources */, 2A71BC7B1DDC50530085AE1C /* DocumentViewController+TouchBar.swift in Sources */, 2A17A3161D2D4319001DD717 /* DocumentWindow.swift in Sources */, 2AA749C31D3C263300850802 /* DocumentWindowController.swift in Sources */, + 2A9BC2792BDE00B1008B58B5 /* Donation.swift in Sources */, + 2AE144BD2B01E341005E8CF1 /* DonationSettingsView.swift in Sources */, 2ACDC0911D1726BD009B72D6 /* DotView.swift in Sources */, - 2A38FAFD1D1C67050032231A /* DraggableArrayController.swift in Sources */, 2A687230288A5C44006D6B41 /* DraggableHostingView.swift in Sources */, 2A8E47E3299A2314006A40D8 /* EditedRangeSet.swift in Sources */, + 2ABF9E932C1E8CFF0033D5E6 /* EditingContext.swift in Sources */, + 2AD7B9AF1D3E832E00E5D6D7 /* EditorCounter.swift in Sources */, 2A158C232945F54B000A4EC1 /* EditorOpacityView.swift in Sources */, - 2AF45E1E1E6C0D920030CD60 /* EditorCounter.swift in Sources */, 2AEC69C41D41A1BE0089F96F /* EditorTextView.swift in Sources */, 2A4257B91D2392A40086DAAD /* EditorTextView+ColorCode.swift in Sources */, 2A6FD9EA1D3A819500A59784 /* EditorTextView+Commenting.swift in Sources */, @@ -3317,11 +3269,8 @@ 2AFFA7C72B170097005652CD /* EditSettingsView.swift in Sources */, 2AA106B02470F05F00979CB7 /* EncodingListView.swift in Sources */, 2A4257A71D22E0660086DAAD /* EncodingManager.swift in Sources */, + 2A50AA62204D513500D10A10 /* FileAttributes.swift in Sources */, 2A4682B21D2F6B580005410E /* FileDropItem.swift in Sources */, - 2A91C3211D1C40E4007CF8BE /* FileDropViewController.swift in Sources */, - 2A8E25BC24DC59C400FCC33A /* FileEncoding.swift in Sources */, - 2A86C47B20371DBE00B9357C /* FilePermissions.swift in Sources */, - 2AE52F1B1D17493B00D60A32 /* FilePermissions+FormatStyle.swift in Sources */, 2A0A602C27ABD74500725B70 /* FilterField.swift in Sources */, 2A5D13451D1FE66300D38E6A /* FindPanelButtonView.swift in Sources */, 2ACFE58B1D20730B0005233A /* FindPanelContentViewController.swift in Sources */, @@ -3337,15 +3286,14 @@ 2A5D13101D1EE66500D38E6A /* FindProgressView.swift in Sources */, 2AF98CAC294B9488009AD47F /* FindSettingsView.swift in Sources */, 2A65EC272B80C01B008096C5 /* FontPicker.swift in Sources */, - 2A19AF872AE0D15300EFFDCB /* FormPopUpButton.swift in Sources */, 2AFFA7C42B16E93B005652CD /* FormatSettingsView.swift in Sources */, + 2A19AF872AE0D15300EFFDCB /* FormPopUpButton.swift in Sources */, 2AF0C1251D3DA44900B6FCB6 /* FourCharCode.swift in Sources */, 2AAD61F01D2B0856008FE772 /* FuzzyRange.swift in Sources */, 2A78BFA71D1B05FB00A583D2 /* GeneralSettingsView.swift in Sources */, 2A9082E51D324D9A00228F50 /* Geometry.swift in Sources */, 2A5D13161D1EF5AA00D38E6A /* GoToLineView.swift in Sources */, 2A158C1D2945A6B1000A4EC1 /* HeadingMenuItem.swift in Sources */, - 2A4A7D142856FF340085D2E7 /* HelpButton.swift in Sources */, 2AEAA8232096380C001A175C /* HighlightExtractors.swift in Sources */, 2AAD61F81D2BA3F5008FE772 /* HighlightParser.swift in Sources */, 2AE95A1B2A86270000E85CF5 /* HoleContentView.swift in Sources */, @@ -3386,7 +3334,7 @@ 2A231A361E7C30F000C2A909 /* MultipleReplaceSplitViewController.swift in Sources */, 2ACC5E411E7B08D300109ABC /* MultipleReplaceViewController.swift in Sources */, 2A1FAD5820A74D0A00566D7C /* MutableCopying.swift in Sources */, - 2AA45A511D2E938500A1A401 /* NavigationBarController.swift in Sources */, + 2AA45A511D2E938500A1A401 /* NavigationBar.swift in Sources */, 2AA704CF2987878B008CBCB5 /* Node.swift in Sources */, 2A10B6F521450A3B00B4205E /* NSAppearance.swift in Sources */, 2A685F6A2027729000A130A4 /* NSAppleEventManager+Additions.swift in Sources */, @@ -3394,7 +3342,7 @@ 2AE3F3181D3F8A1F005B8724 /* NSAttributedString.swift in Sources */, 2A4E638020ADC45F0033CE63 /* NSBezierPath.swift in Sources */, 2A5ADE881D216D4900F6CE26 /* NSColor+NamedColors.swift in Sources */, - 2AC186DA1E2F414D002F4D27 /* NSDocument+ErrorHandling.swift in Sources */, + 2AC186DA1E2F414D002F4D27 /* NSDocument.swift in Sources */, 2A9B134F27E2D84E009954A4 /* NSDraggingInfo.swift in Sources */, 2A5D2DC321908F4A006814D5 /* NSFont+Name.swift in Sources */, 2AA45A541D2F22C600A1A401 /* NSFont+Size.swift in Sources */, @@ -3402,7 +3350,7 @@ 2AE73F40203D2FBB00D8903B /* NSLayoutManager.swift in Sources */, 2A9AC938244849B700D05643 /* NSLayoutManager+InvisibleDrawing.swift in Sources */, 2A484A39236579A7006FFD14 /* NSLayoutManager+ValidationIgnorable.swift in Sources */, - 2AAF6E9229BB8B45003DFF4B /* NSMenuItem+Shortcut.swift in Sources */, + 2AEAA1442C00B37300B5332F /* NSMenu.swift in Sources */, 2AF99620235ACDD60041872E /* NSPrintInfo.swift in Sources */, 2A8E47EA299C6064006A40D8 /* NSRange.swift in Sources */, 2AF1D85821B8D9250060BC04 /* NSRegularExpression+Additions.swift in Sources */, @@ -3411,8 +3359,8 @@ 2A6FD9ED1D3A85D700A59784 /* NSString.swift in Sources */, 2AF63BA92A6FA4D900E1258E /* NSTableView.swift in Sources */, 2A180F4C2854E71800EBAF66 /* NSTextSelectionDataSource.swift in Sources */, - 2A74706A2B12FA5700669A7B /* NSTextStorage+TextView.swift in Sources */, 2ABBACA11E3F1D1C00A080E7 /* NSTextStorage+ScriptingSupport.swift in Sources */, + 2A74706A2B12FA5700669A7B /* NSTextStorage+TextView.swift in Sources */, 2A3A19E2206C9A0700516DE4 /* NSTextView+BracePair.swift in Sources */, 2A1311D62127DCE1001D52C5 /* NSTextView+CurrentLineHighlighting.swift in Sources */, 2A9082E21D32456300228F50 /* NSTextView+Layout.swift in Sources */, @@ -3433,15 +3381,16 @@ 2A05081323D6B9E900602F5E /* NSViewController.swift in Sources */, 2A359DFE1DAE93EE00FEF7AA /* NSWindow+Responder.swift in Sources */, 2AD8D74A2064AD83000BEFDB /* NumberTextField.swift in Sources */, + 2AA71A542BE366520084EC0A /* Observation.swift in Sources */, 2ACDA2512B81201A00B2EBA8 /* OpacitySlider.swift in Sources */, 2AC6069B20416ADE00F9C839 /* OpenPanelAccessory.swift in Sources */, 2A3E61C027C3795B00C6E5B6 /* OptionalMenu.swift in Sources */, - 2A88E7711E81A2C7000019C6 /* OrderedSet.swift in Sources */, 2A4714E6209630510093E27F /* OutlineExtractor.swift in Sources */, 2AE7A8D920450FE600830830 /* OutlineInspectorView.swift in Sources */, 2AAD61F41D2BA0E0008FE772 /* OutlineItem.swift in Sources */, 2A39AC482B8B5C9700E216C9 /* OutlineItem+AttributedString.swift in Sources */, - 2A63A9D924E8C8F70017ACBB /* OutlinePopUpButton.swift in Sources */, + 2AE44DB92BE65C1F002A787D /* OutlineNavigator.swift in Sources */, + 2A63A9D924E8C8F70017ACBB /* OutlinePicker.swift in Sources */, 2ACDC0971D172B2A009B72D6 /* PaddingTextFieldCell.swift in Sources */, 2A9C370B1D66E99400774BA4 /* Pair.swift in Sources */, 2A1893A71FFF16A400AD244F /* PatternSortView.swift in Sources */, @@ -3470,34 +3419,33 @@ 2A44321C219AC1F8008A0A6B /* SettingsTabViewController.swift in Sources */, 2AA79C7821CB7251005AD6AD /* SettingsWindow.swift in Sources */, 2A938AD0297E4D7B007FBE5F /* SettingsWindowController.swift in Sources */, - 2AAD61EC1D2A4CE5008FE772 /* Shortcut.swift in Sources */, - 2AACB1CD1D195ABD0073775B /* ShortcutField.swift in Sources */, 2A64F2481D26327C001B229F /* Shortcut+Error.swift in Sources */, - 2A505C062988D44E002080AA /* ShortcutFormatter.swift in Sources */, + 2AACB1CD1D195ABD0073775B /* ShortcutField.swift in Sources */, 2A30C7DC2B1380BE002F6381 /* ShortcutView.swift in Sources */, 2AB1BD20287D747200C6FEAF /* SizeGetter.swift in Sources */, 2AEC48331E641E4F00FB0F89 /* Snippet.swift in Sources */, 2A64F2451D259E49001B229F /* SnippetManager.swift in Sources */, 2ACDA2542B813FA500B2EBA8 /* SnippetsSettingsView.swift in Sources */, - 2A505C0A298A88DD002080AA /* SnippetsViewController.swift in Sources */, - 2A6FD9E01D393F9100A59784 /* SplitViewController.swift in Sources */, 2AD551EA20D8206C007279B1 /* StatableMenuToolbarItem.swift in Sources */, 2A5D13251D1F9D4100D38E6A /* StatableToolbarItem.swift in Sources */, 2AD21FCC1D2E3BE80018C8D1 /* StatusBar.swift in Sources */, 2A26156F2977B87F008C2240 /* StepperNumberField.swift in Sources */, - 2AAD61FC1D2BD102008FE772 /* String+Additions.swift in Sources */, 2A733E8920BBB4AC0090D7CB /* String+Case.swift in Sources */, + 2ABF9EA22C1ED4BF0033D5E6 /* String+Commenting.swift in Sources */, 2A2792951D1DBDAC00F3FC5D /* String+Constants.swift in Sources */, 2AA761351D45634400031AAF /* String+Counting.swift in Sources */, - 2AA375451D403F110080C27C /* String+Encoding.swift in Sources */, + 2ABF9E9C2C1EC2A50033D5E6 /* String+Escaping.swift in Sources */, + 2ABF9E9F2C1EC8620033D5E6 /* String+Filename.swift in Sources */, 2A9BF3C71D38325200E3D3E2 /* String+FullwidthTransform.swift in Sources */, 2AA7613A1D457BD500031AAF /* String+Indentation.swift in Sources */, + 2ABF9E962C1E8D7E0033D5E6 /* String+LineProcessing.swift in Sources */, + 2AAD61FC1D2BD102008FE772 /* String+LineRange.swift in Sources */, 2AA5BCFB24FFB21C00618F83 /* String+Match.swift in Sources */, - 2A9BF3CB1D3842FA00E3D3E2 /* String+Normalization.swift in Sources */, 2A26158A2977FCF6008C2240 /* SubmitButtonGroup.swift in Sources */, 2A1B7E75216CBBEA002C7395 /* SynchronizedScrollView.swift in Sources */, 2A6FD9F61D3AE29E00A59784 /* Syntax.swift in Sources */, 2AAE8E632AF8AE3B008954B5 /* Syntax+Codable.swift in Sources */, + 2AB857EF2B930B070079CFA2 /* Syntax+Localization.swift in Sources */, 2A26157B2977D5E8008C2240 /* SyntaxCommentEditView.swift in Sources */, 2A26157E2977D706008C2240 /* SyntaxCompletionEditView.swift in Sources */, 2A2615872977F7E2008C2240 /* SyntaxEditView.swift in Sources */, @@ -3521,30 +3469,27 @@ 2A0BF8A81DD8E7F90088961B /* TextSizeTouchBar.swift in Sources */, 2AF073E31D33C3AB00770BA6 /* Theme.swift in Sources */, 2ACF23AF26302A4C002B5E10 /* Theme+Syntax.swift in Sources */, - 2A63FBE31D1D90E70081C84E /* ThemeEditorView.swift in Sources */, + 2A2792921D1DACC400F3FC5D /* ThemeListViewController.swift in Sources */, 2A9082F21D32A9B500228F50 /* ThemeManager.swift in Sources */, - 2A2792921D1DACC400F3FC5D /* ThemeViewController.swift in Sources */, + 2A63FBE31D1D90E70081C84E /* ThemeView.swift in Sources */, 2A0DD6361E655FE6001CAAA3 /* Tokenizer.swift in Sources */, - 2A0DD6331E655C4A001CAAA3 /* TokenTextView.swift in Sources */, - 2AB2913F245AAD74004CC203 /* Unicode.GeneralCategory.swift in Sources */, - 2A73B5B61D4675350025337F /* Unicode.Scalar+ControlCharacter.swift in Sources */, - 2A73B5BC1D468DD30025337F /* Unicode.Scalar+Information.swift in Sources */, - 2A1235462121B106002E9C53 /* Unicode.UTF32.CodeUnit+BlockName.swift in Sources */, + 2A0DD6331E655C4A001CAAA3 /* TokenTextEditor.swift in Sources */, 2A4257B61D23153B0086DAAD /* UnicodeInputView.swift in Sources */, + 2AA7BDDB2C1B10CB0075BB6C /* UnicodeNormalizationForm.swift in Sources */, 2AA14CFF1FA498E900EAF586 /* UnixScript.swift in Sources */, 2A78BFB31D1B240900A583D2 /* UpdaterManager.swift in Sources */, 2A8DA9471D28ED93003D0C4B /* URL.swift in Sources */, 2AE73F3D2039A29300D8903B /* URL+ExtendedAttribute.swift in Sources */, 2A1125C623F6EFB2006A1DB2 /* URLDetector.swift in Sources */, 2A341D1B281EE23C00B85CB6 /* UserActivity.swift in Sources */, - 2A222C3124FA8E0500251084 /* UserDefaults.Publisher.swift in Sources */, - 2A1A4EAD24FB7BDE00B50AA0 /* UserDefaults+DefaultKey.swift in Sources */, 2AD2387B2939AC7200209834 /* UserUnixTask.swift in Sources */, 2AFD218B27E0434100E83E88 /* UTType.swift in Sources */, 2A91C31B1D1BFE47007CF8BE /* UTType+SettingFile.swift in Sources */, + 2AE214E62BEBAD1A007EF0E9 /* UUID+Transferable.swift in Sources */, 2A7FCC47280A367C0070EAB3 /* ValueRange.swift in Sources */, 2AE144BA2B00DCB7005E8CF1 /* View+Alert.swift in Sources */, 2A2B086128046E3B0028D733 /* WarningInspectorView.swift in Sources */, + 2A24F9112BEDDFEF00CB6CCF /* WhatsNewView.swift in Sources */, 2A17A3131D2D16F1001DD717 /* WindowContentViewController.swift in Sources */, 2A78BFA41D1B02ED00A583D2 /* WindowSettingsView.swift in Sources */, 2A2EEF192B778BB1001FEDFB /* WrappingHStack.swift in Sources */, @@ -3585,13 +3530,13 @@ name = KeyBindingTreeView.storyboard; sourceTree = ""; }; - 2A10D1261E714D230027192A /* ThemeView.storyboard */ = { + 2A10D1261E714D230027192A /* ThemeListView.storyboard */ = { isa = PBXVariantGroup; children = ( 2A10D1271E714D230027192A /* Base */, 2AF1229E2B7A3D50004BA1FF /* mul */, ); - name = ThemeView.storyboard; + name = ThemeListView.storyboard; sourceTree = ""; }; 2A10D1361E715E5B0027192A /* SyntaxListView.storyboard */ = { @@ -3621,15 +3566,6 @@ name = FindPanelFieldView.storyboard; sourceTree = ""; }; - 2A5F7CA31D152589001D83BC /* NavigationBar.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2A5F7CA41D152589001D83BC /* Base */, - 2A25D74C2AA714FC004D6681 /* mul */, - ); - name = NavigationBar.storyboard; - sourceTree = ""; - }; 2A7F4E022871F46D0029CE66 /* PrintPanelAccessory.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -3648,25 +3584,6 @@ name = Main.storyboard; sourceTree = ""; }; - 2AA2E0111BFE12620087BDD6 /* UnicodeBlock.strings */ = { - isa = PBXVariantGroup; - children = ( - 2AC4E5D127A6C0300052A4DD /* en-GB */, - 2AA2E0151BFE14310087BDD6 /* zh-Hans */, - 5B91B7D4282A6851005CBD5C /* zh-Hant */, - 2AC605AE2B64CDE300E93E5B /* cs */, - 2A51CF402BB45940001896F1 /* nl */, - 0D51D5922274EF5300A5D747 /* fr */, - 2AA2E0161BFE14320087BDD6 /* de */, - 2A401FE81D9AF7CA00ACE036 /* it */, - 2AA2E0121BFE12620087BDD6 /* ja */, - 57ED31741FFD892900F16CAD /* pt */, - 99A8630F2A753A8400EEEE75 /* es */, - 08C28FB2279CBE530016693E /* tr */, - ); - name = UnicodeBlock.strings; - sourceTree = ""; - }; 2AAFA7BA2B7A2DAF00A2B228 /* MultipleReplaceListView.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -3676,15 +3593,6 @@ name = MultipleReplaceListView.storyboard; sourceTree = ""; }; - 2ADF3BFF1E6D7345009125BB /* SnippetsPane.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 2ADF3C001E6D7345009125BB /* Base */, - 2AF122A42B7A3D50004BA1FF /* mul */, - ); - name = SnippetsPane.storyboard; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -3709,7 +3617,6 @@ baseConfigurationReference = 5454B92B243C8257009275BC /* UI-Tests.xcconfig */; buildSettings = { GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = com.wolfrosch.CotEditorUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_TARGET_NAME = CotEditor; @@ -3721,7 +3628,6 @@ baseConfigurationReference = 5454B92B243C8257009275BC /* UI-Tests.xcconfig */; buildSettings = { GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = com.wolfrosch.CotEditorUITests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_TARGET_NAME = CotEditor; @@ -3734,14 +3640,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 660; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; INFOPLIST_FILE = CotEditor/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - MARKETING_VERSION = 4.8.6; + MARKETING_VERSION = "4.9.0-alpha"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; + SWIFT_STRICT_CONCURRENCY = targeted; }; name = Debug; }; @@ -3751,14 +3658,15 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 660; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; INFOPLIST_FILE = CotEditor/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - MARKETING_VERSION = 4.8.6; + MARKETING_VERSION = "4.9.0-alpha"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; + SWIFT_STRICT_CONCURRENCY = targeted; }; name = Release; }; @@ -3768,7 +3676,6 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditorTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CotEditor.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CotEditor"; @@ -3781,7 +3688,6 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; GENERATE_INFOPLIST_FILE = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditorTests; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CotEditor.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/CotEditor"; @@ -3794,15 +3700,16 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 660; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; INFOPLIST_FILE = CotEditor/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - MARKETING_VERSION = 4.8.6; + MARKETING_VERSION = "4.9.0-alpha"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SPARKLE"; + SWIFT_STRICT_CONCURRENCY = targeted; }; name = Debug; }; @@ -3812,15 +3719,16 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "Accent Color"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 660; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; INFOPLIST_FILE = CotEditor/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; - MARKETING_VERSION = 4.8.6; + MARKETING_VERSION = "4.9.0-alpha"; PRODUCT_BUNDLE_IDENTIFIER = com.coteditor.CotEditor; PRODUCT_NAME = CotEditor; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SPARKLE"; + SWIFT_STRICT_CONCURRENCY = targeted; }; name = Release; }; @@ -3875,7 +3783,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -3885,7 +3793,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_STRICT_CONCURRENCY = targeted; + SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Debug; @@ -3940,7 +3848,7 @@ "@executable_path/../Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "-enable-upcoming-feature ConciseMagicFile -enable-upcoming-feature ExistentialAny -enable-upcoming-feature ForwardTrailingClosures -enable-upcoming-feature ImplicitOpenExistentials -enable-upcoming-feature DisableOutwardActorInference -enable-upcoming-feature IsolatedDefaultValues -enable-upcoming-feature GlobalConcurrency"; @@ -3948,7 +3856,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_STRICT_CONCURRENCY = targeted; + SWIFT_STRICT_CONCURRENCY = complete; SWIFT_VERSION = 5.0; }; name = Release; @@ -4018,7 +3926,7 @@ repositoryURL = "https://github.com/jpsim/Yams"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 5.0.0; + minimumVersion = 5.1.0; }; }; 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */ = { @@ -4026,7 +3934,7 @@ repositoryURL = "https://github.com/sparkle-project/Sparkle"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 2.0.0; + minimumVersion = 2.6.0; }; }; 2ACD02BB22A87CED00893051 /* XCRemoteSwiftPackageReference "WFColorCode" */ = { @@ -4034,16 +3942,48 @@ repositoryURL = "https://github.com/1024jp/WFColorCode"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 2.4.0; + minimumVersion = 3.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 2A32688D2C1B504500CF1AAF /* Shortcut */ = { + isa = XCSwiftPackageProductDependency; + productName = Shortcut; + }; + 2A32688F2C1B504B00CF1AAF /* Shortcut */ = { + isa = XCSwiftPackageProductDependency; + productName = Shortcut; + }; + 2A3268922C1C580800CF1AAF /* Defaults */ = { + isa = XCSwiftPackageProductDependency; + productName = Defaults; + }; + 2A3268942C1C580D00CF1AAF /* Defaults */ = { + isa = XCSwiftPackageProductDependency; + productName = Defaults; + }; + 2A3853672C1AF42C00C282C0 /* FilePermissions */ = { + isa = XCSwiftPackageProductDependency; + productName = FilePermissions; + }; + 2A3853692C1AF43100C282C0 /* FilePermissions */ = { + isa = XCSwiftPackageProductDependency; + productName = FilePermissions; + }; 2A53326226799B08000DE73D /* SyntaxMapBuilder */ = { isa = XCSwiftPackageProductDependency; productName = SyntaxMapBuilder; }; + 2A7E06E72C1A745400E5396D /* CharacterInfo */ = { + isa = XCSwiftPackageProductDependency; + productName = CharacterInfo; + }; + 2A7E06E92C1A745E00E5396D /* CharacterInfo */ = { + isa = XCSwiftPackageProductDependency; + productName = CharacterInfo; + }; 2AA2C6FB24399A920017D1EC /* Yams */ = { isa = XCSwiftPackageProductDependency; package = 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */; @@ -4054,6 +3994,14 @@ package = 2AA2C6FA24399A920017D1EC /* XCRemoteSwiftPackageReference "Yams" */; productName = Yams; }; + 2AA7BDD52C1B0CC10075BB6C /* UnicodeNormalization */ = { + isa = XCSwiftPackageProductDependency; + productName = UnicodeNormalization; + }; + 2AA7BDD72C1B0CC70075BB6C /* UnicodeNormalization */ = { + isa = XCSwiftPackageProductDependency; + productName = UnicodeNormalization; + }; 2AAAE6E426DB82F800C5F0AC /* Sparkle */ = { isa = XCSwiftPackageProductDependency; package = 2AAAE6E326DB82F800C5F0AC /* XCRemoteSwiftPackageReference "Sparkle" */; @@ -4081,6 +4029,14 @@ isa = XCSwiftPackageProductDependency; productName = SyntaxMapBuilder; }; + 2ADF96402C1B05CD00B6B722 /* FileEncoding */ = { + isa = XCSwiftPackageProductDependency; + productName = FileEncoding; + }; + 2ADF96422C1B05D300B6B722 /* FileEncoding */ = { + isa = XCSwiftPackageProductDependency; + productName = FileEncoding; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; diff --git a/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b3195dd0d..0aa7b9b34 100644 --- a/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/CotEditor.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,4 +1,5 @@ { + "originHash" : "7dca4ff47edbb01ed3742306f32277aceedc9d9a470b53ac04f4c2622fbabe20", "pins" : [ { "identity" : "sparkle", @@ -23,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/1024jp/WFColorCode", "state" : { - "revision" : "f256e6b832184953e0e9a1846b7836fff8d37888", - "version" : "2.10.0" + "revision" : "3f7d0c75e47e0490f2dfd353291e593e80ad85b6", + "version" : "3.0.0" } }, { @@ -37,5 +38,5 @@ } } ], - "version" : 2 + "version" : 3 } diff --git a/CotEditor.xcodeproj/xcshareddata/xcschemes/CotEditor -Sparkle.xcscheme b/CotEditor.xcodeproj/xcshareddata/xcschemes/CotEditor -Sparkle.xcscheme index 3e669df45..971cd5b4b 100644 --- a/CotEditor.xcodeproj/xcshareddata/xcschemes/CotEditor -Sparkle.xcscheme +++ b/CotEditor.xcodeproj/xcshareddata/xcschemes/CotEditor -Sparkle.xcscheme @@ -1,6 +1,6 @@ + + + shouldUseLaunchSchemeArgsEnv = "YES" + language = "en"> diff --git a/CotEditor.xcodeproj/xcshareddata/xcschemes/Update Help Index.xcscheme b/CotEditor.xcodeproj/xcshareddata/xcschemes/Update Help Index.xcscheme index 6a157fe6a..1f0b820a7 100644 --- a/CotEditor.xcodeproj/xcshareddata/xcschemes/Update Help Index.xcscheme +++ b/CotEditor.xcodeproj/xcshareddata/xcschemes/Update Help Index.xcscheme @@ -1,6 +1,6 @@ + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from bag.coffee + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.dark.svg b/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.dark.svg index 69492ecf2..40b517640 100644 --- a/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.dark.svg +++ b/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.dark.svg @@ -1,10 +1,12 @@ - + - + + @@ -19,39 +21,39 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" Heavy Black - - + + - - + + - - + + Design Variations Symbols are supported in up to nine weights and three scales. For optimal layout with text and other symbols, vertically align symbols with the adjacent text. - - + + - + Margins Leading and trailing margins on the left and right side of each symbol can be adjusted by modifying the x-location of the margin guidelines. Modifications are automatically applied proportionally to all scales and weights. - - + + Exporting Symbols should be outlined when exporting to ensure the design is preserved when submitting to Xcode. - Template v.3.0 - Requires Xcode 13 or greater + Template v.5.0 + Requires Xcode 15 or greater Generated from emoji.dark - Typeset at 100 points + Typeset at 100.0 points Small Medium Large @@ -81,13 +83,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" - + - + - + diff --git a/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.svg b/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.svg index 6b81aff66..bb41e10ce 100644 --- a/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.svg +++ b/CotEditor/Assets.xcassets/Symbols/emoji.symbolset/emoji.svg @@ -1,15 +1,20 @@ - + - - diff --git a/CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/espresso.symbolset/Contents.json similarity index 77% rename from CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/Contents.json rename to CotEditor/Assets.xcassets/Symbols/espresso.symbolset/Contents.json index b73ad8c53..057665ffc 100644 --- a/CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/Contents.json +++ b/CotEditor/Assets.xcassets/Symbols/espresso.symbolset/Contents.json @@ -5,7 +5,7 @@ }, "symbols" : [ { - "filename" : "tab.right.svg", + "filename" : "espresso.svg", "idiom" : "universal" } ] diff --git a/CotEditor/Assets.xcassets/Symbols/espresso.symbolset/espresso.svg b/CotEditor/Assets.xcassets/Symbols/espresso.symbolset/espresso.svg new file mode 100644 index 000000000..4b9af2684 --- /dev/null +++ b/CotEditor/Assets.xcassets/Symbols/espresso.symbolset/espresso.svg @@ -0,0 +1,107 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from espresso + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CotEditor/Assets.xcassets/Symbols/paragraphsign.slash.symbolset/paragraphsign.slash.svg b/CotEditor/Assets.xcassets/Symbols/paragraphsign.slash.symbolset/paragraphsign.slash.svg index fe8827985..4020c1197 100644 --- a/CotEditor/Assets.xcassets/Symbols/paragraphsign.slash.symbolset/paragraphsign.slash.svg +++ b/CotEditor/Assets.xcassets/Symbols/paragraphsign.slash.symbolset/paragraphsign.slash.svg @@ -5,20 +5,19 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - diff --git a/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/Contents.json new file mode 100644 index 000000000..b721eaa07 --- /dev/null +++ b/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/Contents.json @@ -0,0 +1,13 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "tab.forward.split.svg", + "idiom" : "universal", + "language-direction" : "left-to-right" + } + ] +} diff --git a/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/tab.forward.split.svg b/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/tab.forward.split.svg new file mode 100644 index 000000000..ce5cdfb1f --- /dev/null +++ b/CotEditor/Assets.xcassets/Symbols/tab.forward.split.symbolset/tab.forward.split.svg @@ -0,0 +1,113 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from tab.forward.split + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/Contents.json new file mode 100644 index 000000000..6e0992460 --- /dev/null +++ b/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/Contents.json @@ -0,0 +1,13 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "symbols" : [ + { + "filename" : "tab.forward.svg", + "idiom" : "universal", + "language-direction" : "left-to-right" + } + ] +} diff --git a/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/tab.forward.svg b/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/tab.forward.svg new file mode 100644 index 000000000..7bc7b3ee6 --- /dev/null +++ b/CotEditor/Assets.xcassets/Symbols/tab.forward.symbolset/tab.forward.svg @@ -0,0 +1,107 @@ + + + + + + + + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + + + + + + + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from tab.forward + Typeset at 100.0 points + Small + Medium + Large + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CotEditor/Assets.xcassets/Symbols/tab.right.split.symbolset/tab.right.split.svg b/CotEditor/Assets.xcassets/Symbols/tab.right.split.symbolset/tab.right.split.svg deleted file mode 100644 index d15854003..000000000 --- a/CotEditor/Assets.xcassets/Symbols/tab.right.split.symbolset/tab.right.split.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - Weight/Scale Variations - - - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - - - - - - - - Template v.2.0 - Requires Xcode 12 or greater - Generated from delete.right - Typeset at 100 points - - - - - Small - Medium - Large - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/tab.right.svg b/CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/tab.right.svg deleted file mode 100644 index e40c2d55c..000000000 --- a/CotEditor/Assets.xcassets/Symbols/tab.right.symbolset/tab.right.svg +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - Weight/Scale Variations - - - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - - - - - - - - Template v.2.0 - Requires Xcode 12 or greater - Generated from delete.right - Typeset at 100 points - - - - - Small - Medium - Large - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/Contents.json index b72933dac..3a54b4197 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/Contents.json +++ b/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/Contents.json @@ -6,7 +6,8 @@ "symbols" : [ { "filename" : "text.commentout.svg", - "idiom" : "universal" + "idiom" : "universal", + "language-direction" : "left-to-right" } ] } diff --git a/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/text.commentout.svg b/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/text.commentout.svg index 99762a0c6..8d478bf67 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/text.commentout.svg +++ b/CotEditor/Assets.xcassets/Symbols/text.commentout.symbolset/text.commentout.svg @@ -1,120 +1,107 @@ - + + - - diff --git a/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/Contents.json deleted file mode 100644 index d8a5d5400..000000000 --- a/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - }, - "symbols" : [ - { - "filename" : "text.indentguides.hide.svg", - "idiom" : "universal" - } - ] -} diff --git a/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/text.indentguides.hide.svg b/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/text.indentguides.hide.svg deleted file mode 100644 index 11ba0096f..000000000 --- a/CotEditor/Assets.xcassets/Symbols/text.indentguides.hide.symbolset/text.indentguides.hide.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - Weight/Scale Variations - - - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - - - - - - - - Template v.2.0 - Requires Xcode 12 or greater - Generated from text.alignleft - Typeset at 100 points - - - - - Small - Medium - Large - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/Contents.json index 275755314..71c90a191 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/Contents.json +++ b/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/Contents.json @@ -6,7 +6,8 @@ "symbols" : [ { "filename" : "text.indentguides.svg", - "idiom" : "universal" + "idiom" : "universal", + "language-direction" : "left-to-right" } ] } diff --git a/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/text.indentguides.svg b/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/text.indentguides.svg index b7306a40d..003f698ce 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/text.indentguides.svg +++ b/CotEditor/Assets.xcassets/Symbols/text.indentguides.symbolset/text.indentguides.svg @@ -1,97 +1,107 @@ - + + - - + + + - - - - - - - - - Weight/Scale Variations - - - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + - - - - - - Template v.2.0 - Requires Xcode 12 or greater - Generated from text.alignleft - Typeset at 100 points - + + - - - Small - Medium - Large + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from text.indentguides + Typeset at 100.0 points + Small + Medium + Large - - - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + - - - - - + + + - - - - + + + - - - - + + + diff --git a/CotEditor/Assets.xcassets/Symbols/text.vertical.symbolset/text.vertical.svg b/CotEditor/Assets.xcassets/Symbols/text.vertical.symbolset/text.vertical.svg index 7cc491768..3ee92a340 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.vertical.symbolset/text.vertical.svg +++ b/CotEditor/Assets.xcassets/Symbols/text.vertical.symbolset/text.vertical.svg @@ -4,14 +4,14 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> - - diff --git a/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/Contents.json index abd25c7e8..1da7a7123 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/Contents.json +++ b/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/Contents.json @@ -6,7 +6,8 @@ "symbols" : [ { "filename" : "text.wrap.slash.svg", - "idiom" : "universal" + "idiom" : "universal", + "language-direction" : "left-to-right" } ] } diff --git a/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/text.wrap.slash.svg b/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/text.wrap.slash.svg index a07d5285b..e9d1875ec 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/text.wrap.slash.svg +++ b/CotEditor/Assets.xcassets/Symbols/text.wrap.slash.symbolset/text.wrap.slash.svg @@ -1,108 +1,119 @@ - + + - - diff --git a/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/Contents.json b/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/Contents.json index b19a3eba5..87a713b26 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/Contents.json +++ b/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/Contents.json @@ -6,7 +6,8 @@ "symbols" : [ { "filename" : "text.wrap.svg", - "idiom" : "universal" + "idiom" : "universal", + "language-direction" : "left-to-right" } ] } diff --git a/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/text.wrap.svg b/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/text.wrap.svg index 5701045d8..5850d410d 100644 --- a/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/text.wrap.svg +++ b/CotEditor/Assets.xcassets/Symbols/text.wrap.symbolset/text.wrap.svg @@ -1,102 +1,107 @@ - + + - - + + - - - - - - - - - Weight/Scale Variations - - - Ultralight - Thin - Light - Regular - Medium - Semibold - Bold - Heavy - Black - - + + + Weight/Scale Variations + Ultralight + Thin + Light + Regular + Medium + Semibold + Bold + Heavy + Black + + + - - - - - - Template v.3.0 - Requires Xcode 13 or greater - Generated from lines.wrap - Typeset at 100 points - + + - - - Small - Medium - Large + + + Design Variations + Symbols are supported in up to nine weights and three scales. + For optimal layout with text and other symbols, vertically align + symbols with the adjacent text. + + + + + + Margins + Leading and trailing margins on the left and right side of each symbol + can be adjusted by modifying the x-location of the margin guidelines. + Modifications are automatically applied proportionally to all + scales and weights. + + + + Exporting + Symbols should be outlined when exporting to ensure the + design is preserved when submitting to Xcode. + Template v.5.0 + Requires Xcode 15 or greater + Generated from text.wrap + Typeset at 100.0 points + Small + Medium + Large - - - - - + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + - - - - + + + - - - + + + - - - + + + diff --git a/CotEditor/Assets.xcassets/Symbols/uiwindow.opacity.symbolset/uiwindow.opacity.svg b/CotEditor/Assets.xcassets/Symbols/uiwindow.opacity.symbolset/uiwindow.opacity.svg index aa381b27e..86b39d49c 100644 --- a/CotEditor/Assets.xcassets/Symbols/uiwindow.opacity.symbolset/uiwindow.opacity.svg +++ b/CotEditor/Assets.xcassets/Symbols/uiwindow.opacity.symbolset/uiwindow.opacity.svg @@ -1,10 +1,18 @@ - + - + + @@ -19,39 +27,39 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" Heavy Black - - + + - - + + - - + + Design Variations Symbols are supported in up to nine weights and three scales. For optimal layout with text and other symbols, vertically align symbols with the adjacent text. - - + + - + Margins Leading and trailing margins on the left and right side of each symbol can be adjusted by modifying the x-location of the margin guidelines. Modifications are automatically applied proportionally to all scales and weights. - - + + Exporting Symbols should be outlined when exporting to ensure the design is preserved when submitting to Xcode. - Template v.3.0 - Requires Xcode 13 or greater + Template v.5.0 + Requires Xcode 15 or greater Generated from uiwindow.opacity - Typeset at 100 points + Typeset at 100.0 points Small Medium Large @@ -81,13 +89,13 @@ PUBLIC "-//W3C//DTD SVG 1.1//EN" - + - + - + diff --git a/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/Contents.json b/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/Contents.json deleted file mode 100644 index 2a1e60f9e..000000000 --- a/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "split.add.vertical.svg", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/split.add.vertical.svg b/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/split.add.vertical.svg deleted file mode 100644 index b27856b42..000000000 --- a/CotEditor/Assets.xcassets/Templates/split.add.vertical.imageset/split.add.vertical.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/CotEditor/Base.lproj/KeyBindingTreeView.storyboard b/CotEditor/Base.lproj/KeyBindingTreeView.storyboard index 0af7a62ad..fa2ce0e32 100644 --- a/CotEditor/Base.lproj/KeyBindingTreeView.storyboard +++ b/CotEditor/Base.lproj/KeyBindingTreeView.storyboard @@ -1,7 +1,6 @@ - @@ -14,13 +13,13 @@ - + - + @@ -86,13 +85,13 @@ - + - + @@ -149,7 +148,7 @@ - + diff --git a/CotEditor/Base.lproj/Main.storyboard b/CotEditor/Base.lproj/Main.storyboard index 012555333..db68edbe7 100644 --- a/CotEditor/Base.lproj/Main.storyboard +++ b/CotEditor/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - - + @@ -184,6 +183,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Gw @@ -193,23 +242,7 @@ Gw - - - - - - - - - - - - - - - - - + @@ -1060,11 +1093,19 @@ CA - + - - - + + + + + + + + + + + @@ -1176,7 +1217,7 @@ CA - + @@ -1219,6 +1260,7 @@ CA + diff --git a/CotEditor/Base.lproj/NavigationBar.storyboard b/CotEditor/Base.lproj/NavigationBar.storyboard deleted file mode 100644 index 6684fe968..000000000 --- a/CotEditor/Base.lproj/NavigationBar.storyboard +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/Base.lproj/SnippetsPane.storyboard b/CotEditor/Base.lproj/SnippetsPane.storyboard deleted file mode 100644 index c2dd7e08c..000000000 --- a/CotEditor/Base.lproj/SnippetsPane.storyboard +++ /dev/null @@ -1,1278 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSAllRomanInputSourcesLocaleIdentifier - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eu - hr_BA - en_CM - rw_RW - en_SZ - tk_Latn - uz_Arab - he_IL - ar - en_PN - as - en_NF - rwk_TZ - zh_Hant_TW - gsw_LI - th_TH - ta_IN - es_EA - fr_GF - ar_001 - en_RW - tr_TR - de_CH - ee_TG - en_NG - fr_TG - az - fr_SC - es_HN - en_AG - ru_KZ - gsw - dyo - so_ET - zh_Hant_MO - de_BE - km_KH - my_MM - mgh_MZ - ee_GH - es_EC - kw_GB - rm_CH - en_ME - nyn - mk_MK - bs_Cyrl_BA - ar_MR - en_BM - ms_Arab - en_AI - gl_ES - en_PR - ha_Latn_GH - ne_IN - or_IN - khq_ML - en_MG - pt_TL - en_LC - ta_SG - jmc_TZ - om_ET - lv_LV - es_US - en_PT - vai_Latn_LR - to_TO - en_NL - cgg_UG - ta - en_MH - iu_Cans_CA - zu_ZA - shi_Latn_MA - brx_IN - ar_KM - en_AL - te - chr_US - yo_BJ - fr_VU - pa - tg - ks_Arab - kea - te_IN - th - fr_RE - ur_IN - yo_NG - ti - guz_KE - tk - kl_GL - ksf_CM - mua_CM - lag_TZ - fr_TN - es_PA - pl_PL - to - hi_IN - dje_NE - es_GQ - kok_IN - pl - tr - bem - ha - ckb - lg - fr_GN - en_PW - en_NO - nyn_UG - sr_Latn_RS - pa_Guru - he - swc_CD - ug_Arab - lu_CD - mgo_CM - sn_ZW - en_BS - ps_AF - da - ms_Latn_SG - ps - ln - pt - iu_Cans - hi - lo - ebu - de - gu_IN - seh - en_CX - en_ZM - tzm_Latn_MA - fr_HT - fr_GP - lt - lu - ln_CD - vai_Latn - el_GR - lv - en_KE - sbp - hr - en_CY - es_GT - twq_NE - zh_Hant_HK - kln_KE - fr_GQ - chr - hu - es_UY - fr_CA - en_NR - mer - shi - es_PE - fr_SN - bez - sw_TZ - kkj - hy - kk_Cyrl_KZ - en_CZ - teo_KE - teo - dz_BT - ar_JO - mer_KE - khq - ln_CF - nn_NO - en_MO - ar_TD - dz - ses - en_BW - en_AS - ar_IL - ms_Latn_BN - bo_CN - nnh - teo_UG - hy_AM - ln_CG - sr_Latn_BA - en_MP - ksb_TZ - ar_SA - ar_LY - en_AT - so_KE - fr_CD - af_NA - en_NU - es_PH - en_KI - en_JE - lkt - en_AU - fa_IR - uz_Latn_UZ - ky_Cyrl - zh_Hans_CN - ewo_CM - fr_PF - ca_IT - en_BZ - ar_KW - pt_GW - fr_FR - am_ET - en_VC - fr_DJ - fr_CF - es_SV - en_MS - pt_ST - ar_SD - luy_KE - swc - de_LI - fr_CG - zh_Hans_SG - en_MT - ewo - af_ZA - om_KE - nl_SR - es_ES - es_DO - ar_IQ - fr_CH - nnh_CM - es_419 - en_MU - en_US_POSIX - yav_CM - luo_KE - dua_CM - et_EE - en_IE - ak_GH - rwk - es_CL - kea_CV - fr_CI - fr_BE - en_NZ - ky_Cyrl_KG - en_LR - en_KN - nb_SJ - sg - sr_Cyrl_RS - ru_RU - en_ZW - sv_AX - si - ga_IE - en_VG - sk - agq_CM - fr_BF - naq_NA - sl - en_MW - mr_IN - az_Latn - en_LS - de_AT - ka - sn - sr_Latn_ME - fr_NC - so - is_IS - twq - ig_NG - sq - fo_FO - sr - tzm - ga - om - en_LT - bas_CM - ki - nl_BE - ar_QA - sv - kk - sw - es_CO - az_Latn_AZ - rn_BI - or - kl - ca - en_VI - km - kn - en_LU - fr_SY - ar_TN - en_JM - fr_PM - ko - fr_NE - fr_MA - gl - ru_MD - saq_KE - ks - fr_CM - gv_IM - fr_BI - en_LV - ks_Arab_IN - es_NI - en_GB - kw - nl_SX - dav_KE - tr_CY - ky - en_UG - tzm_Latn - en_TC - nus_SD - ar_EG - fr_BJ - gu - es_PR - fr_RW - sr_Cyrl_BA - gv - fr_MC - cs - bez_TZ - es_CR - asa_TZ - ar_EH - ms_Arab_BN - mn_Cyrl - sbp_TZ - ha_Latn_NE - lt_LT - mfe - en_GD - cy - ca_FR - es_BO - fr_BL - bn_IN - uz_Cyrl_UZ - az_Cyrl - en_IM - sw_KE - en_SB - ur_PK - pa_Arab - haw_US - ar_SO - en_IN - ha_Latn - fil - fr_MF - en_WS - es_CU - ja_JP - en_SC - en_IO - pt_PT - en_HK - en_GG - fr_MG - de_LU - ms_Latn_MY - tg_Cyrl - en_SD - shi_Tfng - ln_AO - ug_Arab_CN - as_IN - en_GH - ro_RO - jgo_CM - dua - en_UM - en_SE - kn_IN - en_KY - vun_TZ - kln - en_GI - ca_ES - rof - pt_CV - kok - pt_BR - ar_DJ - zh - fi_FI - tg_Cyrl_TJ - es_PY - ar_SS - mua - sr_Cyrl_ME - vai_Vaii_LR - en_001 - xog_UG - en_TK - si_LK - en_SG - nl_NL - vi - sv_SE - pt_AO - fr_DZ - ca_AD - xog - en_IS - nb - seh_MZ - es_AR - sk_SK - en_SH - ti_ER - nd - az_Cyrl_AZ - zu - ne - nd_ZW - el_CY - en_IT - nl_BQ - da_GL - ja - rm - fr_ML - rn - en_VU - rof_TZ - ro - ebu_KE - ru_KG - en_SI - sg_CF - mfe_MU - nl - brx - bs_Latn - fa - zgh_MA - en_GM - shi_Latn - en_FI - nn - en_EE - ru - kam_KE - vai_Vaii - ar_ER - ti_ET - rw - ff - luo - fa_AF - ha_Latn_NG - nl_CW - en_HR - en_FJ - fi - pt_MO - be - en_US - en_TO - en_SK - bg - ru_BY - it_IT - ml_IN - gsw_CH - fo - sv_FI - en_FK - nus - ta_LK - vun - sr_Latn - fr - en_SL - bm - ar_BH - guz - bn - bo - ar_SY - lo_LA - ne_NP - uz_Latn - be_BY - es_IC - sr_Latn_XK - ar_MA - pa_Guru_IN - br - luy - kde_TZ - bs - hu_HU - ar_AE - en_HU - zh_Hans - en_FM - sq_AL - ko_KP - en_150 - en_DE - fr_MQ - en_CA - en_TR - ro_MD - es_VE - fr_WF - mt_MT - kab - nmg_CM - ru_UA - fr_MR - tk_Latn_TM - zh_Hans_MO - mn_Cyrl_MN - bs_Cyrl - sw_UG - ko_KR - en_DG - bo_IN - en_CC - shi_Tfng_MA - lag - it_SM - en_TT - ms_Arab_MY - sq_MK - ms_Latn - bem_ZM - kde - ar_OM - cgg - bas - kam - zh_Hant - es_MX - en_GU - fr_MU - fr_KM - ar_LB - en_BA - en_TV - sr_Cyrl - dje - kab_DZ - fil_PH - vai - hr_HR - bs_Latn_BA - nl_AW - dav - so_SO - ar_PS - en_FR - uz_Cyrl - ff_SN - en_BB - ki_KE - naq - en_SS - mg_MG - mas_KE - en_RO - en_PG - mgh - dyo_SN - mas - agq - bn_BD - haw - nb_NO - da_DK - en_DK - saq - ug - cy_GB - fr_YT - jmc - ses_ML - en_PH - de_DE - ar_YE - bm_ML - yo - lkt_US - uz_Arab_AF - jgo - uk - sl_SI - en_CH - asa - lg_UG - mgo - id_ID - en_NA - en_GY - zgh - pt_MZ - fr_LU - kk_Cyrl - mas_TZ - ur - en_DM - ta_MY - en_BE - mg - fr_GA - ka_GE - nmg - en_TZ - eu_ES - ar_DZ - id - so_DJ - yav - mk - pa_Arab_PK - ml - en_ER - ig - mn - ksb - uz - vi_VN - ii - en_PK - ee - mr - ms - en_ES - sq_XK - it_CH - mt - en_CK - br_FR - sr_Cyrl_XK - ksf - en_SX - bg_BG - en_PL - af - el - cs_CZ - fr_TD - zh_Hans_HK - is - my - en - it - ii_CN - eo - iu - en_ZA - en_AD - ak - en_RU - kkj_CM - am - es - et - uk_UA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Select a snippet to edit. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - extensions - formatString - scope - description - - - - - - - - - - - diff --git a/CotEditor/Base.lproj/ThemeListView.storyboard b/CotEditor/Base.lproj/ThemeListView.storyboard new file mode 100644 index 000000000..38b82db15 --- /dev/null +++ b/CotEditor/Base.lproj/ThemeListView.storyboard @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CotEditor/Base.lproj/ThemeView.storyboard b/CotEditor/Base.lproj/ThemeView.storyboard deleted file mode 100644 index df5223bfc..000000000 --- a/CotEditor/Base.lproj/ThemeView.storyboard +++ /dev/null @@ -1,315 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html index a7cf484e6..fca3e6731 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/howto_inspect_fileinfo.html @@ -22,7 +22,7 @@

The information appeares in the inspector is as follows:

- + diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript.html index c2a39dbcd..af9ef8750 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript.html +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript.html @@ -147,6 +147,8 @@

The selection property doesn’t work by itself. Use this property with others such as contents.

+

Starting form CotEditor 5.0, characters are counted in the Unicode grapheme cluster unit. This is the same as the specification of AppleScript 2.0.

+

When ‘location’ is a negative value, the selection range starts from the ‘location’-th last character.
When ‘length’ is a positive value, the selection range becomes the ‘length’ characters starting from ‘location.’ If ‘length’ is larger than the number of the rest characters in the document, the range is from ‘location’ to the end.
When ‘length’ is a negative value, the selection range ends at the ‘length’-th last character. If the absolute value of ‘length’ is smaller than ‘location’ (that is, the selection’s end point is before ‘location’), the caret just moves to ‘location’ (same as when {location, 0} was input).

diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript_changes.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript_changes.html index 8e3610218..7e79c3d9f 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript_changes.html +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/script_osascript_changes.html @@ -16,6 +16,16 @@

This page lists up the previous specific changes on AppleScript support in CotEditor.

+
+

Terminology change on CotEditor 5.0.0

+ +
+

Change character range unit to grapheme cluster based

+

Change the character unit, used in selection or jump for instance, from UTF-16 based to the Unicode grapheme cluster-based. This is to follow the specification change in AppleScript 2.0 introduced in Mac OS X 10.5.

+
+
+ +

Terminology change on CotEditor 4.4.0

diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings.html index 8fb758b51..cad902de9 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings.html +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings.html @@ -42,6 +42,9 @@
  • Key Bindings: Customize keyboard shortcuts to execute menu commands.
    • + +
  • Donation: + Support the CotEditor project by offering coffee.
    • diff --git a/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_donation.html b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_donation.html new file mode 100644 index 000000000..0a797bb2c --- /dev/null +++ b/CotEditor/CotEditor.help/Contents/Resources/en.lproj/pgs/settings_donation.html @@ -0,0 +1,56 @@ + + + + + + + + + Change Donation settings in CotEditor + + + + + +

    Change Donation settings in CotEditor

    + +

    In the CotEditor app on your Mac, use Donation settings to donate to the CotEditor project or change the settings related to continuous support. To change these settings, choose CotEditor > Settings, then click Donation.

    + + +
    Document FileFile
    ItemDescription
    + + + + + + + + + + + + + + + + + + +
    OptionDescription
    Continuous supportA continuous donation to the CotEditor project. The subsription will automatically be renewed yearly. To stop the subscription, go to the App Store from the “Manage subscriptions” link and cancel the subscription there.
    Badge typeSelect the badge to display on the status bar during continuous support.
    One-time donationA one-time donation to the CotEditor project. You can send it multiple times but there is no particular reward like the coffee badge by the continuous support.
    + +
      +
    • The donation uses the in-app purchase on the App Store provided by Apple. This feature is available only in CotEditor downloaded from the App Store.
      • +
    • The donation buttons are available only when an internet connection exists.
      • +
    • The donations made here will be made to the individual developer.
      • +
    + + +
    +

    See also

    + +
    + + + diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html index d71890dce..793f8da05 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/howto_inspect_fileinfo.html @@ -22,7 +22,7 @@

    表示される情報は下記の通りです。

    - + diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript.html index 487075c48..f96e1c21e 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript.html +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript.html @@ -147,6 +147,8 @@

    「selection」は単独では意味を持ちません。contentsなどのプロパティとともに使用してください。

    +

    CotEditor 5.0以降、文字はUnicode書記素クラスタ単位でカウントします。これはAppleScript 2.0の仕様と同一です。

    +

    locationが負の場合、対象書類の文字列の後ろから数えてlocation番目から始まる範囲となります。
    lengthが正である場合、指定される範囲はlocationから数えてlength文字数分となります。また、対象書類の文字列の長さを超えてlengthが入力された場合、末尾までが範囲となります。
    lengthが負である場合、指定される範囲は対象書類の文字列の後ろから数えてlength文字までとなります。もし、lengthの絶対値がlocationよりも小さい（locationよりも前に終了位置がある）場合には、locationが優先されlocation位置に挿入ポイントが移動します（{location, 0}が入力されたのと同じ）。

    diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript_changes.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript_changes.html index 51e421cd8..8f5d6d361 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript_changes.html +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/script_osascript_changes.html @@ -16,6 +16,16 @@

    このページでは、CotEditorのAppleScript対応における今までの仕様改訂を列挙しています。

    +
    +

    CotEditor 5.0.0での仕様改訂

    + +
    +

    文字範囲のカウントをUTF-16ベースから書記素クラスタベースに変更

    +

    selectionやjumpなどで使われる文字範囲の数値指定をUTF-16ベースからUnicode書記素クラスタベースに変更しました。この変更はMac OS X 10.5で導入されたAppleScript 2.0での変更に追従するものです。

    +
    +
    + +

    CotEditor 4.4.0での仕様改訂

    diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings.html index 1682f4eef..f9a42564e 100644 --- a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings.html +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings.html @@ -43,6 +43,9 @@
  • キーバインド: メニューに割り当てられているキーボードショートカットを変更します。
    • + +
  • 寄付: + コーヒーを送ってCotEditorプロジェクトをサポートできます。
    • diff --git a/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_donation.html b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_donation.html new file mode 100644 index 000000000..2840cdd10 --- /dev/null +++ b/CotEditor/CotEditor.help/Contents/Resources/ja.lproj/pgs/settings_donation.html @@ -0,0 +1,57 @@ + + + + + + + + + CotEditorで「寄付」設定を変更する + + + + + +

    CotEditorで「寄付」設定を変更する

    + +

    MacのCotEidtorアプリで、CotEditorプロジェクトに寄付をしたり継続的サポートに関する設定を変更するには、「寄付」設定を使用します。これらの設定を変更するには、「CotEditor」＞「設定」と選択してから「寄付」をクリックします。

    + + +
    書類ファイルファイル
    項目説明
    + + + + + + + + + + + + + + + + + + +
    オプション説明
    継続的なサポート1年ごとに自動更新される継続的なCotEditorプロジェクトへの寄付です。更新を中止するには「サブスクリプションを管理」からApp Storeでサブスクリプションをキャンセルしてください。
    バッジタイプ継続的なサポートの期間にステータスバーに表示するバッジを選択します。
    1回限りの寄付1回限りのCotEditorプロジェクトへの寄付です。何口でも送れますが、継続的なサポートのコーヒーバッジようなのようなオマケは特にありません。
    + +
      +
    • 寄付にはAppleから提供されるApp Storeのアプリ内課金の仕組みを用いています。この機能はAppStore版CotEditorのみで有効となります。
      • +
    • 寄付ボタンはインターネット接続があるときのみ有効になります。
      • +
    • ここでの寄付は、開発者個人への寄付となり寄附金控除の対象にはなりません。
      • +
    + + + +
    +

    関連項目

    + +
    + + + diff --git a/CotEditor/CotEditor.sdef b/CotEditor/CotEditor.sdef index 51afa131a..1ab09448d 100644 --- a/CotEditor/CotEditor.sdef +++ b/CotEditor/CotEditor.sdef @@ -114,7 +114,7 @@ - + diff --git a/CotEditor/CotEditor.storekit b/CotEditor/CotEditor.storekit new file mode 100644 index 000000000..6f257a6b2 --- /dev/null +++ b/CotEditor/CotEditor.storekit @@ -0,0 +1,151 @@ +{ + "appPolicies" : { + "eula" : "", + "policies" : [ + { + "locale" : "en_US", + "policyText" : "", + "policyURL" : "" + } + ] + }, + "identifier" : "A87F5DC7", + "nonRenewingSubscriptions" : [ + + ], + "products" : [ + { + "displayPrice" : "4.99", + "familyShareable" : false, + "internalID" : "6499507688", + "localizations" : [ + { + "description" : "おいしい1杯", + "displayName" : "エスプレッソ", + "locale" : "ja" + }, + { + "description" : "Eine köstliche Tasse", + "displayName" : "Espresso", + "locale" : "de" + }, + { + "description" : "A tasty cup", + "displayName" : "Espresso", + "locale" : "en_US" + } + ], + "productID" : "com.coteditor.CotEditor.donation.onetime", + "referenceName" : "One-time donation", + "type" : "Consumable" + } + ], + "settings" : { + "_applicationInternalID" : "1024640650", + "_developerTeamID" : "HT3Z3A72WZ", + "_failTransactionsEnabled" : false, + "_lastSynchronizedDate" : 736106884.83175504, + "_locale" : "en_US", + "_storefront" : "USA", + "_storeKitErrors" : [ + { + "current" : null, + "enabled" : false, + "name" : "Load Products" + }, + { + "current" : null, + "enabled" : false, + "name" : "Purchase" + }, + { + "current" : null, + "enabled" : false, + "name" : "Verification" + }, + { + "current" : null, + "enabled" : false, + "name" : "App Store Sync" + }, + { + "current" : null, + "enabled" : false, + "name" : "Subscription Status" + }, + { + "current" : null, + "enabled" : false, + "name" : "App Transaction" + }, + { + "current" : null, + "enabled" : false, + "name" : "Manage Subscriptions Sheet" + }, + { + "current" : null, + "enabled" : false, + "name" : "Refund Request Sheet" + }, + { + "current" : null, + "enabled" : false, + "name" : "Offer Code Redeem Sheet" + } + ] + }, + "subscriptionGroups" : [ + { + "id" : "21481959", + "localizations" : [ + + ], + "name" : "Continuous support", + "subscriptions" : [ + { + "adHocOffers" : [ + + ], + "codeOffers" : [ + + ], + "displayPrice" : "14.99", + "familyShareable" : false, + "groupNumber" : 1, + "internalID" : "6499540684", + "introductoryOffer" : null, + "localizations" : [ + { + "description" : "Kaffee für die tägliche Entwicklung", + "displayName" : "Kaffeebohnen", + "locale" : "de" + }, + { + "description" : "Coffee for daily development", + "displayName" : "Coffee Beans", + "locale" : "en_US" + }, + { + "description" : "日々の開発のためのコーヒー", + "displayName" : "コーヒー豆", + "locale" : "ja" + } + ], + "productID" : "com.coteditor.CotEditor.donation.continuous.yearly", + "recurringSubscriptionPeriod" : "P1Y", + "referenceName" : "Continuous support", + "subscriptionGroupID" : "21481959", + "type" : "RecurringSubscription", + "winbackOffers" : [ + + ] + } + ] + } + ], + "version" : { + "major" : 4, + "minor" : 0 + } +} diff --git a/CotEditor/Info.plist b/CotEditor/Info.plist index 614564d3c..fe48a640b 100644 --- a/CotEditor/Info.plist +++ b/CotEditor/Info.plist @@ -367,6 +367,20 @@ + + UTTypeConformsTo + + public.plain-text + + UTTypeDescription + UUID + UTTypeIcons + + UTTypeIdentifier + com.coteditor.uuid + UTTypeTagSpecification + + UTImportedTypeDeclarations diff --git a/CotEditor/Licenses/Solarized.txt b/CotEditor/Licenses/Solarized.txt deleted file mode 100644 index 8bf92a934..000000000 --- a/CotEditor/Licenses/Solarized.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2011 Ethan Schoonover - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/CotEditor/Localizables/CharacterInspector.xcstrings b/CotEditor/Localizables/CharacterInspector.xcstrings index e8b074abe..7b439f788 100644 --- a/CotEditor/Localizables/CharacterInspector.xcstrings +++ b/CotEditor/Localizables/CharacterInspector.xcstrings @@ -1,6 +1,83 @@ { "sourceLanguage" : "en", "strings" : { + "" : { + "comment" : "%lld is always 2 or more.", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "<%lld字から成る文字>" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld karakterden oluşan bir harf" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "<包含有%lld个字符>" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "<包含有%lld個字元>" + } + } + } + }, "Block:" : { "localizations" : { "cs" : { diff --git a/CotEditor/Localizables/CommandBar.xcstrings b/CotEditor/Localizables/CommandBar.xcstrings index 995059d3e..dd61f43cf 100644 --- a/CotEditor/Localizables/CommandBar.xcstrings +++ b/CotEditor/Localizables/CommandBar.xcstrings @@ -1,6 +1,101 @@ { "sourceLanguage" : "en", "strings" : { + "%lld commands found" : { + "comment" : "VoiceOver announcement when incrementally updated the command search result.", + "localizations" : { + "de" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "Einen Befehl gefunden" + } + }, + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld Befehle gefunden" + } + }, + "zero" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kinen Befehl gefunden" + } + } + } + } + }, + "en" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld command found" + } + }, + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld commands found" + } + }, + "zero" : { + "stringUnit" : { + "state" : "translated", + "value" : "No commands found" + } + } + } + } + }, + "en-GB" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld command found" + } + }, + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld commands found" + } + }, + "zero" : { + "stringUnit" : { + "state" : "translated", + "value" : "No commands found" + } + } + } + } + }, + "ja" : { + "variations" : { + "plural" : { + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lldコマンド見つかりました" + } + }, + "zero" : { + "stringUnit" : { + "state" : "translated", + "value" : "コマンドが見つかりませんでした" + } + } + } + } + } + } + }, "Command" : { "comment" : "command type", "localizations" : { diff --git a/CotEditor/Localizables/Document.xcstrings b/CotEditor/Localizables/Document.xcstrings index ee1ce9330..0981057a0 100644 --- a/CotEditor/Localizables/Document.xcstrings +++ b/CotEditor/Localizables/Document.xcstrings @@ -232,6 +232,160 @@ } } }, + "Close split editor" : { + "comment" : "tooltip for button", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zavřít rozdělený editor" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Geteilten Editor schließen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Close split editor" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Cerrar Editor Dividido" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fermer l’éditeur divisé" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Chiudi l’editor diviso" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "分割されたエディタを閉じる" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sluit gesplitste bewerker" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Feche o editor dividido" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bölünmüş düzenleyiciyi kapat" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "关闭分栏编辑器" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "關閉分欄編輯器" + } + } + } + }, + "Close Split Editor" : { + "comment" : "accessibility label for button", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zavřít rozdělený editor" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Geteilten Editor schließen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Close Split Editor" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Cerrar editor dividido" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fermer l’éditeur divisé" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Chiudi editor diviso" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "分割エディタを閉じる" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sluit gesplitste bewerker" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fechar Editor Dividido" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bölünmüş Düzenleyiciyi Kapat" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "关闭分栏显示" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "關閉分欄顯示" + } + } + } + }, "Code Points" : { "comment" : "label in document inspector", "localizations" : { @@ -694,83 +848,6 @@ } } }, - "Document File" : { - "comment" : "section title in inspector", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Soubor dokumentu" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dokumentdatei" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Document File" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Archivo del documento" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Fichier" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "File del documento" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "書類ファイル" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Documentbestand" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Arquivo do Documento" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Belge" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "文稿文件" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "文件檔案" - } - } - } - }, "Document has unsaved changes" : { "comment" : "tooltip for the “edited” indicator in the window tab", "localizations" : { @@ -1079,6 +1156,159 @@ } } }, + "Extracting Outline…" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extrahování osnovy…" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gliederung extrahieren …" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extracting Outline…" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extraer esquema…" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Récupération de la structure…" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Estrazione Outline…" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "アウトラインを抽出中…" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Omtrek uitpakken…" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extraindo Plano…" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ana hat çıkarılıyor…" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "提取提纲…" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "提取提綱⋯" + } + } + } + }, + "File" : { + "comment" : "section title in inspector", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Soubor" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Datei" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "File" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Archivo" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fichier" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "File" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "ファイル" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bestand" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Arquivo" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dosya" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "文件" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "檔案" + } + } + } + }, "File size" : { "comment" : "tooltip", "localizations" : { @@ -2984,79 +3214,25 @@ } } }, - "Next" : { - "comment" : "button label", + "Next Outline Item" : { + "comment" : "accessibility label for button", "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Další" - } - }, "de" : { "stringUnit" : { "state" : "translated", - "value" : "Weiter" + "value" : "Nächstes Gliederungselement" } }, "en-GB" : { "stringUnit" : { "state" : "translated", - "value" : "Next" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Siguiente" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Suivant" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Avanti" + "value" : "Next Outline Item" } }, "ja" : { "stringUnit" : { "state" : "translated", - "value" : "次へ" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Volgende" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Seguinte" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sonraki" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "下一个" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "下一個" + "value" : "次のアウトライン項目" } } } @@ -3292,7 +3468,7 @@ } }, "Outline" : { - "comment" : "accessibility label\ninspector pane title", + "comment" : "inspector pane title\nsection title in inspector", "localizations" : { "cs" : { "stringUnit" : { @@ -3368,6 +3544,29 @@ } } }, + "Outline Menu" : { + "comment" : "accessibility label", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gliederungsmenü" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Outline Menu" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "アウトラインメニュー" + } + } + } + }, "Owner" : { "comment" : "label in document inspector", "localizations" : { @@ -3522,79 +3721,25 @@ } } }, - "Previous" : { - "comment" : "button label", + "Previous Outline Item" : { + "comment" : "accessibility label for button", "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Předchozí" - } - }, "de" : { "stringUnit" : { "state" : "translated", - "value" : "Zurück" + "value" : "Vorheriges Gliederungselement" } }, "en-GB" : { "stringUnit" : { "state" : "translated", - "value" : "Previous" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Anterior" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Précédent" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Precedente" + "value" : "Previous Outline Item" } }, "ja" : { "stringUnit" : { "state" : "translated", - "value" : "前へ" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Vorige" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Anterior" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Önceki" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "上一个" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "上一個" + "value" : "前のアウトライン項目" } } } @@ -3905,6 +4050,160 @@ } } }, + "Split editor" : { + "comment" : "tooltip for button", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Rozdělit editor" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Editor teilen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Split editor" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dividir editor" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Diviser l’éditeur" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dividi editor" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "エディタを分割" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Splits bewerker" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Editor dividido" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Düzenleyiciyi böl" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "分栏显示" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "分欄顯示" + } + } + } + }, + "Split Editor" : { + "comment" : "accessibility label for button", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Rozdělit editor" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Editor teilen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Split Editor" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dividir Editor" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Diviser l’éditeur" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dividi Editor" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "エディタを分割" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Splits bewerker" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Editor Dividido" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Düzenleyiciyi Böl" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "分栏显示" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "分欄顯示" + } + } + } + }, "Status Bar" : { "comment" : "accessibility label", "localizations" : { @@ -3983,6 +4282,7 @@ } }, "Text Encoding" : { + "comment" : "menu item header", "localizations" : { "cs" : { "stringUnit" : { @@ -4135,6 +4435,29 @@ } } }, + "Thank you for your kind support!" : { + "comment" : "message for users who made a donation", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Danke für deine nette Hilfe!" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Thank you for your kind support!" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "サポートありがとう!" + } + } + } + }, "Toolbar.comment.label" : { "extractionState" : "extracted_with_value", "localizations" : { diff --git a/CotEditor/Localizables/Donation.xcstrings b/CotEditor/Localizables/Donation.xcstrings new file mode 100644 index 000000000..b69f3bfc3 --- /dev/null +++ b/CotEditor/Localizables/Donation.xcstrings @@ -0,0 +1,118 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "BadgeType.invisible.label" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Unsichtbarer Kaffee" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Invisible Coffee" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Invisible Coffee" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "透明コーヒー" + } + } + } + }, + "BadgeType.mug.label" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kávový hrnek" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kaffeebecher" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Coffee Mug" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Coffee Mug" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Taza de café" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tasse de café" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tazza di caffè" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "コーヒーマグ" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Koffiekop" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Caneca de Café" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kahve Kupası" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "咖啡杯" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "咖啡杯" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Localizables/DonationSettings.xcstrings b/CotEditor/Localizables/DonationSettings.xcstrings new file mode 100644 index 000000000..65256b952 --- /dev/null +++ b/CotEditor/Localizables/DonationSettings.xcstrings @@ -0,0 +1,528 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "%lld cups" : { + "comment" : "accessibility label for item quantity", + "localizations" : { + "de" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld Tasse" + } + }, + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld Tasse" + } + } + } + } + }, + "en" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld cup" + } + }, + "other" : { + "stringUnit" : { + "state" : "new", + "value" : "%lld cups" + } + } + } + } + }, + "en-GB" : { + "variations" : { + "plural" : { + "one" : { + "stringUnit" : { + "state" : "translated", + "value" : "" + } + }, + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld cups" + } + } + } + } + }, + "ja" : { + "variations" : { + "plural" : { + "other" : { + "stringUnit" : { + "state" : "translated", + "value" : "%lld杯" + } + } + } + } + } + } + }, + "× %lld" : { + "comment" : "multiple sign for the quantity of items to purchase", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "× %lld" + } + } + } + }, + "An internet connection is required to donate." : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Für die Spende ist eine Internetverbindung erforderlich." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "An internet connection is required to donate." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寄付にはインターネット接続が必要です。" + } + } + } + }, + "As a proof of your kind support, a coffee badge appears on the status bar during continuous support." : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Als Beweis für deine freundliche Unterstützung erscheint während des laufenden Unterstützung ein Kaffee-Badge in der Statusleiste." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "As a proof of your kind support, a coffee badge appears on the status bar during continuous support." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寛大なサポートの証として、継続的な寄付の期間中ステータスバーにコーヒーバッジが表示されます。" + } + } + } + }, + "Badge type:" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Badgetyp:" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Badge type:" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "バッジタイプ:" + } + } + } + }, + "Continuous support" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kontinuierliche Unterstützung" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continuous support" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "継続的なサポート" + } + } + } + }, + "CotEditor provides all features for free to everyone. You can support this project by offering coffee." : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "CotEditor bietet alle Funktionen kostenlos für alle. Du kannst dieses Projekt unterstützen, indem du Kaffee spendest." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "CotEditor provides all features for free to everyone. You can support this project by offering coffee." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "CotEditorはすべての人に無償ですべての機能を提供しています。コーヒーを送ることでこのプロジェクトをサポートすることができます。" + } + } + } + }, + "Donation is currently not available." : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spende ist derzeit nicht verfügbar." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Donation is currently not available." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "現在、寄付はできません。" + } + } + } + }, + "Manage subscriptions" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spravovat předplatná" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Abos verwalten" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Manage Subscriptions" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gestionar suscripciones" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gérer les abonnements" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gestisci le iscrizioni" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "サブスクリプションを管理" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Beheer abonnementen" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Gerenciar Assinaturas" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Abonelikleri Yönet" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "管理订阅" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "管理訂閱項目" + } + } + } + }, + "One-time donation" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Einmalige Spende" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "One-off donation" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "1回限りの寄付" + } + } + } + }, + "Open GitHub Sponsors" : { + "comment" : "\"GitHub Sponsors\" is the name of a service by GitHub. Check the official localization if exists.", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "GitHub Sponsors öffnen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open GitHub Sponsors" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "GitHub Sponsosを開く" + } + } + } + }, + "Open in App Store" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Otevřít v App Storu" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Im App Store öffnen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open in App Store" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Abrir en App Store" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ouvrir dans l’App Store" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Apri su App Store" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "App Storeで開く" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open in App Store" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Abrir na App Store" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "App Store’da Aç" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "在App Store中打开" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "在App Store中打開" + } + } + } + }, + "Quantity" : { + "comment" : "accessibility label for item quantity stepper", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Menge" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Quantity" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "個数" + } + } + } + }, + "The donation feature is available only in CotEditor distributed in the App Store." : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Die Spendenfunktion ist nur in CotEditor verfügbar, der im App Store vertrieben wird." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "The donation feature is available only in CotEditor distributed in the App Store." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寄付機能はApp Storeで配布されているCotEditorでのみ有効です。" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Localizables/InAppPurchase.xcstrings b/CotEditor/Localizables/InAppPurchase.xcstrings new file mode 100644 index 000000000..aec193c13 --- /dev/null +++ b/CotEditor/Localizables/InAppPurchase.xcstrings @@ -0,0 +1,230 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "donation.continuous.yearly.description" : { + "extractionState" : "manual", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kaffee für die tägliche Entwicklung" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Coffee for daily development" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Coffee for daily development" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "日々の開発のためのコーヒー" + } + } + } + }, + "donation.continuous.yearly.displayName" : { + "extractionState" : "manual", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kávové boby" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kaffeebohnen" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Coffee Beans" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Coffee Beans" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Granos de café" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Grains de café" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Chicchi di caffè" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "コーヒー豆" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Koffiebonen" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Grãos de Café" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kahve Çekirdekleri" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "咖啡豆" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "咖啡豆" + } + } + } + }, + "donation.onetime.description" : { + "extractionState" : "manual", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Eine köstliche Tasse" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "A tasty cup" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "A tasty cup" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "おいしい1杯" + } + } + } + }, + "donation.onetime.displayName" : { + "extractionState" : "manual", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "エスプレッソ" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espresso" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "浓缩咖啡" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "濃縮咖啡" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Localizables/InfoPlist.xcstrings b/CotEditor/Localizables/InfoPlist.xcstrings index fe09f3e96..768b241b8 100644 --- a/CotEditor/Localizables/InfoPlist.xcstrings +++ b/CotEditor/Localizables/InfoPlist.xcstrings @@ -3605,6 +3605,82 @@ } } }, + "UUID" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "UUID" + } + } + } + }, "Verilog source" : { "localizations" : { "cs" : { diff --git a/CotEditor/Localizables/Localizable.xcstrings b/CotEditor/Localizables/Localizable.xcstrings index 36b084665..6be018b9a 100644 --- a/CotEditor/Localizables/Localizable.xcstrings +++ b/CotEditor/Localizables/Localizable.xcstrings @@ -78,83 +78,6 @@ } } }, - "%@ with BOM" : { - "comment" : "encoding name for UTF-8 with BOM (%@ is the system localized name for UTF-8)", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ s BOM" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ mit BOM" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ with BOM" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ con BOM" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ avec BOM" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ con BOM" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@BOM付き" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : " (%@) met BOM" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ com BOM" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "BOM ile %@" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ with BOM" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "%@ with BOM" - } - } - } - }, "%@:" : { "comment" : "format for control labels followed by a colon", "localizations" : { @@ -5064,83 +4987,6 @@ } } }, - "Space" : { - "comment" : "keyboard key name", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Mezerník" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Leertaste" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Space" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Espacio" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Espace" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Spazio" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "スペース" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Spatie" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Espaço" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Boşluk" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "空格" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "空格" - } - } - } - }, "ThemeImportAlert.button.install" : { "comment" : "button label", "extractionState" : "extracted_with_value", diff --git a/CotEditor/Localizables/MainMenu.xcstrings b/CotEditor/Localizables/MainMenu.xcstrings index 22e9680af..25e59b742 100644 --- a/CotEditor/Localizables/MainMenu.xcstrings +++ b/CotEditor/Localizables/MainMenu.xcstrings @@ -2144,6 +2144,96 @@ } } }, + "Select Column down" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte unten auswählen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column down" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "下の列を選択" + } + } + } + }, + "Select Column Left" : { + "comment" : "vertical orientation version of the Select Column Down command", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte links auswählen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column Left" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "左の列を選択" + } + } + } + }, + "Select Column Right" : { + "comment" : "vertical orientation version of the Select Column Up command", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte rechts auswählen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column Right" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "右の列を選択" + } + } + } + }, + "Select Column Up" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte oben auswählen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column Up" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "上の列を選択" + } + } + } + }, "Shift Left" : { "localizations" : { "cs" : { diff --git a/CotEditor/Localizables/PatternSort.xcstrings b/CotEditor/Localizables/PatternSort.xcstrings index 4d0098a26..7d9b9a313 100644 --- a/CotEditor/Localizables/PatternSort.xcstrings +++ b/CotEditor/Localizables/PatternSort.xcstrings @@ -842,6 +842,7 @@ } }, "Recents" : { + "comment" : "menu header", "localizations" : { "cs" : { "stringUnit" : { diff --git a/CotEditor/Localizables/Settings.xcstrings b/CotEditor/Localizables/Settings.xcstrings index fce6194f2..5e429ccd7 100644 --- a/CotEditor/Localizables/Settings.xcstrings +++ b/CotEditor/Localizables/Settings.xcstrings @@ -84,6 +84,35 @@ } } }, + "SettingsPane.donation.label" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spende" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Donation" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Donation" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寄付" + } + } + } + }, "SettingsPane.edit.label" : { "extractionState" : "extracted_with_value", "localizations" : { diff --git a/CotEditor/Localizables/SnippetsSettings.xcstrings b/CotEditor/Localizables/SnippetsSettings.xcstrings index c76538b7f..24baf3061 100644 --- a/CotEditor/Localizables/SnippetsSettings.xcstrings +++ b/CotEditor/Localizables/SnippetsSettings.xcstrings @@ -1,6 +1,82 @@ { "sourceLanguage" : "en", "strings" : { + "All" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Všechny" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Alle" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "All" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Todo" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Toutes" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tutti" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "すべて" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Alles" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Todas" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tümü" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "全部" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "全部" + } + } + } + }, "Command" : { "comment" : "tab label", "localizations" : { @@ -78,6 +154,160 @@ } } }, + "Description" : { + "comment" : "table column header", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Popis" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Beschreibung" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Description" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Descripción" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Description" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Descrizione" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "説明" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Beschrijving" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Descrição" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Açıklama" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "描述" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "描述" + } + } + } + }, + "Extensions" : { + "comment" : "table column header", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Přípony" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Suffixe" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensions" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensiones" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensions" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Estensioni" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "拡張子" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensies" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensões" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Uzantılar" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "扩展名" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "副檔名" + } + } + } + }, "File Drop" : { "comment" : "tab label", "localizations" : { @@ -155,8 +385,636 @@ } } }, + "File extensions of dropped file (comma separated)." : { + "comment" : "tooltip", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Přípony přetažených souborů (oddělené čárkou)." + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Dateisuffixe der abgelegte Datei (Komma-getrennt)." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "File extensions of dropped file (comma separated)." + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensiones de nombre de archivo del archivo eliminado (separado de comas)." + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensions des fichiers déposés (séparées par une virgule)." + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Estensione dei file rilasciati (valori separati da virgola)." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "ドロップされるファイルの拡張子（カンマ区切り）" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bestandsextensies van neergezet bestand (door komma's gescheiden)." + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Extensões de arquivo do arquivo solto (separadas por vírgulas)." + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bırakılan dosyanın uzantıları (virgülle ayrılmış)." + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "拖拽文件的文件扩展名 (逗号分隔)。" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "拖拽檔案的副檔名 (逗號分隔)。" + } + } + } + }, + "Insert Variable" : { + "comment" : "button label", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vložit proměnnou" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Variable hinzufügen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Insert Variable" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Insertar variable" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Insérer une variable" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Inserisci Variabile" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "変数を挿入" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Voeg variabele in" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Inserir Variável" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Değişken Ekle" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "插入变量" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "插入變數" + } + } + } + }, + "Insertion format:" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Formát vložení:" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Format des einzufügenden Textes:" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Insertion format:" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Insertar formato:" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Format du texte à insérer :" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Formato di inserimento:" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "挿入フォーマット:" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Invoegformaat:" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Formato da inserção:" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ekleme biçimi:" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "按格式插入：" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "按格式插入：" + } + } + } + }, + "Key" : { + "comment" : "table column header", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Zkratka" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Taste" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Key" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Key" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Teclas" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Raccourci" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tasto" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "キー" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sleutel" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Teclas" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Düğme" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "按键" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "按鍵" + } + } + } + }, + "Multiple items selected" : { + "comment" : "placeholder", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vybráno více položek" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mehrere Elemente ausgewählt" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Multiple items selected" + } + }, + "es" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Varios items seleccionados" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Plusieurs éléments sélectionnés" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Elementi multipli selezionati" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "複数の項目が選択されています" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Meerdere items geselecteerd" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Múltiplos itens selecionados" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Birden çok öge seçili" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "选择了多个项" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "選擇了多個條目" + } + } + } + }, + "Name" : { + "comment" : "table column header", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Název" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Name" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Name" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Name" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nombre" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nom" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nome" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "名前" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Naam" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nome" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ad" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "名字" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "名稱" + } + } + } + }, + "No item selected" : { + "comment" : "placeholder", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Není vybrána žádná položka" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Kein Element ausgewählt" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "No item selected" + } + }, + "es" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Nenhum item selecionado" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Aucun élément sélectionné" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nessun elemento selezionato" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "項目が選択されていません" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Geen item geselecteerd" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Nenhum item selecionado" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seçili öge yok" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "未选择任何项" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "未選擇任何條目" + } + } + } + }, + "Restore Defaults" : { + "comment" : "button label", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Výchozí hodnoty" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Standard wiederherstellen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Restore Defaults" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Restaurar valores por omisión" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Réglages par défaut" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ripristina default" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "デフォルトに戻す" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Herstel standaardinstellingen" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Restaurar Padrões" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Saptanmışlara Dön" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "恢复默认" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "回復預設值" + } + } + } + }, "Select a snippet to edit." : { "comment" : "placeholder for insertion format field", + "extractionState" : "stale", "localizations" : { "cs" : { "stringUnit" : { @@ -232,6 +1090,160 @@ } } }, + "Syntax" : { + "comment" : "table column header", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntaxe" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntax" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntax" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sintaxis" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntaxe" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sintassi" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "シンタックス" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Tekst die moet worden ingevoegd via een commando in het menu of via een sneltoets op het toetsenbord:" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sintaxe" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sözdizim" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "语法" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "文法定義" + } + } + } + }, + "Syntax in which this file drop setting is used." : { + "comment" : "tooltip", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntaxe, ve kterém se používá toto nastavení při přetažení souboru." + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntax, in der diese Datei-Drop-Einstellung benutzt wird." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntax in which this file drop setting is used." + } + }, + "es" : { + "stringUnit" : { + "state" : "needs_review", + "value" : "Sintaxis utilizada si se utiliza soltar archivos." + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntaxe pour laquelle cette configuration de fichiers déposés est utilisée." + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sintassi che utilizza le impostazioni del file trascinato nell’editor." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "このファイルドロップ定義を使用するシンタックス" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Syntaxis waarin deze instelling voor het neerzetten van bestanden wordt gebruikt." + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sintaxe na qual essa configuração de soltar arquivo é usada." + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Bu dosya bırakma ayarının etkinleştirildiği sözdizim" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "语法中的文件拖拽设置已启用" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "該檔案拽入設定所使用的文法定義。" + } + } + } + }, "Text to be inserted by a command in the menu or by keyboard shortcut:" : { "localizations" : { "cs" : { diff --git a/CotEditor/Localizables/WhatsNew.xcstrings b/CotEditor/Localizables/WhatsNew.xcstrings new file mode 100644 index 000000000..55d8cb93a --- /dev/null +++ b/CotEditor/Localizables/WhatsNew.xcstrings @@ -0,0 +1,287 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "(Available only in the App Store version)" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "(Nur auf der App Store version verfügbar)" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "(Available only in the App Store version)" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "（App Store版でのみ有効）" + } + } + } + }, + "Complete release notes" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vollständige Versionshinweise" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Complete release notes" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "完全なリリースノートp" + } + } + } + }, + "Continue" : { + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Pokračovat" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Fortfahren" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continue" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continuar" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continuer" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continua" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "続ける" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ga door" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Continuar" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sürdür" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "继续" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "繼續" + } + } + } + }, + "NewFeature.donation.description" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Anbieten von Kaffee für Entwickler zur Unterstützung des CotEditor-Projektes" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Support the CotEditor project by offering coffee to the developer." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Support the CotEditor project by offering coffee to the developer." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "開発者にコーヒーを送ってCotEditorプロジェクトをサポート。" + } + } + } + }, + "NewFeature.donation.label" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spende" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Donation" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Donation" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寄付" + } + } + } + }, + "NewFeature.macOSSupport.description" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mit dem neuen macOS 15 perfekt funktionieren." + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Work perfectly with new macOS 15." + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Work perfectly with new macOS 15." + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "新しいmacOSを完全にサポートしています。" + } + } + } + }, + "NewFeature.macOSSupport.label" : { + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Unterstützung für macOS 15 Sequoia" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "macOS 15 Sequoia Support" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "macOS 15 Sequoia Support" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "macOS 15 Sequoiaサポート" + } + } + } + }, + "Open Donation Settings" : { + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spende-Einstellungen öffnen" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Open Donation Settings" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "寄付設定を開く" + } + } + } + }, + "What’s New in **CotEditor %@**" : { + "comment" : "%@ is version number", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Neue Funktionen in CotEditor **%@**" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "What’s New in **CotEditor %@**" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "**CotEditor %@**の新機能" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Sources/AboutView.swift b/CotEditor/Sources/AboutView.swift index a6745aefc..4b93432f2 100644 --- a/CotEditor/Sources/AboutView.swift +++ b/CotEditor/Sources/AboutView.swift @@ -50,7 +50,7 @@ struct AboutView: View { var body: some View { - HStack { + HStack(spacing: 0) { VStack(spacing: 6) { Image(nsImage: NSApp.applicationIconImage) Text(Bundle.main.bundleName) @@ -74,6 +74,8 @@ struct AboutView: View { .padding(.trailing) .frame(minWidth: 200) + Divider() + VStack(spacing: 0) { HStack { ForEach(Pane.allCases, id: \.self) { pane in @@ -96,11 +98,11 @@ struct AboutView: View { } } } - .ignoresSafeArea() .background() } .accessibilityLabel(String(localized: "About \(Bundle.main.bundleName)", table: "About", comment: "accessibility label (%@ is app name)")) .controlSize(.small) + .ignoresSafeArea() .frame(width: 540, height: 300) } } @@ -204,6 +206,7 @@ private struct CreditsView: View { SectionView(String(localized: "Code Contributors", table: "About", comment: "section heading")) { Text(self.credits.contributors.map(\.name).sorted(options: [.caseInsensitive, .localized]), format: .list(type: .and)) + .textSelection(.enabled) } SectionView(String(localized: "Special Thanks", table: "About", comment: "section heading")) { @@ -226,6 +229,7 @@ private struct CreditsView: View { .foregroundStyle(.tertiary) Text("CotEditor is an open source program\nlicensed under the Apache License, Version 2.0.", tableName: "About") + .textSelection(.enabled) Link(String("https://github.com/coteditor"), destination: URL(string: "https://github.com/coteditor")!) .foregroundStyle(.tint) @@ -251,7 +255,7 @@ private struct CreditsView: View { var content: () -> Content - init(_ label: String, content: @escaping () -> Content) { + init(_ label: String, @ViewBuilder content: @escaping () -> Content) { self.label = label self.content = content @@ -307,9 +311,6 @@ private struct LicenseView: View { ItemView(name: "WFColorCode", url: "https://github.com/1024jp/WFColorCode", license: "MIT license") - ItemView(name: "Solarized", - url: "https://ethanschoonover.com/solarized", - license: "MIT license") #if SPARKLE ItemView(name: "Sparkle", url: "https://github.com/jpsim/Yams", @@ -361,7 +362,7 @@ private struct LicenseView: View { guard let url = Bundle.main.url(forResource: self.name, withExtension: "txt", subdirectory: "Licenses"), - let string = try? String(contentsOf: url) + let string = try? String(contentsOf: url, encoding: .utf8) else { return assertionFailure() } self.content = string diff --git a/CotEditor/Sources/ActionCommand.swift b/CotEditor/Sources/ActionCommand.swift index b07599f80..47819ffa1 100644 --- a/CotEditor/Sources/ActionCommand.swift +++ b/CotEditor/Sources/ActionCommand.swift @@ -24,6 +24,7 @@ // import AppKit +import Shortcut extension Selector: @unchecked Sendable { } diff --git a/CotEditor/Sources/AddRemoveButton.swift b/CotEditor/Sources/AddRemoveButton.swift index 67ceaf392..c155c0f76 100644 --- a/CotEditor/Sources/AddRemoveButton.swift +++ b/CotEditor/Sources/AddRemoveButton.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,13 +25,7 @@ import SwiftUI -protocol EmptyInitializable { - - init() -} - - -struct AddRemoveButton: View { +struct AddRemoveButton: View { @Binding private var items: [Item] @Binding private var selection: Set @@ -39,6 +33,8 @@ struct AddRemoveButton: View { private var focus: FocusState.Binding? @State private var added: Item.ID? + private var newItem: () -> Item + /// Creates a segmented add/remove control. /// @@ -46,11 +42,13 @@ struct AddRemoveButton: View { /// - items: The identifiable data array where adding/removing items. /// - selection: A binding to a set that identifies selected items IDs. /// - focus: A binding to the focus state in the window. - init(_ items: Binding<[Item]>, selection: Binding>, focus: FocusState.Binding? = nil) { + /// - newItem: A closure to return an item for when adding a new item from the button. + init(_ items: Binding<[Item]>, selection: Binding>, focus: FocusState.Binding? = nil, newItem: @escaping () -> Item) { self._items = items self._selection = selection self.focus = focus + self.newItem = newItem } @@ -58,7 +56,7 @@ struct AddRemoveButton: View { ControlGroup { Button(String(localized: "Add", table: "AddRemoveButton", comment: "button label"), systemImage: "plus") { - let item = Item() + let item = self.newItem() let index = self.items.lastIndex { self.selection.contains($0.id) } ?? self.items.endIndex - 1 self.selection.removeAll() @@ -69,7 +67,7 @@ struct AddRemoveButton: View { self.selection = [item.id] } } - .onChange(of: self.added) { newValue in + .onChange(of: self.added) { (_, newValue) in self.focus?.wrappedValue = newValue } .help(String(localized: "Add new item", table: "AddRemoveButton", comment: "tooltip")) diff --git a/CotEditor/Sources/AdvancedCharacterCounter.swift b/CotEditor/Sources/AdvancedCharacterCounter.swift index a74c8a605..a5067ddb9 100644 --- a/CotEditor/Sources/AdvancedCharacterCounter.swift +++ b/CotEditor/Sources/AdvancedCharacterCounter.swift @@ -24,15 +24,16 @@ // import AppKit +import Observation import Combine -import SwiftUI +import Defaults -@MainActor final class AdvancedCharacterCounter: ObservableObject { +@MainActor @Observable final class AdvancedCharacterCounter { // MARK: Public Properties - @Published private(set) var entireCount: Int? = 0 - @Published private(set) var selectionCount: Int? = 0 + private(set) var entireCount: Int? = 0 + private(set) var selectionCount: Int? = 0 // MARK: Private Properties diff --git a/CotEditor/Sources/AdvancedCharacterCounterView.swift b/CotEditor/Sources/AdvancedCharacterCounterView.swift index 7ba787648..30c14ed5b 100644 --- a/CotEditor/Sources/AdvancedCharacterCounterView.swift +++ b/CotEditor/Sources/AdvancedCharacterCounterView.swift @@ -24,10 +24,11 @@ // import SwiftUI +import Defaults struct AdvancedCharacterCounterView: View { - @StateObject var counter: AdvancedCharacterCounter + @State var counter: AdvancedCharacterCounter let dismissAction: () -> Void @AppStorage(.countUnit) private var unit: CharacterCountOptions.CharacterUnit @@ -63,20 +64,18 @@ struct AdvancedCharacterCounterView: View { Spacer() - Button { + Button(String(localized: "Show options", table: "AdvancedCharacterCount"), systemImage: "gearshape") { self.isSettingPresented.toggle() - } label: { - Image(systemName: "gearshape") - .symbolVariant(.fill) - .accessibilityLabel(String(localized: "Show options", table: "AdvancedCharacterCount")) } + .symbolVariant(.fill) .buttonStyle(.plain) .foregroundStyle(.secondary) + .labelStyle(.iconOnly) .help(String(localized: "Show options", table: "AdvancedCharacterCount", comment: "tooltip")) .popover(isPresented: self.$isSettingPresented) { VStack { CharacterCountOptionsView() - HelpButton(anchor: "howto_count_characters") + HelpLink(anchor: "howto_count_characters") .frame(maxWidth: .infinity, alignment: .trailing) }.padding() } diff --git a/CotEditor/Sources/AntialiasingText.swift b/CotEditor/Sources/AntialiasingText.swift index 7821a17b0..78d89191e 100644 --- a/CotEditor/Sources/AntialiasingText.swift +++ b/CotEditor/Sources/AntialiasingText.swift @@ -144,7 +144,6 @@ private final class CenteringTextFieldCell: NSTextFieldCell { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 200, height: 400)) { VStack { AntialiasingText("Antialias Text") diff --git a/CotEditor/Sources/AppDelegate.swift b/CotEditor/Sources/AppDelegate.swift index b50b1e698..7d2de18f0 100644 --- a/CotEditor/Sources/AppDelegate.swift +++ b/CotEditor/Sources/AppDelegate.swift @@ -29,12 +29,10 @@ import SwiftUI import Combine import UniformTypeIdentifiers import OSLog +import Defaults +import UnicodeNormalization -extension Notification.Name: @unchecked Sendable { } - -// Logger should be Sendable. (2024-04, macOS 14.3, Xcode 15.3) -// cf. https://forums.developer.apple.com/forums/thread/747816 -extension Logger: @unchecked Sendable { } +extension KeyPath: @retroactive @unchecked Sendable { } extension Logger { @@ -44,7 +42,7 @@ extension Logger { private extension NSSound { - static let glass = NSSound(named: "Glass") + @MainActor static let glass = NSSound(named: "Glass") } @@ -79,7 +77,7 @@ private enum BundleIdentifier { private var menuUpdateObservers: Set = [] private lazy var aboutPanel = NSPanel(contentViewController: NSHostingController(rootView: AboutView())) - private lazy var settingsWindowController = SettingsWindowController() + private lazy var whatsNewPanel = NSPanel(contentViewController: NSHostingController(rootView: WhatsNewView())) @IBOutlet private weak var encodingsMenu: NSMenu? @IBOutlet private weak var syntaxesMenu: NSMenu? @@ -87,6 +85,7 @@ private enum BundleIdentifier { @IBOutlet private weak var themesMenu: NSMenu? @IBOutlet private weak var normalizationMenu: NSMenu? @IBOutlet private weak var snippetMenu: NSMenu? + @IBOutlet private weak var multipleReplaceMenu: NSMenu? #if DEBUG @@ -123,11 +122,13 @@ private enum BundleIdentifier { self.menuUpdateObservers.removeAll() // sync menus with setting list updates - EncodingManager.shared.$fileEncodings - .receive(on: RunLoop.main) - .map(\.menuItems) - .assign(to: \.items, on: self.encodingsMenu!) - .store(in: &self.menuUpdateObservers) + withContinuousObservationTracking(initial: true) { + _ = EncodingManager.shared.fileEncodings + } onChange: { + Task { @MainActor in + self.encodingsMenu?.items = EncodingManager.shared.fileEncodings.map(\.menuItem) + } + } self.lineEndingsMenu?.items = LineEnding.allCases.map { lineEnding in let item = NSMenuItem() @@ -189,19 +190,34 @@ private enum BundleIdentifier { item.toolTip = form.localizedDescription return item } + + // build multiple replacement menu items + withContinuousObservationTracking(initial: true) { + _ = ReplacementManager.shared.settingNames + } onChange: { + Task { @MainActor in + guard let menu = self.multipleReplaceMenu else { return } + + let manageItem = menu.items.last + menu.items = ReplacementManager.shared.settingNames.map { + let item = NSMenuItem() + item.title = $0 + item.action = #selector(NSTextView.performTextFinderAction) + item.tag = TextFinder.Action.multipleReplace.rawValue + item.representedObject = $0 + return item + } + [ + .separator(), + manageItem!, + ] + } + } } // MARK: Application Delegate - @available(macOS, deprecated: 14, message: "The secure restoration became automatically enabled on macOS 14 and later.") - func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { - - true - } - - func applicationWillFinishLaunching(_ notification: Notification) { ProcessInfo.processInfo.automaticTerminationSupportEnabled = true @@ -220,6 +236,11 @@ private enum BundleIdentifier { NSApp.servicesProvider = ServicesProvider() NSTouchBar.isAutomaticCustomizeTouchBarMenuItemEnabled = true + + // Show What's New panel for CotEditor 4.9.0 + if let lastVersion = UserDefaults.standard[.lastVersion].flatMap(Int.init), lastVersion <= 650 { + self.showWhatsNew(nil) + } } @@ -328,11 +349,7 @@ private enum BundleIdentifier { /// Activates self and perform New menu action (from Dock menu). @IBAction func newDocumentActivatingApplication(_ sender: Any?) { - if #available(macOS 14, *) { - NSApp.activate() - } else { - NSApp.activate(ignoringOtherApps: true) - } + NSApp.activate() NSDocumentController.shared.newDocument(sender) } @@ -353,10 +370,26 @@ private enum BundleIdentifier { } + /// Shows the What's New panel. + @IBAction func showWhatsNew(_ sender: Any?) { + + // initialize panel settings + if !self.whatsNewPanel.styleMask.contains(.fullSizeContentView) { + self.whatsNewPanel.styleMask = [.closable, .titled, .fullSizeContentView] + self.whatsNewPanel.titleVisibility = .hidden + self.whatsNewPanel.titlebarAppearsTransparent = true + self.whatsNewPanel.hidesOnDeactivate = false + self.whatsNewPanel.becomesKeyOnlyIfNeeded = true + } + + self.whatsNewPanel.makeKeyAndOrderFront(sender) + } + + /// Shows the Settings window. @IBAction func showSettingsWindow(_ sender: Any?) { - self.settingsWindowController.showWindow(sender) + SettingsWindowController.shared.showWindow(sender) } @@ -370,7 +403,7 @@ private enum BundleIdentifier { /// Shows Snippet pane in the Settings window. @IBAction func showSnippetEditor(_ sender: Any?) { - self.settingsWindowController.openPane(.snippets) + SettingsWindowController.shared.openPane(.snippets) } diff --git a/CotEditor/Sources/AppearanceSettingsView.swift b/CotEditor/Sources/AppearanceSettingsView.swift index fd456d311..1ce9e26d4 100644 --- a/CotEditor/Sources/AppearanceSettingsView.swift +++ b/CotEditor/Sources/AppearanceSettingsView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct AppearanceSettingsView: View { @@ -64,7 +65,7 @@ struct AppearanceSettingsView: View { .accessibilityLabeledPair(role: .label, id: "monospacedFont", in: self.accessibility) FontSettingView(data: $monospacedFont, fallback: FontType.monospaced.systemFont(), antialias: $monospacedShouldAntialias, ligature: $monospacedLigature) - .onChange(of: self.monospacedFont) { [oldValue = self.monospacedFont] newValue in + .onChange(of: self.monospacedFont) { (oldValue, newValue) in guard let newValue, let font = NSFont(archivedData: newValue), @@ -145,7 +146,7 @@ struct AppearanceSettingsView: View { HStack { Spacer() - HelpButton(anchor: "settings_appearance") + HelpLink(anchor: "settings_appearance") } } .scenePadding() @@ -198,22 +199,6 @@ private struct FontSettingView: View { } -private struct ThemeView: NSViewControllerRepresentable { - - typealias NSViewControllerType = ThemeViewController - - - func makeNSViewController(context: Context) -> ThemeViewController { - - NSStoryboard(name: "ThemeView", bundle: nil).instantiateInitialController()! - } - - func updateNSViewController(_ nsViewController: ThemeViewController, context: Context) { - - } -} - - private extension AppearanceMode { var label: String { @@ -243,9 +228,10 @@ private extension AppearanceMode { AppearanceSettingsView() } +@available(macOS 15, *) #Preview("FontSettingView") { - @State var antialias = false - @State var ligature = false + @Previewable @State var antialias = false + @Previewable @State var ligature = false return FontSettingView(data: .constant(Data()), fallback: .systemFont(ofSize: 0), antialias: $antialias, ligature: $ligature) .padding() diff --git a/CotEditor/Sources/AppleScript.swift b/CotEditor/Sources/AppleScript.swift index e3efc4b68..6a6f1e8fa 100644 --- a/CotEditor/Sources/AppleScript.swift +++ b/CotEditor/Sources/AppleScript.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import Foundation +import Shortcut struct AppleScript: EventScript { diff --git a/CotEditor/Sources/BidiScrollView.swift b/CotEditor/Sources/BidiScrollView.swift index 9ea93d657..820df5539 100644 --- a/CotEditor/Sources/BidiScrollView.swift +++ b/CotEditor/Sources/BidiScrollView.swift @@ -77,7 +77,7 @@ final class BidiScrollView: NSScrollView { -extension NSEdgeInsets: Equatable { +extension NSEdgeInsets: @retroactive Equatable { static let zero = NSEdgeInsetsZero diff --git a/CotEditor/Sources/Binding.swift b/CotEditor/Sources/Binding.swift index 2f165aa30..5b75736cd 100644 --- a/CotEditor/Sources/Binding.swift +++ b/CotEditor/Sources/Binding.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import SwiftUI // MARK: OptionSet -extension Binding where Value: OptionSet { +extension Binding where Value: OptionSet, Value.Element: Sendable { /// Enables binding to an option using Bool. /// @@ -53,7 +53,7 @@ extension Binding where Value: OptionSet { // MARK: Optional Binding -func ?? (lhs: Binding, rhs: T) -> Binding { +func ?? (lhs: Binding, rhs: T) -> Binding { Binding( get: { lhs.wrappedValue ?? rhs }, diff --git a/CotEditor/Sources/BracePair.swift b/CotEditor/Sources/BracePair.swift new file mode 100644 index 000000000..68022367c --- /dev/null +++ b/CotEditor/Sources/BracePair.swift @@ -0,0 +1,305 @@ +// +// BracePair.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-28. +// +// --------------------------------------------------------------------------- +// +// © 2022-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +typealias BracePair = Pair + +extension Pair where T == Character { + + static let braces: [BracePair] = [BracePair("(", ")"), + BracePair("{", "}"), + BracePair("[", "]")] + static let ltgt = BracePair("<", ">") + static let doubleQuotes = BracePair("\"", "\"") + + + enum PairIndex { + + case begin(String.Index) + case end(String.Index) + case odd + } +} + + +extension StringProtocol { + + /// Finds the range enclosed by one of given brace pairs. + /// + /// - Note: Escaping character by `\` is not considered. + /// + /// - Parameters: + /// - range: The character range on which to base the search. + /// - candidates: The pairs of symbols to search. + /// - Returns: The range of the enclosing brace pair, or `nil` if not found. + func rangeOfEnclosingBracePair(at range: Range, candidates: [BracePair]) -> Range? { + + BracePairScanner(string: String(self), candidates: candidates, baseRange: range).scan() + } + + + /// Finds the mate of a brace pair. + /// + /// - Parameters: + /// - index: The character index of the brace character to find the mate. + /// - candidates: Brace pairs to find. + /// - range: The range of characters to find in. + /// - pairToIgnore: The brace pair in which brace characters should be ignored. + /// - Returns: The character index of the matched pair. + func indexOfBracePair(at index: Index, candidates: [BracePair], in range: Range? = nil, ignoring pairToIgnore: BracePair? = nil) -> BracePair.PairIndex? { + + guard !self.isCharacterEscaped(at: index) else { return nil } + + let character = self[index] + + guard let pair = candidates.first(where: { $0.begin == character || $0.end == character }) else { return nil } + + switch character { + case pair.begin: + guard let endIndex = self.indexOfBracePair(beginIndex: index, pair: pair, until: range?.upperBound, ignoring: pairToIgnore) else { return .odd } + return .end(endIndex) + + case pair.end: + guard let beginIndex = self.indexOfBracePair(endIndex: index, pair: pair, until: range?.lowerBound, ignoring: pairToIgnore) else { return .odd } + return .begin(beginIndex) + + default: preconditionFailure() + } + } + + + /// Finds character index of matched opening brace before a given index. + /// + /// This method ignores escaped characters. + /// + /// - Parameters: + /// - endIndex: The character index of the closing brace of the pair to find. + /// - pair: The brace pair to find. + /// - beginIndex: The lower boundary of the find range. + /// - pairToIgnore: The brace pair in which brace characters should be ignored. + /// - Returns: The character index of the matched opening brace, or `nil` if not found. + func indexOfBracePair(endIndex: Index, pair: BracePair, until beginIndex: Index? = nil, ignoring pairToIgnore: BracePair? = nil) -> Index? { + + assert(endIndex <= self.endIndex) + + let beginIndex = beginIndex ?? self.startIndex + + guard beginIndex < endIndex else { return nil } + + var index = endIndex + var nestDepth = 0 + var ignoredNestDepth = 0 + + while index > beginIndex { + index = self.index(before: index) + + switch self[index] { + case pair.begin where ignoredNestDepth == 0: + guard !self.isCharacterEscaped(at: index) else { continue } + if nestDepth == 0 { return index } // found + nestDepth -= 1 + + case pair.end where ignoredNestDepth == 0: + guard !self.isCharacterEscaped(at: index) else { continue } + nestDepth += 1 + + case pairToIgnore?.begin: + guard !self.isCharacterEscaped(at: index) else { continue } + ignoredNestDepth -= 1 + + case pairToIgnore?.end: + guard !self.isCharacterEscaped(at: index) else { continue } + ignoredNestDepth += 1 + + default: break + } + } + + return nil + } + + + /// Finds character index of matched closing brace after a given index. + /// + /// This method ignores escaped characters. + /// + /// - Parameters: + /// - beginIndex: The character index of the opening brace of the pair to find. + /// - pair: The brace pair to find. + /// - endIndex: The upper boundary of the find range. + /// - pairToIgnore: The brace pair in which brace characters should be ignored. + /// - Returns: The character index of the matched closing brace, or `nil` if not found. + func indexOfBracePair(beginIndex: Index, pair: BracePair, until endIndex: Index? = nil, ignoring pairToIgnore: BracePair? = nil) -> Index? { + + assert(beginIndex >= self.startIndex) + + // avoid (endIndex == self.startIndex) + guard !self.isEmpty, endIndex.flatMap({ $0 > self.startIndex }) != false else { return nil } + + let endIndex = self.index(before: endIndex ?? self.endIndex) + + guard beginIndex < endIndex else { return nil } + + var index = beginIndex + var nestDepth = 0 + var ignoredNestDepth = 0 + + while index < endIndex { + index = self.index(after: index) + + switch self[index] { + case pair.end where ignoredNestDepth == 0: + guard !self.isCharacterEscaped(at: index) else { continue } + if nestDepth == 0 { return index } // found + nestDepth -= 1 + + case pair.begin where ignoredNestDepth == 0: + guard !self.isCharacterEscaped(at: index) else { continue } + nestDepth += 1 + + case pairToIgnore?.end: + guard !self.isCharacterEscaped(at: index) else { continue } + ignoredNestDepth -= 1 + + case pairToIgnore?.begin: + guard !self.isCharacterEscaped(at: index) else { continue } + ignoredNestDepth += 1 + + default: break + } + } + + return nil + } +} + + +// MARK: - + +private final class BracePairScanner { + + let string: String + let candidates: [BracePair] + + private var scanningRange: Range + private var scanningPair: BracePair? + private var finished: Bool = false + private var found: Bool = false + + + init(string: String, candidates: [BracePair], baseRange: Range) { + + assert(candidates.allSatisfy({ $0.begin != $0.end })) + + self.string = string + self.candidates = candidates + self.scanningRange = baseRange + } + + + // MARK: Public Methods + + func scan() -> Range? { + + while !self.finished { + self.scanForward() + + guard !self.finished else { return nil } + + self.scanBackward() + } + + return self.found ? self.scanningRange : nil + } + + + // MARK: Private Methods + + private func scanForward() { + + var index = self.scanningRange.upperBound + var nestDepths: [BracePair: Int] = [:] + var isEscaped = (index != self.string.startIndex) && self.string[self.string.index(before: index)] == "\\" + + for character in self.string[index...] { + index = self.string.index(after: index) + + guard !isEscaped else { continue } + + if let pair = self.candidates.first(where: { $0.begin == character }) { + nestDepths[pair, default: 0] += 1 + + } else if let pair = self.candidates.first(where: { $0.end == character }) { + if nestDepths[pair, default: 0] > 0 { + nestDepths[pair, default: 0] -= 1 + } else { + self.scanningRange = self.scanningRange.lowerBound.. 0 { + nestDepths[pair, default: 0] -= 1 + } else { + self.finished = true + self.found = true + self.scanningRange = index.. CSVFormatStyle { + + return CSVFormatStyle(separator: separator, omittingEmptyItems: omittingEmptyItems) + } +} + + +struct CSVFormatStyle: Codable { + + var separator: String = "," + var omittingEmptyItems: Bool = false +} + + +extension CSVFormatStyle: FormatStyle { + + typealias FormatInput = [String] + typealias FormatOutput = String + + + func format(_ value: [String]) -> String { + + value + .filter { !self.omittingEmptyItems || !$0.isEmpty } + .joined(separator: self.separator + " ") + } +} + + +extension CSVFormatStyle: ParseableFormatStyle { + + typealias Strategy = CSVParseStrategy + + + struct CSVParseStrategy: ParseStrategy { + + var style: CSVFormatStyle + + + func parse(_ value: String) throws -> [String] { + + value.split(separator: self.style.separator, omittingEmptySubsequences: self.style.omittingEmptyItems) + .map { $0.trimmingCharacters(in: .whitespaces) } + } + } + + + var parseStrategy: CSVParseStrategy { + + CSVParseStrategy(style: self) + } +} diff --git a/CotEditor/Sources/CapsuleButtonStyle.swift b/CotEditor/Sources/CapsuleButtonStyle.swift new file mode 100644 index 000000000..69e26e7ea --- /dev/null +++ b/CotEditor/Sources/CapsuleButtonStyle.swift @@ -0,0 +1,56 @@ +// +// CapsuleButtonStyle.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-10. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import SwiftUI + +extension ButtonStyle where Self == CapsuleButtonStyle { + + static var capsule: Self { Self() } +} + + +struct CapsuleButtonStyle: ButtonStyle { + + func makeBody(configuration: Configuration) -> some View { + + configuration.label + .foregroundStyle(.tint) + .brightness(configuration.isPressed ? -0.2 : 0) + .padding(.vertical, 2) + .padding(.horizontal, 10) + .background(.fill.tertiary, in: Capsule()) + } +} + + +// MARK: - Preview + +#Preview { + VStack { + Button(String("Dog")) { } + } + .buttonStyle(.capsule) + .scenePadding() +} diff --git a/CotEditor/Sources/CharacterCountOptionsSheetView.swift b/CotEditor/Sources/CharacterCountOptionsSheetView.swift index 4c86d23a3..abe62d8d7 100644 --- a/CotEditor/Sources/CharacterCountOptionsSheetView.swift +++ b/CotEditor/Sources/CharacterCountOptionsSheetView.swift @@ -40,7 +40,7 @@ struct CharacterCountOptionsSheetView: View { CharacterCountOptionsView() HStack { - HelpButton(anchor: "howto_count_characters") + HelpLink(anchor: "howto_count_characters") Spacer() diff --git a/CotEditor/Sources/CharacterCountOptionsView.swift b/CotEditor/Sources/CharacterCountOptionsView.swift index f37e5b571..a69765610 100644 --- a/CotEditor/Sources/CharacterCountOptionsView.swift +++ b/CotEditor/Sources/CharacterCountOptionsView.swift @@ -24,6 +24,20 @@ // import SwiftUI +import Defaults +import UnicodeNormalization + +extension UnicodeNormalizationForm: @retroactive DefaultInitializable { + + public static let defaultValue: Self = .nfc +} + + +extension CharacterCountOptions.CharacterUnit: DefaultInitializable { + + static let defaultValue: Self = .graphemeCluster +} + struct CharacterCountOptionsView: View { diff --git a/CotEditor/Sources/CharacterInfo.swift b/CotEditor/Sources/CharacterInfo.swift deleted file mode 100644 index f0df8443f..000000000 --- a/CotEditor/Sources/CharacterInfo.swift +++ /dev/null @@ -1,176 +0,0 @@ -// -// CharacterInfo.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2015-11-19. -// -// --------------------------------------------------------------------------- -// -// © 2015-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -private enum EmojiVariationSelector: UInt32 { - - case text = 0xFE0E - case emoji = 0xFE0F - - - var label: String { - - switch self { - case .emoji: - String(localized: "EmojiVariationSelector.emoji.label", - defaultValue: "Emoji Style", - table: "Character", - comment: "label for the Unicode variation selector that forces to draw the character in the emoji style") - case .text: - String(localized: "EmojiVariationSelector.text.label", - defaultValue: "Text Style", - table: "Character", - comment: "label for the Unicode variation selector that forces to draw the character in the text style") - } - } -} - - -private enum SkinToneModifier: UInt32 { - - case type12 = 0x1F3FB // 🏻 Light - case type3 = 0x1F3FC // 🏼 Medium Light - case type4 = 0x1F3FD // 🏽 Medium - case type5 = 0x1F3FE // 🏾 Medium Dark - case type6 = 0x1F3FF // 🏿 Dark - - - var label: String { - - switch self { - case .type12: - String(localized: "SkinToneModifier.type12.label", - defaultValue: "Skin Tone I-II", - table: "Character", - comment: "label for Unicode emoji modifier applying the skin tone to the character") - case .type3: - String(localized: "SkinToneModifier.type3.label", - defaultValue: "Skin Tone III", - table: "Character", - comment: "label for Unicode emoji modifier applying the skin tone to the character") - case .type4: - String(localized: "SkinToneModifier.type4.label", - defaultValue: "Skin Tone IV", - table: "Character", - comment: "label for Unicode emoji modifier applying the skin tone to the character") - case .type5: - String(localized: "SkinToneModifier.type5.label", - defaultValue: "Skin Tone V", - table: "Character", - comment: "label for Unicode emoji modifier applying the skin tone to the character") - case .type6: - String(localized: "SkinToneModifier.type6.label", - defaultValue: "Skin Tone VI", - table: "Character", - comment: "label for Unicode emoji modifier applying the skin tone to the character") - } - } -} - - - -// MARK: - - -struct CharacterInfo { - - // MARK: Public Properties - - var character: Character - - - // MARK: Public Methods - - var localizedDescription: String? { - - let unicodes = self.character.unicodeScalars - if self.isComplex { - return String(localized: "", - table: "Character", - comment: "%lld is always 2 or more.") - } - - guard var unicodeName = unicodes.first?.name else { return nil } - - if self.isVariant, let variantDescription = unicodes.last?.variantDescription { - unicodeName += String(localized: " (\(variantDescription))") - } - - return unicodeName - } - - - var pictureCharacter: Character? { - - self.character.unicodeScalars.count == 1 // ignore CRLF - ? self.character.unicodeScalars.first?.pictureRepresentation.flatMap(Character.init) - : nil - } - - - var isComplex: Bool { - - self.character.unicodeScalars.count > 1 && !self.isVariant - } - - - // MARK: Private Methods - - private var isVariant: Bool { - - (self.character.unicodeScalars.count == 2 && - self.character.unicodeScalars.last?.variantDescription != nil) - } -} - - - -extension CharacterInfo: CustomStringConvertible { - - var description: String { - - String(self.character) - } -} - - -private extension Unicode.Scalar { - - var variantDescription: String? { - - if let selector = EmojiVariationSelector(rawValue: self.value) { - selector.label - - } else if let modifier = SkinToneModifier(rawValue: self.value) { - modifier.label - - } else if self.properties.isVariationSelector { - String(localized: "Variant", - table: "Character", - comment: "label for general Unicode variation selectors") - - } else { - nil - } - } -} diff --git a/CotEditor/Sources/CharacterInspectorView.swift b/CotEditor/Sources/CharacterInspectorView.swift index 89102197f..3d6b83679 100644 --- a/CotEditor/Sources/CharacterInspectorView.swift +++ b/CotEditor/Sources/CharacterInspectorView.swift @@ -23,6 +23,7 @@ // limitations under the License. // +import CharacterInfo import SwiftUI struct CharacterInspectorView: View { @@ -54,7 +55,6 @@ private struct CharacterDetailView: View { if let description = self.info.localizedDescription { Text(description) .fontWeight(self.info.isComplex ? .regular : .semibold) - .foregroundColor(.label) // Workaround to keep text color when selected (2022-12, macOS 13, FB10747746, fixed on macOS 14). .textSelection(.enabled) } else { Text("Unknown", tableName: "CharacterInspector") @@ -91,7 +91,6 @@ private struct CharacterDetailView: View { } } .controlSize(.small) - .foregroundColor(.label) .textSelection(.enabled) } }.fixedSize() @@ -141,7 +140,6 @@ private struct ScalarDetailView: View { } } .monospacedDigit() - .foregroundColor(.label) .textSelection(.enabled) .accessibilityLabeledPair(role: .content, id: "codePoint", in: self.accessibility) } @@ -156,7 +154,6 @@ private struct ScalarDetailView: View { Group { if let blockName = self.scalar.localizedBlockName { Text(blockName) - .foregroundColor(.label) .textSelection(.enabled) } else { Text("No Block", tableName: "CharacterInspector") @@ -174,7 +171,6 @@ private struct ScalarDetailView: View { let category = self.scalar.properties.generalCategory Text(verbatim: "\(category.longName) (\(category.shortName))") - .foregroundColor(.label) .textSelection(.enabled) .accessibilityLabeledPair(role: .content, id: "category", in: self.accessibility) } @@ -242,6 +238,28 @@ private struct DeprecatedBadge: View { } +private extension CharacterInfo { + + var localizedDescription: String? { + + let unicodes = self.character.unicodeScalars + if self.isComplex { + return String(localized: "", + table: "CharacterInspector", + comment: "%lld is always 2 or more.") + } + + guard var unicodeName = unicodes.first?.name else { return nil } + + if self.isVariant, let variantDescription = unicodes.last?.variantDescription { + unicodeName += String(localized: " (\(variantDescription))") + } + + return unicodeName + } +} + + // MARK: - Preview diff --git a/CotEditor/Sources/Collection+String.swift b/CotEditor/Sources/Collection+String.swift index 63a6c1d19..1172a9c85 100644 --- a/CotEditor/Sources/Collection+String.swift +++ b/CotEditor/Sources/Collection+String.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2023 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -109,45 +109,3 @@ private func compareFunction(options: StringComparisonOptions) -> (String, Strin fatalError() } } - - - -// MARK: - Filename - -extension Collection { - - /// Creates a unique name from the receiver's elements by adding the suffix and also a number if needed. - /// - /// - Parameters: - /// - proposedName: The name candidate. - /// - suffix: The name suffix to be appended before the number. - /// - Returns: An unique name. - func createAvailableName(for proposedName: String, suffix: String? = nil) -> String { - - let spaceSuffix = suffix.flatMap { " " + $0 } ?? "" - - let (rootName, baseCount): (String, Int?) = { - let suffixPattern = NSRegularExpression.escapedPattern(for: spaceSuffix) - let regex = try! NSRegularExpression(pattern: suffixPattern + "(?: ([0-9]+))?$") - - guard let result = regex.firstMatch(in: proposedName, range: proposedName.nsRange) else { return (proposedName, nil) } - - let root = (proposedName as NSString).substring(to: result.range.location) - let numberRange = result.range(at: 1) - - guard !numberRange.isNotFound else { return (root, nil) } - - let number = Int((proposedName as NSString).substring(with: numberRange)) - - return (root, number) - }() - - let baseName = rootName + spaceSuffix - - guard baseCount != nil || self.contains(baseName) else { return baseName } - - return ((baseCount ?? 2)...).lazy - .map { baseName + " " + String($0) } - .first { !self.contains($0) }! - } -} diff --git a/CotEditor/Sources/Collection.swift b/CotEditor/Sources/Collection.swift index 4e618e612..5de4437cc 100644 --- a/CotEditor/Sources/Collection.swift +++ b/CotEditor/Sources/Collection.swift @@ -71,6 +71,22 @@ extension Collection { +extension Sequence { + + // Asynchronously returns an array containing the results of mapping the given closure over the sequence’s elements. + func asyncMap(_ transform: @Sendable (Element) async throws -> T) async rethrows -> [T] { + + var values = [T]() + for element in self { + try await values.append(transform(element)) + } + + return values + } +} + + + extension Sequence where Element: Equatable { /// An array consists of unique elements of receiver by keeping ordering. diff --git a/CotEditor/Sources/ColorCodePanelController.swift b/CotEditor/Sources/ColorCodePanelController.swift index 7a0567fbb..addb6ea18 100644 --- a/CotEditor/Sources/ColorCodePanelController.swift +++ b/CotEditor/Sources/ColorCodePanelController.swift @@ -26,6 +26,7 @@ import AppKit import SwiftUI import ColorCode +import Defaults @objc protocol ColorCodeReceiver: AnyObject { @@ -114,9 +115,7 @@ private struct ColorCodePanelAccessory: View { if let colorCode, let color = NSColor(colorCode: colorCode, type: &type), let type { self.colorCode = colorCode self.type = type.rawValue - Task { @MainActor in - panel.color = color - } + panel.color = color } } @@ -146,7 +145,9 @@ private struct ColorCodePanelAccessory: View { } label: { EmptyView() } - .onChange(of: self.type) { self.apply(type: $0) } + .onChange(of: self.type) { (_, newValue) in + self.apply(type: newValue) + } .labelsHidden() Button(String(localized: "Insert", table: "ColorCode", comment: "button label")) { @@ -163,7 +164,7 @@ private struct ColorCodePanelAccessory: View { // MARK: Private Methods /// Inserts the color code to the selection of the frontmost document. - @MainActor private func submit() { + private func submit() { self.apply(colorCode: self.colorCode) @@ -177,7 +178,7 @@ private struct ColorCodePanelAccessory: View { /// Sets the color representing the given code to the color panel and selects the corresponding color code type. /// /// - Parameter colorCode: The color code of the color to set. - @MainActor private func apply(colorCode: String) { + private func apply(colorCode: String) { var type: ColorCodeType? guard @@ -193,7 +194,7 @@ private struct ColorCodePanelAccessory: View { /// Converts the color code to the specified code type. /// /// - Parameter rawValue: The rawValue of ColorCodeType. - @MainActor private func apply(type rawValue: Int) { + private func apply(type rawValue: Int) { guard let type = ColorCodeType(rawValue: rawValue), diff --git a/CotEditor/Sources/CommandBarView.swift b/CotEditor/Sources/CommandBarView.swift index 4e03f6b1c..8876452d0 100644 --- a/CotEditor/Sources/CommandBarView.swift +++ b/CotEditor/Sources/CommandBarView.swift @@ -25,12 +25,14 @@ import SwiftUI import AppKit +import Observation +import Shortcut struct CommandBarView: View { - final class Model: ObservableObject { + @Observable final class Model { - @Published var commands: [ActionCommand] = [] + var commands: [ActionCommand] = [] } @@ -43,13 +45,11 @@ struct CommandBarView: View { } - let model: Model + @State var model: Model weak var parent: NSWindow? - @Environment(\.controlActiveState) private var controlActiveState - @State private var input: String = "" @State var candidates: [Candidate] = [] @@ -57,8 +57,6 @@ struct CommandBarView: View { @FocusState private var focus: ActionCommand.ID? @AccessibilityFocusState private var accessibilityFocus: ActionCommand.ID? - @State private var keyMonitor: Any? - var body: some View { @@ -96,16 +94,16 @@ struct CommandBarView: View { } .padding(.horizontal, 10) } - .onChange(of: self.selection) { newValue in + .onChange(of: self.selection) { (_, newValue) in proxy.scrollTo(newValue) } } - .compatibleContentMargins(.vertical, 10) + .contentMargins(.vertical, 10, for: .scrollContent) .frame(maxHeight: 300) .fixedSize(horizontal: false, vertical: true) } } - .onChange(of: self.input) { newValue in + .onChange(of: self.input) { (_, newValue) in self.candidates = self.model.commands .compactMap { guard let result = $0.match(command: newValue) else { return nil } @@ -113,35 +111,17 @@ struct CommandBarView: View { } .sorted(\.score) self.selection = self.candidates.first?.id + + // post a VoiceOver announcement + let announcement = String(localized: "\(self.candidates.count) commands found", table: "CommandBar", comment: "VoiceOver announcement when incrementally updated the command search result.") + AccessibilityNotification.Announcement(announcement).post() + } - .onChange(of: self.controlActiveState) { newValue in - switch newValue { - case .key, .active: - self.keyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { event in - if let key = event.specialKey, - event.modifierFlags.isDisjoint(with: [.shift, .control, .option, .command]) - { - switch key { - case .downArrow, .upArrow: - self.move(down: (key == .downArrow)) - return nil - default: - break - } - } - return event - } - - case .inactive: - self.input = "" - if let keyMonitor { - NSEvent.removeMonitor(keyMonitor) - self.keyMonitor = nil - } - - @unknown default: - break - } + .onKeyPress(.upArrow) { + self.move(down: false) ? .handled : .ignored + } + .onKeyPress(.downArrow) { + self.move(down: true) ? .handled : .ignored } .frame(width: 500) .ignoresSafeArea() @@ -151,27 +131,29 @@ struct CommandBarView: View { /// Moves the selection to the next one, if any exists. /// /// - Parameter down: Whether move down or up the selection. - private func move(down: Bool) { + /// - Returns: Whether the move action is performed. + private func move(down: Bool) -> Bool { guard let index = self.candidates.firstIndex(where: { $0.id == self.selection }), let candidate = self.candidates[safe: index + (down ? 1 : -1)] - else { return } + else { return false } self.selection = candidate.id self.focus = candidate.id self.accessibilityFocus = candidate.id + return true } /// Performs the selected command and closes the view. - @MainActor private func perform() { + private func perform() { // first close the command bar and then take the action // so that the action is delivered to the correct (first) responder. self.parent?.close() - if let command = self.candidates.first(where: { $0.id == self.selection })?.command { + if let command = self.candidates[id: self.selection]?.command { command.perform() } } @@ -304,17 +286,6 @@ private extension ActionCommand.Kind { private extension View { - @available(macOS, deprecated: 14) - func compatibleContentMargins(_ edges: Edge.Set = .all, _ length: CGFloat?) -> some View { - - if #available(macOS 14, *) { - return self.contentMargins(edges, length, for: .scrollContent) - } else { - return self.padding(edges, length) - } - } - - /// Performs actions when clicking the mouse on the view. /// /// - Parameters: diff --git a/CotEditor/Sources/Comparable.swift b/CotEditor/Sources/Comparable.swift index 35d8c573c..235922999 100644 --- a/CotEditor/Sources/Comparable.swift +++ b/CotEditor/Sources/Comparable.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2022 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -43,3 +43,13 @@ extension Comparable { self = self.clamped(to: range) } } + + +extension Bool: @retroactive Comparable { + + /// Precedences `true` over `false`. + public static func < (lhs: Bool, rhs: Bool) -> Bool { + + lhs && !rhs + } +} diff --git a/CotEditor/Sources/ConsolePanelController.swift b/CotEditor/Sources/ConsolePanelController.swift index 2b9d692a6..3bda3d68f 100644 --- a/CotEditor/Sources/ConsolePanelController.swift +++ b/CotEditor/Sources/ConsolePanelController.swift @@ -24,6 +24,7 @@ // import AppKit +import Defaults struct Console { @@ -136,7 +137,7 @@ private final class ConsoleViewController: NSViewController { // MARK: Private Properties - private weak var textView: NSTextView? + @ViewLoading private var textView: NSTextView private var fontSize: Double = max(UserDefaults.standard[.consoleFontSize], NSFont.smallSystemFontSize) { @@ -168,8 +169,7 @@ private final class ConsoleViewController: NSViewController { /// - Parameter log: The log to append. func append(log: Console.Log) { - guard let textView = self.textView else { return assertionFailure() } - + let textView = self.textView let lastLocation = textView.string.length let attributedString = log.attributedString(fontSize: self.fontSize) let range = NSRange(location: lastLocation, length: attributedString.length) @@ -187,10 +187,8 @@ private final class ConsoleViewController: NSViewController { /// Flushes existing log. @IBAction func clearAll(_ sender: Any?) { - guard let textView = self.textView else { return assertionFailure() } - - textView.string = "" - NSAccessibility.post(element: textView, notification: .valueChanged) + self.textView.string = "" + NSAccessibility.post(element: self.textView, notification: .valueChanged) } @@ -225,7 +223,7 @@ private final class ConsoleViewController: NSViewController { /// - Parameter fontSize: The new font size. private func changeFontSize(_ fontSize: Double) { - guard let storage = self.textView?.textStorage else { return } + guard let storage = self.textView.textStorage else { return } storage.beginEditing() storage.enumerateAttribute(.consolePart, type: Console.Log.Part.self, in: storage.range) { (part, range, _) in diff --git a/CotEditor/Sources/ContentViewController.swift b/CotEditor/Sources/ContentViewController.swift new file mode 100644 index 000000000..cc547c717 --- /dev/null +++ b/CotEditor/Sources/ContentViewController.swift @@ -0,0 +1,134 @@ +// +// ContentViewController.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-04. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import AppKit +import Combine +import Defaults + +final class ContentViewController: NSSplitViewController { + + // MARK: Public Properties + + var document: Document { didSet { self.updateDocument(from: oldValue) } } + + var documentViewController: DocumentViewController? { + + self.documentViewItem.viewController as? DocumentViewController + } + + + // MARK: Private Properties + + @ViewLoading private var documentViewItem: NSSplitViewItem + @ViewLoading private var statusBarItem: NSSplitViewItem + private lazy var statusBarModel = StatusBar.Model(document: self.document) + + private var defaultsObserver: AnyCancellable? + + + // MARK: Lifecycle + + init(document: Document) { + + self.document = document + + super.init(nibName: nil, bundle: nil) + } + + + required init?(coder: NSCoder) { + + fatalError("init(coder:) has not been implemented") + } + + + override func viewDidLoad() { + + super.viewDidLoad() + + // set document view + self.documentViewItem = NSSplitViewItem(viewController: DocumentViewController(document: self.document)) + + // set status bar + self.statusBarItem = NSSplitViewItem(viewController: StatusBarController(model: self.statusBarModel)) + self.statusBarItem.isCollapsed = !UserDefaults.standard[.showStatusBar] + + self.splitView.isVertical = false + self.splitViewItems = [self.documentViewItem, self.statusBarItem] + + // observe user defaults + self.defaultsObserver = UserDefaults.standard.publisher(for: .showStatusBar, initial: false) + .sink { [weak self] in self?.statusBarItem.animator().isCollapsed = !$0 } + } + + + + // MARK: Split View Controller Methods + + override func splitView(_ splitView: NSSplitView, effectiveRect proposedEffectiveRect: NSRect, forDrawnRect drawnRect: NSRect, ofDividerAt dividerIndex: Int) -> NSRect { + + // avoid showing draggable cursor for the status bar boundary + .zero + } + + + override func validateUserInterfaceItem(_ item: any NSValidatedUserInterfaceItem) -> Bool { + + switch item.action { + case #selector(toggleStatusBar): + (item as? NSMenuItem)?.title = !self.statusBarItem.isCollapsed + ? String(localized: "Hide Status Bar", table: "MainMenu") + : String(localized: "Show Status Bar", table: "MainMenu") + + default: break + } + + return super.validateUserInterfaceItem(item) + } + + + // MARK: Action Messages + + /// Toggles the visibility of status bar with fancy animation (sync all documents). + @IBAction func toggleStatusBar(_ sender: Any?) { + + UserDefaults.standard[.showStatusBar].toggle() + } + + + // MARK: Private Methods + + /// Updates the document in children. + private func updateDocument(from oldDocument: Document) { + + guard oldDocument != self.document else { return } + + self.removeSplitViewItem(self.documentViewItem) + self.documentViewItem = NSSplitViewItem(viewController: DocumentViewController(document: self.document)) + self.insertSplitViewItem(self.documentViewItem, at: 0) + + self.statusBarModel.updateDocument(to: self.document) + } +} diff --git a/CotEditor/Sources/CustomSurroundView.swift b/CotEditor/Sources/CustomSurroundView.swift index 72cad071e..e3f5f0a5a 100644 --- a/CotEditor/Sources/CustomSurroundView.swift +++ b/CotEditor/Sources/CustomSurroundView.swift @@ -92,7 +92,7 @@ struct CustomSurroundView: View { // MARK: Private Methods /// Submits the current input. - @MainActor private func submit() { + private func submit() { self.parent?.commitEditing() diff --git a/CotEditor/Sources/CustomTabWidthView.swift b/CotEditor/Sources/CustomTabWidthView.swift index a3eb8a285..9aa48b685 100644 --- a/CotEditor/Sources/CustomTabWidthView.swift +++ b/CotEditor/Sources/CustomTabWidthView.swift @@ -73,7 +73,7 @@ struct CustomTabWidthView: View { // MARK: Private Methods /// Submits the current input. - @MainActor private func submit() { + private func submit() { self.completionHandler(self.value) self.parent?.dismiss(nil) diff --git a/CotEditor/Sources/DefaultKey+FontType.swift b/CotEditor/Sources/DefaultKey+FontType.swift index 42086e9ea..c51c67d40 100644 --- a/CotEditor/Sources/DefaultKey+FontType.swift +++ b/CotEditor/Sources/DefaultKey+FontType.swift @@ -24,6 +24,7 @@ // import AppKit +import Defaults enum FontType: String, CaseIterable, Codable { diff --git a/CotEditor/Sources/DefaultKeys.swift b/CotEditor/Sources/DefaultKeys.swift index 1552dae87..22fd731bd 100644 --- a/CotEditor/Sources/DefaultKeys.swift +++ b/CotEditor/Sources/DefaultKeys.swift @@ -24,6 +24,8 @@ // import Foundation +import Defaults +import UnicodeNormalization extension DefaultKeys { @@ -106,6 +108,9 @@ extension DefaultKeys { static let snippets = DefaultKey<[[String: String]]>("snippets") static let fileDropArray = DefaultKey<[[String: String]]>("fileDropArray") + // Donation + static let donationBadgeType = RawRepresentableDefaultKey("donationBadgeType") + // Print static let printFontSize = DefaultKey("printFontSize") static let printTheme = DefaultKey("printTheme") diff --git a/CotEditor/Sources/DefaultOptions.swift b/CotEditor/Sources/DefaultOptions.swift index 44f72ad1d..bc95faa35 100644 --- a/CotEditor/Sources/DefaultOptions.swift +++ b/CotEditor/Sources/DefaultOptions.swift @@ -24,6 +24,7 @@ // import Foundation.NSObjCRuntime +import Defaults enum NoDocumentOnLaunchOption: Int, CaseIterable { diff --git a/CotEditor/Sources/DefaultSettings.swift b/CotEditor/Sources/DefaultSettings.swift index 4f0509891..44730bc0e 100644 --- a/CotEditor/Sources/DefaultSettings.swift +++ b/CotEditor/Sources/DefaultSettings.swift @@ -25,6 +25,8 @@ // import AppKit.NSFont +import Defaults +import UnicodeNormalization struct DefaultSettings { @@ -115,6 +117,8 @@ struct DefaultSettings { scope: "CSS"), ].map(\.dictionary), + .donationBadgeType: BadgeType.mug.rawValue, + .printFontSize: NSFont.systemFontSize, .printBackground: false, .printHeaderAndFooter: true, diff --git a/CotEditor/Sources/Document+ScriptingSupport.swift b/CotEditor/Sources/Document+ScriptingSupport.swift index bf01ddd5f..707c727d2 100644 --- a/CotEditor/Sources/Document+ScriptingSupport.swift +++ b/CotEditor/Sources/Document+ScriptingSupport.swift @@ -25,6 +25,7 @@ // import AppKit +import FileEncoding private enum OSALineEnding: FourCharCode { diff --git a/CotEditor/Sources/Document.swift b/CotEditor/Sources/Document.swift index a09135614..8a5cbfc64 100644 --- a/CotEditor/Sources/Document.swift +++ b/CotEditor/Sources/Document.swift @@ -25,12 +25,16 @@ // import AppKit +import Observation import Combine import SwiftUI import UniformTypeIdentifiers import OSLog +import Defaults +import FileEncoding +import FilePermissions -final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging { +@Observable final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging { // MARK: Enums @@ -48,44 +52,46 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // MARK: Public Properties var isTransient = false // untitled & empty document that was created automatically - var isVerticalText = false + nonisolated(unsafe) var isVerticalText = false // MARK: Readonly Properties let textStorage = NSTextStorage() let syntaxParser: SyntaxParser - @Published private(set) var fileEncoding: FileEncoding - @Published private(set) var lineEnding: LineEnding - @Published private(set) var fileAttributes: DocumentFile.Attributes? + @ObservationIgnored @Published private(set) var fileEncoding: FileEncoding + @ObservationIgnored @Published private(set) var lineEnding: LineEnding + @ObservationIgnored @Published private(set) var mode: Mode + private(set) nonisolated(unsafe) var fileAttributes: FileAttributes? let lineEndingScanner: LineEndingScanner - let analyzer = DocumentAnalyzer() - private(set) lazy var selection = TextSelection(document: self) + let counter = EditorCounter() + @ObservationIgnored private(set) lazy var selection = TextSelection(document: self) let didChangeSyntax = PassthroughSubject() // MARK: Private Properties - private lazy var printPanelAccessoryController: PrintPanelAccessoryController = NSStoryboard(name: "PrintPanelAccessory", bundle: nil).instantiateInitialController()! + @ObservationIgnored private lazy var printPanelAccessoryController: PrintPanelAccessoryController = NSStoryboard(name: "PrintPanelAccessory", bundle: nil).instantiateInitialController()! - private var readingEncoding: String.Encoding? // encoding to read document file - private var fileData: Data? - private var shouldSaveEncodingXattr = true - private var isExecutable = false - private let saveOptions = SaveOptions() - private var suppressesInconsistentLineEndingAlert = false - private var isExternalUpdateAlertShown = false - private var allowsLossySaving = false + private nonisolated(unsafe) var readingEncoding: String.Encoding? // encoding to read document file + private nonisolated(unsafe) var fileData: Data? + private nonisolated(unsafe) var shouldSaveEncodingXattr = true + private nonisolated(unsafe) var isExecutable = false + private nonisolated(unsafe) let saveOptions = SaveOptions() + private nonisolated(unsafe) var suppressesInconsistentLineEndingAlert = false + private nonisolated(unsafe) var isExternalUpdateAlertShown = false + private nonisolated(unsafe) var allowsLossySaving = false + private nonisolated(unsafe) var isInitialized = false - private lazy var urlDetector = URLDetector(textStorage: self.textStorage) + @ObservationIgnored private lazy var urlDetector = URLDetector(textStorage: self.textStorage) - private var syntaxUpdateObserver: AnyCancellable? - private var textStorageObserver: AnyCancellable? - private var defaultObservers: Set = [] + private nonisolated(unsafe) var syntaxUpdateObserver: AnyCancellable? + private nonisolated(unsafe) var textStorageObserver: AnyCancellable? + private nonisolated(unsafe) var defaultObservers: Set = [] - private var lastSavedData: Data? // temporal data used only within saving process + private nonisolated(unsafe) var lastSavedData: Data? // temporal data used only within saving process @@ -110,10 +116,12 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // observe for inconsistent line endings self.lineEndingScanner = .init(textStorage: self.textStorage, lineEnding: lineEnding) + self.mode = .kind(.general) + super.init() self.lineEndingScanner.observe(lineEnding: self.$lineEnding) - self.analyzer.document = self + self.counter.document = self // auto-link URLs in the content if UserDefaults.standard[.autoLinkDetection] { @@ -121,7 +129,9 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging } self.defaultObservers = [ UserDefaults.standard.publisher(for: .autoLinkDetection) - .sink { [weak self] in self?.urlDetector.isEnabled = $0 } + .sink { [weak self] in self?.urlDetector.isEnabled = $0 }, + UserDefaults.standard.publisher(for: .modes) + .sink { [weak self] _ in Task { await self?.invalidateMode() } }, ] // observe syntax update @@ -131,12 +141,6 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging } - deinit { - self.syntaxParser.cancel() - self.urlDetector.cancel() - } - - override func encodeRestorableState(with coder: NSCoder, backgroundQueue queue: OperationQueue) { super.encodeRestorableState(with: coder, backgroundQueue: queue) @@ -244,6 +248,8 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging override func makeWindowControllers() { + self.isInitialized = true + if self.windowControllers.isEmpty { // -> A transient document already has one. let windowController = DocumentWindowController(document: self) self.addWindowController(windowController) @@ -310,61 +316,70 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // [caution] This method may be called from a background thread due to concurrent-opening. - let strategy: DocumentFile.EncodingStrategy = { + let data = try Data(contentsOf: url) // FILE_READ + let attributes = try FileManager.default.attributesOfItem(atPath: url.path) // FILE_READ + let extendedAttributes = ExtendedFileAttributes(dictionary: attributes) + + let strategy: String.DecodingStrategy = { if let encoding = self.readingEncoding { return .specific(encoding) } - var encodingPriority = EncodingManager.shared.fileEncodings.compactMap { $0?.encoding } + var encodingCandidates = EncodingManager.shared.fileEncodings.compactMap { $0?.encoding } let isInitialOpen = (self.fileData == nil) && (self.textStorage.length == 0) if !isInitialOpen { // prioritize the current encoding - encodingPriority.insert(self.fileEncoding.encoding, at: 0) + encodingCandidates.insert(self.fileEncoding.encoding, at: 0) } - return .automatic(priority: encodingPriority, refersToTag: UserDefaults.standard[.referToEncodingTag]) + return .automatic(.init(candidates: encodingCandidates, + xattrEncoding: extendedAttributes.encoding, + tagScanLength: UserDefaults.standard[.referToEncodingTag] ? 2000 : nil)) }() // .readingEncoding is only valid once self.readingEncoding = nil - let file = try DocumentFile(fileURL: url, encodingStrategy: strategy) // FILE_ACCESS + let (string, fileEncoding) = try String.string(data: data, decodingStrategy: strategy) // store file data in order to check the file content identity in `presentedItemDidChange()` - self.fileData = file.data + self.fileData = data // use file attributes only if `fileURL` exists // -> The passed-in `url` in this method can point to a file that isn't the real document file, // for example on resuming an unsaved document. if self.fileURL != nil { - self.fileAttributes = file.attributes - self.isExecutable = file.attributes.permissions.user.contains(.execute) + let fileAttributes = FileAttributes(dictionary: attributes) + self.fileAttributes = fileAttributes + self.isExecutable = fileAttributes.permissions.user.contains(.execute) } // do not save `com.apple.TextEncoding` extended attribute if it doesn't exists - self.shouldSaveEncodingXattr = (file.xattrEncoding != nil) + self.shouldSaveEncodingXattr = (extendedAttributes.encoding != nil) // set text orientation state // -> Ignore if no metadata found to avoid restoring to the horizontal layout while editing unwontedly. - if UserDefaults.standard[.savesTextOrientation], file.isVerticalText { + if UserDefaults.standard[.savesTextOrientation], extendedAttributes.isVerticalText { self.isVerticalText = true } - if file.allowsInconsistentLineEndings { + if extendedAttributes.allowsInconsistentLineEndings { self.suppressesInconsistentLineEndingAlert = true } // update textStorage - self.textStorage.replaceContent(with: file.string) + Task { @MainActor in + self.textStorage.replaceContent(with: string) + } // set read values - self.fileEncoding = file.fileEncoding + self.fileEncoding = fileEncoding self.allowsLossySaving = false self.lineEnding = self.lineEndingScanner.majorLineEnding ?? self.lineEnding // keep default if no line endings are found // determine syntax (only on the first file open) - if self.windowForSheet == nil { - let syntaxName = SyntaxManager.shared.settingName(documentName: url.lastPathComponent, content: file.string) ?? SyntaxName.none - self.setSyntax(name: syntaxName, isInitial: true) + if !self.isInitialized { + let syntaxName = SyntaxManager.shared.settingName(documentName: url.lastPathComponent, content: string) + self.setSyntax(name: syntaxName ?? SyntaxName.none, isInitial: true) } } @@ -410,7 +425,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // trim trailing whitespace if needed if !saveOperation.isAutosave, UserDefaults.standard[.autoTrimsTrailingWhitespace] { - textViews.first?.trimTrailingWhitespace(ignoresEmptyLines: !UserDefaults.standard[.trimsWhitespaceOnlyLines]) + textViews.first?.trimTrailingWhitespace(ignoringEmptyLines: !UserDefaults.standard[.trimsWhitespaceOnlyLines]) } // workaround the issue that invoking the async version super blocks the save process @@ -436,7 +451,9 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging } if !saveOperation.isAutosave { - ScriptManager.shared.dispatch(event: .documentSaved, document: self.objectSpecifier) + Task { + await ScriptManager.shared.dispatch(event: .documentSaved, document: self.objectSpecifier) + } } } } @@ -460,7 +477,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // get the latest file attributes do { let attributes = try FileManager.default.attributesOfItem(atPath: url.path) // FILE_ACCESS - self.fileAttributes = DocumentFile.Attributes(dictionary: attributes) + self.fileAttributes = FileAttributes(dictionary: attributes) } catch { assertionFailure(error.localizedDescription) } @@ -574,7 +591,9 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging super.close() self.textStorageObserver?.cancel() - self.analyzer.cancel() + self.counter.cancel() + self.syntaxParser.cancel() + self.urlDetector.cancel() } @@ -721,61 +740,42 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // MARK: Protocols - override func presentedItemDidChange() { // nonisolated + nonisolated override func presentedItemDidChange() { // [caution] DO NOT invoke `super.presentedItemDidChange()` that reverts document automatically if autosavesInPlace is enabled. // super.presentedItemDidChange() - guard - UserDefaults.standard[.documentConflictOption] != .ignore, - !self.isExternalUpdateAlertShown, // don't check twice if already notified - var fileURL = self.fileURL - else { return } + let strategy = UserDefaults.standard[.documentConflictOption] + + guard strategy != .ignore, !self.isExternalUpdateAlertShown else { return } // don't check twice if already notified // check if the file content was changed from the stored file data - var didChange = false - var modificationDate: Date? - var error: NSError? - NSFileCoordinator(filePresenter: self).coordinate(readingItemAt: fileURL, options: .withoutChanges, error: &error) { newURL in // FILE_ACCESS - do { - // ignore if file's modificationDate is the same as document's modificationDate - fileURL.removeCachedResourceValue(forKey: .contentModificationDateKey) - modificationDate = try fileURL.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate - guard modificationDate != self.fileModificationDate else { return } - - // check if file contents was changed from the stored file data - let data = try Data(contentsOf: newURL) - didChange = data != self.fileData - } catch { - assertionFailure(error.localizedDescription) - } - } - if let error { - assertionFailure(error.localizedDescription) + let didChange: Bool + let modificationDate: Date? + do { + (didChange, modificationDate) = try self.checkFileContentDidChange() + } catch { + Logger.app.error("Error on checking document file change: \(error.localizedDescription)") + return } guard didChange else { // update the document's fileModificationDate for a workaround (2014-03 by 1024jp) - // -> If not, an alert shows up when user saves the file. - guard let modificationDate else { return } - DispatchQueue.main.async { [weak self] in - if self?.fileModificationDate?.compare(modificationDate) == .orderedAscending { - self?.fileModificationDate = modificationDate - } + // -> Otherwise, an alert shows up when the user saves the file. + if let modificationDate, self.fileModificationDate?.compare(modificationDate) == .orderedAscending { + self.fileModificationDate = modificationDate } return } // notify about external file update - Task { - switch UserDefaults.standard[.documentConflictOption] { - case .ignore: - assertionFailure() - case .notify: - await self.showUpdatedByExternalProcessAlert() - case .revert: - await self.revertWithoutAsking() - } + switch strategy { + case .ignore: + assertionFailure() + case .notify: + Task { await self.showUpdatedByExternalProcessAlert() } + case .revert: + Task { await self.revert() } } } @@ -806,7 +806,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // -> This method won't be invoked on Resume. (2015-01-26) Task { - ScriptManager.shared.dispatch(event: .documentOpened, document: await self.objectSpecifier) + await ScriptManager.shared.dispatch(event: .documentOpened, document: await self.objectSpecifier) } } @@ -844,21 +844,19 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging /// - Throws: `ReinterpretationError` func reinterpret(encoding: String.Encoding) throws { + // do nothing if given encoding is the same as current one + if encoding == self.fileEncoding.encoding { return } + guard let fileURL = self.fileURL else { throw ReinterpretationError.noFile } - // do nothing if given encoding is the same as current one - if encoding == self.fileEncoding.encoding { return } - // reinterpret self.readingEncoding = encoding do { try self.revert(toContentsOf: fileURL, ofType: self.fileType!) - } catch { self.readingEncoding = nil - throw ReinterpretationError.reinterpretationFailed(encoding) } } @@ -868,7 +866,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging /// /// - Parameters: /// - fileEncoding: The text encoding to change with. - @MainActor func changeEncoding(to fileEncoding: FileEncoding) { + func changeEncoding(to fileEncoding: FileEncoding) { assert(Thread.isMainThread) @@ -898,7 +896,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging /// Change line endings and register the process to the undo manager. /// /// - Parameter lineEnding: The line ending type to change with. - @MainActor func changeLineEnding(to lineEnding: LineEnding) { + func changeLineEnding(to lineEnding: LineEnding) { assert(Thread.isMainThread) @@ -939,7 +937,11 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging /// - Parameters: /// - name: The name of the syntax to change with. /// - isInitial: Whether the setting is initial. - func setSyntax(name: String, isInitial: Bool = false) { + nonisolated(unsafe) func setSyntax(name: String, isInitial: Bool = false) { + + defer { + Task { await self.invalidateMode() } + } let syntax: Syntax do { @@ -961,7 +963,10 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging // to avoid redundant highlight parse due to async notification. guard !isInitial else { return } - self.didChangeSyntax.send(name) + Task { @MainActor in + self.didChangeSyntax.send(name) + self.invalidateRestorableState() + } } @@ -1043,10 +1048,45 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging } + /// Checks if the file content did change since the last read. + /// + /// - Returns: A boolean whether the file did change and the content modification date if available. + nonisolated private func checkFileContentDidChange() throws -> (Bool, Date?) { + + guard var fileURL = self.fileURL else { throw CocoaError(.fileReadNoSuchFile) } + + fileURL.removeCachedResourceValue(forKey: .contentModificationDateKey) + + // check if the file content was changed from the stored file data + var didChange = false + var modificationDate: Date? + var coordinationError: NSError? + var readingError: (any Error)? + NSFileCoordinator(filePresenter: self).coordinate(readingItemAt: fileURL, options: .withoutChanges, error: &coordinationError) { newURL in // FILE_ACCESS + do { + // ignore if file's modificationDate is the same as document's modificationDate + modificationDate = try newURL.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate + guard modificationDate != self.fileModificationDate else { return } + + // check if file contents was changed from the stored file data + let data = try Data(contentsOf: newURL) + didChange = data != self.fileData + } catch { + readingError = error + } + } + if let error = coordinationError ?? readingError { + throw error + } + + return (didChange, modificationDate) + } + + /// Changes the text encoding by asking options to the user. /// /// - Parameter fileEncoding: The text encoding to change. - @MainActor func askChangingEncoding(to fileEncoding: FileEncoding) { + func askChangingEncoding(to fileEncoding: FileEncoding) { assert(Thread.isMainThread) @@ -1139,82 +1179,88 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging /// Displays an alert about inconsistent line endings. - @MainActor private func showInconsistentLineEndingAlert() { - - assert(Thread.isMainThread) + private func showInconsistentLineEndingAlert() { guard !UserDefaults.standard[.suppressesInconsistentLineEndingAlert], !self.suppressesInconsistentLineEndingAlert else { return } - guard let documentWindow = self.windowForSheet else { return assertionFailure() } - - let alert = NSAlert() - alert.alertStyle = .warning - alert.messageText = String(localized: "InconsistentLineEndingAlert.message", - defaultValue: "The document has inconsistent line endings.") - alert.informativeText = String(localized: "InconsistentLineEndingAlert.informativeText", - defaultValue: "Do you want to convert all line endings to \(self.lineEnding.label), the most common line endings in this document?") - alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.convert", - defaultValue: "Convert", - comment: "button label")) - alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.review", - defaultValue: "Review", - comment: "button label")) - alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.ignore", - defaultValue: "Ignore", - comment: "button label")) - alert.showsSuppressionButton = true - alert.suppressionButton?.title = String(localized: "InconsistentLineEndingAlert.suppressionButton", - defaultValue: "Don’t ask again for this document", - comment: "toggle button label") - alert.showsHelp = true - alert.helpAnchor = "inconsistent_line_endings" - - alert.beginSheetModal(for: documentWindow) { [unowned self] returnCode in - if alert.suppressionButton?.state == .on { - self.suppressesInconsistentLineEndingAlert = true - self.invalidateRestorableState() - - // save xattr - if let fileURL = self.fileURL { - var error: NSError? - NSFileCoordinator(filePresenter: self).coordinate(writingItemAt: fileURL, options: .contentIndependentMetadataOnly, error: &error) { newURL in // FILE_ACCESS - try? newURL.setExtendedAttribute(data: Data([1]), for: FileExtendedAttributeName.allowLineEndingInconsistency) - } - } + self.performActivity(withSynchronousWaiting: true) { [unowned self] activityCompletionHandler in + guard let documentWindow = self.windowForSheet else { + activityCompletionHandler() + assertionFailure() + return } - switch returnCode { - case .alertFirstButtonReturn: // == Convert - self.changeLineEnding(to: self.lineEnding) - case .alertSecondButtonReturn: // == Review - self.showWarningInspector() - case .alertThirdButtonReturn: // == Ignore - break - default: - fatalError() + let alert = NSAlert() + alert.alertStyle = .warning + alert.messageText = String(localized: "InconsistentLineEndingAlert.message", + defaultValue: "The document has inconsistent line endings.") + alert.informativeText = String(localized: "InconsistentLineEndingAlert.informativeText", + defaultValue: "Do you want to convert all line endings to \(self.lineEnding.label), the most common line endings in this document?") + alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.convert", + defaultValue: "Convert", + comment: "button label")) + alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.review", + defaultValue: "Review", + comment: "button label")) + alert.addButton(withTitle: String(localized: "InconsistentLineEndingAlert.button.ignore", + defaultValue: "Ignore", + comment: "button label")) + alert.showsSuppressionButton = true + alert.suppressionButton?.title = String(localized: "InconsistentLineEndingAlert.suppressionButton", + defaultValue: "Don’t ask again for this document", + comment: "toggle button label") + alert.showsHelp = true + alert.helpAnchor = "inconsistent_line_endings" + + alert.beginSheetModal(for: documentWindow) { [unowned self] returnCode in + if alert.suppressionButton?.state == .on { + self.suppressesInconsistentLineEndingAlert = true + self.invalidateRestorableState() + + // save xattr + if let fileURL = self.fileURL { + var error: NSError? + NSFileCoordinator(filePresenter: self).coordinate(writingItemAt: fileURL, options: .contentIndependentMetadataOnly, error: &error) { newURL in // FILE_ACCESS + try? newURL.setExtendedAttribute(data: Data([1]), for: FileExtendedAttributeName.allowLineEndingInconsistency) + } + } + } + + switch returnCode { + case .alertFirstButtonReturn: // == Convert + self.changeLineEnding(to: self.lineEnding) + case .alertSecondButtonReturn: // == Review + self.showWarningInspector() + case .alertThirdButtonReturn: // == Ignore + break + default: + fatalError() + } + + activityCompletionHandler() } } } /// Displays an alert about file modification by an external process. - @MainActor private func showUpdatedByExternalProcessAlert() { + private func showUpdatedByExternalProcessAlert() { // do nothing if alert is already shown guard !self.isExternalUpdateAlertShown else { return } self.performActivity(withSynchronousWaiting: true) { [unowned self] activityCompletionHandler in - self.isExternalUpdateAlertShown = true - guard let documentWindow = self.windowForSheet else { activityCompletionHandler() assertionFailure() return } + self.isExternalUpdateAlertShown = true + let alert = NSAlert() alert.messageText = self.isDocumentEdited ? String(localized: "UpdatedByExternalProcessAlert.message.edited", @@ -1237,7 +1283,7 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging alert.beginSheetModal(for: documentWindow) { [unowned self] returnCode in if returnCode == .alertSecondButtonReturn { // == Revert - self.revertWithoutAsking() + self.revert() } self.isExternalUpdateAlertShown = false @@ -1247,24 +1293,14 @@ final class Document: NSDocument, AdditionalDocumentPreparing, EncodingChanging } - /// Reverts the receiver with current document file without asking to the user in advance. - @MainActor private func revertWithoutAsking() { + private func invalidateMode() async { - guard - let fileURL = self.fileURL, - let fileType = self.fileType - else { return } - - do { - try self.revert(toContentsOf: fileURL, ofType: fileType) - } catch { - self.presentErrorAsSheet(error) - } + self.mode = await ModeManager.shared.mode(for: self.syntaxParser.name) } /// Shows the warning inspector in the document window. - @MainActor private func showWarningInspector() { + private func showWarningInspector() { (self.windowControllers.first?.contentViewController as? WindowContentViewController)?.showInspector(pane: .warnings) } diff --git a/CotEditor/Sources/DocumentAnalyzer.swift b/CotEditor/Sources/DocumentAnalyzer.swift deleted file mode 100644 index 70a76fbe2..000000000 --- a/CotEditor/Sources/DocumentAnalyzer.swift +++ /dev/null @@ -1,111 +0,0 @@ -// -// DocumentAnalyzer.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2014-12-18. -// -// --------------------------------------------------------------------------- -// -// © 2004-2007 nakamuxu -// © 2014-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit - -extension NSValue: @unchecked Sendable { } - - -@MainActor final class DocumentAnalyzer { - - // MARK: Public Properties - - @Published private(set) var result: EditorCounter.Result = .init() - - weak var document: Document? // weak to avoid cycle retain - var updatesAll = false { didSet { Task { await self.updateTypes() } } } - var statusBarRequirements: EditorCounter.Types = [] { didSet { Task { await self.updateTypes() } } } - - - // MARK: Private Properties - - private let counter = EditorCounter() - - private var contentTask: Task? - private var selectionTask: Task? - - - // MARK: Public Methods - - /// Cancels all remaining tasks. - func cancel() { - - self.contentTask?.cancel() - self.selectionTask?.cancel() - } - - - /// Updates content counts. - func invalidateContent() { - - self.contentTask?.cancel() - self.contentTask = Task { - guard await !self.counter.types.isDisjoint(with: .count) else { return } - - try await Task.sleep(for: .milliseconds(20), tolerance: .milliseconds(20)) // debounce - - guard let string = self.document?.textView?.string.immutable else { return } - - self.result = try await self.counter.count(string: string) - } - } - - - /// Updates selection-related values. - func invalidateSelection() { - - self.selectionTask?.cancel() - self.selectionTask = Task { - guard await !self.counter.types.isEmpty else { return } - - try await Task.sleep(for: .milliseconds(200), tolerance: .milliseconds(40)) // debounce - - guard let textView = self.document?.textView else { return } - - let string = textView.string.immutable - let selectedRanges = textView.selectedRanges.compactMap { Range($0.rangeValue, in: string) } - - self.result = try await self.counter.move(selectedRanges: selectedRanges, string: string) - } - } - - - // MARK: Private Methods - - /// Update types to count. - private func updateTypes() async { - - let oldValue = await self.counter.types - let newValue = self.updatesAll ? .all : self.statusBarRequirements - - await self.counter.update(types: newValue) - - if !newValue.intersection(.count).isSubset(of: oldValue.intersection(.count)) { - self.invalidateContent() - } - self.invalidateSelection() - } -} diff --git a/CotEditor/Sources/DocumentController.swift b/CotEditor/Sources/DocumentController.swift index 93260e754..ccf19bbf9 100644 --- a/CotEditor/Sources/DocumentController.swift +++ b/CotEditor/Sources/DocumentController.swift @@ -28,6 +28,7 @@ import AppKit import Combine import SwiftUI import UniformTypeIdentifiers +import Defaults protocol AdditionalDocumentPreparing: NSDocument { @@ -350,11 +351,9 @@ final class DocumentController: NSDocumentController { private nonisolated func checkOpeningSafetyOfDocument(at url: URL, type typeName: String) throws { // check if the file is possible binary - let binaryTypes: [UTType] = [.image, .audiovisualContent, .archive] if let type = UTType(typeName), - binaryTypes.contains(where: type.conforms(to:)), - !type.conforms(to: .svg), // SVG is plain-text (except SVGZ) - url.pathExtension != "ts" // "ts" extension conflicts between MPEG-2 streamclip file and TypeScript + !type.isPlainText, + [.image, .audiovisualContent, .archive].contains(where: type.conforms(to:)) { throw DocumentOpeningError(.binaryFile(type: type), url: url) } diff --git a/CotEditor/Sources/DocumentFile.swift b/CotEditor/Sources/DocumentFile.swift deleted file mode 100644 index 74d442b8b..000000000 --- a/CotEditor/Sources/DocumentFile.swift +++ /dev/null @@ -1,177 +0,0 @@ -// -// DocumentFile.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2018-03-05. -// -// --------------------------------------------------------------------------- -// -// © 2018-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import Foundation - -extension FileAttributeKey { - - static let extendedAttributes = FileAttributeKey("NSFileExtendedAttributes") -} - - -enum FileExtendedAttributeName { - - static let encoding = "com.apple.TextEncoding" - static let verticalText = "com.coteditor.VerticalText" - static let allowLineEndingInconsistency = "com.coteditor.AllowLineEndingInconsistency" -} - - - -struct DocumentFile { - - enum EncodingStrategy { - - case automatic(priority: [String.Encoding], refersToTag: Bool) - case specific(String.Encoding) - } - - - struct Attributes { - - var creationDate: Date? - var modificationDate: Date? - var size: Int64 - var permissions: FilePermissions - var owner: String? - } - - - /// Maximal length to scan encoding declaration - private static let maxEncodingScanLength = 2000 - - - // MARK: Properties - - var data: Data - var string: String - var attributes: Attributes - var fileEncoding: FileEncoding - var xattrEncoding: String.Encoding? - var isVerticalText: Bool - var allowsInconsistentLineEndings: Bool - - - - // MARK: Lifecycle - - /// Reads file at the given URL and initialize. - /// - /// - Parameters: - /// - fileURL: The location of the file to read. - /// - encodingStrategy: The text encoding to read the file. - init(fileURL: URL, encodingStrategy: EncodingStrategy) throws { - - guard fileURL.isFileURL else { throw CocoaError.error(.fileReadUnknown, url: fileURL) } - - let data = try Data(contentsOf: fileURL) // FILE_READ - let attributes = try FileManager.default.attributesOfItem(atPath: fileURL.path) // FILE_READ - - // check extended attributes - let extendedAttributes = attributes[.extendedAttributes] as? [String: Data] - self.xattrEncoding = extendedAttributes?[FileExtendedAttributeName.encoding]?.decodingXattrEncoding - self.isVerticalText = (extendedAttributes?[FileExtendedAttributeName.verticalText] != nil) - self.allowsInconsistentLineEndings = (extendedAttributes?[FileExtendedAttributeName.allowLineEndingInconsistency] != nil) - - // decode Data to String - let content: String - let encoding: String.Encoding - switch encodingStrategy { - case .automatic(let priority, let refersToTag): - (content, encoding) = try Self.string(data: data, xattrEncoding: self.xattrEncoding, - suggestedEncodings: priority, - refersToEncodingTag: refersToTag) - case .specific(let readingEncoding): - guard let string = String(bomCapableData: data, encoding: readingEncoding) else { - throw CocoaError.error(.fileReadInapplicableStringEncoding, userInfo: [NSStringEncodingErrorKey: readingEncoding.rawValue]) - } - content = string - encoding = readingEncoding - } - - // set properties - self.data = data - self.string = content - self.attributes = Attributes(dictionary: attributes) - self.fileEncoding = FileEncoding(encoding: encoding, - withUTF8BOM: (encoding == .utf8) && data.starts(with: Unicode.BOM.utf8.sequence)) - } - - - - // MARK: Private Methods - - /// Reads string from data by detecting the text encoding automatically. - /// - /// - Parameters: - /// - data: The data to encode. - /// - xattrEncoding: The text encoding read from the file's extended attributes. - /// - suggestedEncodings: The list of encodings to test the encoding. - /// - refersToEncodingTag: The boolean whether to refer encoding tag in the file content. - /// - Returns: The decoded string and used encoding. - private static func string(data: Data, xattrEncoding: String.Encoding?, suggestedEncodings: [String.Encoding], refersToEncodingTag: Bool) throws -> (String, String.Encoding) { - - // try interpreting with xattr encoding - if let xattrEncoding { - // just trust xattr encoding if content is empty - if let string = data.isEmpty ? "" : String(bomCapableData: data, encoding: xattrEncoding) { - return (string, xattrEncoding) - } - } - - // detect encoding from data - var usedEncoding: String.Encoding? - let string = try String(data: data, suggestedEncodings: suggestedEncodings, usedEncoding: &usedEncoding) - - // try reading encoding declaration and take priority of it if it seems well - if refersToEncodingTag, - let scannedEncoding = string.scanEncodingDeclaration(upTo: self.maxEncodingScanLength), - suggestedEncodings.contains(scannedEncoding), - scannedEncoding != usedEncoding, - let string = String(bomCapableData: data, encoding: scannedEncoding) - { - return (string, scannedEncoding) - } - - guard let encoding = usedEncoding else { - throw CocoaError(.fileReadUnknownStringEncoding) - } - - return (string, encoding) - } -} - - -extension DocumentFile.Attributes { - - init(dictionary: [FileAttributeKey: Any]) { - - self.creationDate = dictionary[.creationDate] as? Date - self.modificationDate = dictionary[.modificationDate] as? Date - self.size = dictionary[.size] as? Int64 ?? 0 - self.permissions = FilePermissions(mask: dictionary[.posixPermissions] as? Int16 ?? 0) - self.owner = dictionary[.ownerAccountName] as? String - } -} diff --git a/CotEditor/Sources/DocumentInspectorView.swift b/CotEditor/Sources/DocumentInspectorView.swift index b707b8591..371867cc5 100644 --- a/CotEditor/Sources/DocumentInspectorView.swift +++ b/CotEditor/Sources/DocumentInspectorView.swift @@ -24,17 +24,20 @@ // import SwiftUI +import Observation import Combine +import FileEncoding +import FilePermissions final class DocumentInspectorViewController: NSHostingController, DocumentOwner { // MARK: Public Properties - var document: Document { + var document: Document? { didSet { if self.isViewShown { - self.model.document = document + self.model.updateDocument(to: document) } } } @@ -48,7 +51,7 @@ final class DocumentInspectorViewController: NSHostingController = [] + + + func updateDocument(to document: Document?) { + + self.invalidateObservation(document: document) + self.document = document + } } - @ObservedObject var model: Model + @State var model: Model var body: some View { @@ -104,16 +128,26 @@ struct DocumentInspectorView: View { ScrollView(.vertical) { VStack(spacing: 8) { DocumentFileView(attributes: self.model.attributes, fileURL: self.model.fileURL) - Divider() - TextSettingsView(encoding: self.model.encoding, lineEnding: self.model.lineEnding, mode: self.model.mode) - Divider() - CountLocationView(result: self.model.countResult) - Divider() - CharacterPaneView(character: self.model.countResult.character) + + if let textSettings = self.model.textSettings { + Divider() + TextSettingsView(value: textSettings) + } + + if let countResult = self.model.countResult { + Divider() + CountLocationView(result: countResult) + + Divider() + CharacterPaneView(character: countResult.character) + } } .padding(EdgeInsets(top: 4, leading: 12, bottom: 12, trailing: 12)) .disclosureGroupStyle(InspectorDisclosureGroupStyle()) .labeledContentStyle(InspectorLabeledContentStyle()) + .onChange(of: self.model.document?.fileAttributes, initial: true) { (_, newValue) in + self.model.attributes = newValue + } } .accessibilityLabel(Text("Document Inspector", tableName: "Document")) .controlSize(.small) @@ -123,7 +157,7 @@ struct DocumentInspectorView: View { private struct DocumentFileView: View { - var attributes: DocumentFile.Attributes? + var attributes: FileAttributes? var fileURL: URL? @State private var isExpanded = true @@ -131,7 +165,7 @@ private struct DocumentFileView: View { var body: some View { - DisclosureGroup(String(localized: "Document File", table: "Document", comment: "section title in inspector"), isExpanded: $isExpanded) { + DisclosureGroup(String(localized: "File", table: "Document", comment: "section title in inspector"), isExpanded: $isExpanded) { Form { OptionalLabeledContent(String(localized: "Created", table: "Document", comment: "label in document inspector"), @@ -182,9 +216,7 @@ private struct DocumentFileView: View { private struct TextSettingsView: View { - var encoding: FileEncoding - var lineEnding: LineEnding - var mode: Mode + var value: TextSettings @State private var isExpanded = true @@ -195,13 +227,13 @@ private struct TextSettingsView: View { Form { LabeledContent(String(localized: "Encoding", table: "Document", comment: "label in document inspector"), - value: self.encoding.localizedName) + value: self.value.encoding.localizedName) LabeledContent(String(localized: "Line Endings", table: "Document", comment: "label in document inspector"), - value: self.lineEnding.label) + value: self.value.lineEnding.label) LabeledContent(String(localized: "Mode", table: "Document", comment: "label in document inspector"), - value: self.mode.label) + value: self.value.mode.label) } .frame(maxWidth: .infinity, alignment: .leading) } @@ -349,37 +381,34 @@ private extension DocumentInspectorView.Model { func invalidateObservation(document: Document?) { - self.document?.analyzer.updatesAll = false + self.document?.counter.updatesAll = false + self.countResult = document?.counter.result if let document { - document.analyzer.updatesAll = true + document.counter.updatesAll = true + + self.textSettings = TextSettings(encoding: document.fileEncoding, + lineEnding: document.lineEnding, + mode: .kind(.general)) self.observers = [ document.publisher(for: \.fileURL, options: .initial) .receive(on: DispatchQueue.main) .sink { [weak self] in self?.fileURL = $0 }, - document.$fileAttributes - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.attributes = $0 }, document.$fileEncoding .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.encoding = $0 }, + .sink { [weak self] in self?.textSettings?.encoding = $0 }, document.$lineEnding .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.lineEnding = $0 }, - document.didChangeSyntax + .sink { [weak self] in self?.textSettings?.lineEnding = $0 }, + document.$mode .receive(on: DispatchQueue.main) - .sink { [weak self] syntax in - Task { - self?.mode = await ModeManager.shared.mode(for: syntax) - } - }, - document.analyzer.$result - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.countResult = $0 }, + .sink { [weak self] in self?.textSettings?.mode = $0 }, ] } else { self.observers.removeAll() + self.fileURL = nil + self.textSettings = nil } } } @@ -388,7 +417,6 @@ private extension DocumentInspectorView.Model { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 240, height: 520)) { let model = DocumentInspectorView.Model() model.attributes = .init( @@ -399,17 +427,20 @@ private extension DocumentInspectorView.Model { owner: "clarus" ) model.fileURL = URL(filePath: "/Users/clarus/Desktop/My Script.py") - model.encoding = .init(encoding: .utf8, withUTF8BOM: true) - model.countResult = .init( - characters: .init(entire: 1024, selected: 4), - lines: .init(entire: 10, selected: 1), - character: "🐈‍⬛" - ) + model.textSettings = .init(encoding: .init(encoding: .utf8, withUTF8BOM: true), + lineEnding: .lf, + mode: .kind(.general)) + + let result = EditorCounter.Result() + result.characters = .init(entire: 1024, selected: 4) + result.lines = .init(entire: 10, selected: 1) + result.character = "🐈‍⬛" + + model.countResult = result return DocumentInspectorView(model: model) } -@available(macOS 14, *) #Preview("Empty", traits: .fixedLayout(width: 240, height: 520)) { DocumentInspectorView(model: .init()) } diff --git a/CotEditor/Sources/DocumentViewController.swift b/CotEditor/Sources/DocumentViewController.swift index 1b7c6be26..f3d1e9762 100644 --- a/CotEditor/Sources/DocumentViewController.swift +++ b/CotEditor/Sources/DocumentViewController.swift @@ -27,8 +27,20 @@ import AppKit import Combine import SwiftUI +import Defaults -private let maximumNumberOfSplitEditors = 4 +@Observable final class SplitState { + + var isVertical: Bool + var canClose: Bool + + + init(isVertical: Bool = false, canClose: Bool = false) { + + self.isVertical = isVertical + self.canClose = canClose + } +} final class DocumentViewController: NSSplitViewController, ThemeChanging, NSToolbarItemValidation { @@ -41,40 +53,20 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool // MARK: Public Properties - var document: Document { - - didSet { - self.statusBarModel.document = document - self.updateDocument() - } - } + let document: Document // MARK: Private Properties - /// Keys for NSNumber values to be restored from the last session (Bool is also an NSNumber). - private static let restorableNumberStateKeyPaths: [String] = [ - #keyPath(showsLineNumber), - #keyPath(showsPageGuide), - #keyPath(showsIndentGuides), - #keyPath(showsInvisibles), - #keyPath(wrapsLines), - #keyPath(verticalLayoutOrientation), - #keyPath(isAutoTabExpandEnabled), - #keyPath(writingDirection), - ] + private static let maximumNumberOfSplitEditors = 4 - private lazy var splitViewController = SplitViewController() - private lazy var statusBarModel = StatusBar.Model(document: self.document) - private weak var statusBarItem: NSSplitViewItem? + private let splitState = SplitState() - private var documentSyntaxObserver: AnyCancellable? - private var outlineObserver: AnyCancellable? - private var appearanceObserver: AnyCancellable? - private var defaultsObservers: Set = [] - private var themeChangeObserver: AnyCancellable? + private weak var focusedChild: EditorViewController? - private lazy var outlineParseDebouncer = Debouncer(delay: .seconds(0.4)) { [weak self] in self?.syntaxParser.invalidateOutline() } + private var observers: Set = [] + + private lazy var outlineParseDebouncer = Debouncer(delay: .seconds(0.4)) { [weak self] in self?.document.syntaxParser.invalidateOutline() } @@ -85,8 +77,6 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool self.document = document super.init(nibName: nil, bundle: nil) - - self.updateDocument() } @@ -97,7 +87,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool deinit { - NotificationCenter.default.removeObserver(self, name: NSTextView.didChangeSelectionNotification, object: nil) + NotificationCenter.default.removeObserver(self, name: NSTextStorage.didProcessEditingNotification, object: nil) NotificationCenter.default.removeObserver(self, name: EditorTextView.didLiveChangeSelectionNotification, object: nil) } @@ -106,25 +96,23 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool super.viewDidLoad() - self.splitView.isVertical = false + self.splitView.isVertical = UserDefaults.standard[.splitViewVertical] + self.splitState.isVertical = self.splitView.isVertical // set identifier for state restoration self.identifier = NSUserInterfaceItemIdentifier("DocumentViewController") - self.addChild(self.splitViewController) + // detect indent style + if UserDefaults.standard[.detectsIndentStyle], + let indentStyle = self.document.textStorage.string.detectedIndentStyle + { + self.isAutoTabExpandEnabled = switch indentStyle { + case .tab: false + case .space: true + } + } - // set status bar - let statusBarItem = NSSplitViewItem(viewController: StatusBarController(model: self.statusBarModel)) - statusBarItem.isCollapsed = true // avoid initial view loading - self.addSplitViewItem(statusBarItem) - self.statusBarItem = statusBarItem - - // set first editor view - self.addEditorView() - - // set user defaults - let defaults = UserDefaults.standard - switch defaults[.writingDirection] { + switch UserDefaults.standard[.writingDirection] { case .leftToRight: break case .rightToLeft: @@ -132,46 +120,70 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool case .vertical: self.verticalLayoutOrientation = true } - statusBarItem.isCollapsed = !defaults[.showStatusBar] + + // start parsing syntax for highlighting and outlines + self.outlineParseDebouncer.perform() + self.document.syntaxParser.highlight() + + NotificationCenter.default.addObserver(self, selector: #selector(textStorageDidProcessEditing), + name: NSTextStorage.didProcessEditingNotification, + object: self.document.textStorage) + + // set first editor view + self.addEditorView() self.setTheme(name: ThemeManager.shared.userDefaultSettingName) - self.defaultsObservers = [ - defaults.publisher(for: .showStatusBar, initial: false) - .sink { [weak self] in self?.statusBarItem?.animator().isCollapsed = !$0 }, - defaults.publisher(for: .theme, initial: false) + + // observe + self.observers = [ + // observe syntax change + self.document.didChangeSyntax + .sink { [weak self] _ in + self?.outlineParseDebouncer.perform() + self?.document.syntaxParser.highlight() + }, + + // observe user defaults + UserDefaults.standard.publisher(for: .theme, initial: false) .sink { [weak self] in self?.setTheme(name: $0) }, - defaults.publisher(for: .showInvisibles, initial: true) + UserDefaults.standard.publisher(for: .showInvisibles, initial: true) .sink { [weak self] in self?.showsInvisibles = $0 }, - defaults.publisher(for: .showLineNumbers, initial: true) + UserDefaults.standard.publisher(for: .showLineNumbers, initial: true) .sink { [weak self] in self?.showsLineNumber = $0 }, - defaults.publisher(for: .wrapLines, initial: true) + UserDefaults.standard.publisher(for: .wrapLines, initial: true) .sink { [weak self] in self?.wrapsLines = $0 }, - defaults.publisher(for: .showPageGuide, initial: true) + UserDefaults.standard.publisher(for: .showPageGuide, initial: true) .sink { [weak self] in self?.showsPageGuide = $0 }, - defaults.publisher(for: .showIndentGuides, initial: true) + UserDefaults.standard.publisher(for: .showIndentGuides, initial: true) .sink { [weak self] in self?.showsIndentGuides = $0 }, + + // observe theme change + ThemeManager.shared.didUpdateSetting + .filter { [weak self] in $0.old == self?.theme?.name } + .compactMap(\.new) + .throttle(for: 0.1, scheduler: DispatchQueue.main, latest: true) + .sink { [weak self] in self?.setTheme(name: $0) }, + + // observe appearance change for theme toggle + self.view.publisher(for: \.effectiveAppearance) + .sink { [weak self] appearance in + guard + let self, + !UserDefaults.standard[.pinsThemeAppearance], + self.view.window != nil, + let currentThemeName = self.theme?.name, + let themeName = ThemeManager.shared.equivalentSettingName(to: currentThemeName, forDark: appearance.isDark), + currentThemeName != themeName + else { return } + + self.setTheme(name: themeName) + }, + + // observe focus change + NotificationCenter.default.publisher(for: EditorTextView.didBecomeFirstResponderNotification) + .map { $0.object as! EditorTextView } + .compactMap { [weak self] textView in self?.editorViewControllers.first { $0.textView == textView } } + .sink { [weak self] in self?.focusedChild = $0 }, ] - - // observe theme change - self.themeChangeObserver = ThemeManager.shared.didUpdateSetting - .filter { [weak self] in $0.old == self?.theme?.name } - .compactMap(\.new) - .throttle(for: 0.1, scheduler: DispatchQueue.main, latest: true) - .sink { [weak self] in self?.setTheme(name: $0) } - - // observe appearance change for theme toggle - self.appearanceObserver = self.view.publisher(for: \.effectiveAppearance) - .sink { [weak self] appearance in - guard - let self, - !UserDefaults.standard[.pinsThemeAppearance], - self.view.window != nil, - let currentThemeName = self.theme?.name, - let themeName = ThemeManager.shared.equivalentSettingName(to: currentThemeName, forDark: appearance.isDark), - currentThemeName != themeName - else { return } - - self.setTheme(name: themeName) - } } @@ -186,16 +198,34 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool override class var restorableStateKeyPaths: [String] { - super.restorableStateKeyPaths + self.restorableNumberStateKeyPaths + super.restorableStateKeyPaths + [ + #keyPath(showsLineNumber), + #keyPath(showsPageGuide), + #keyPath(showsIndentGuides), + #keyPath(showsInvisibles), + #keyPath(wrapsLines), + #keyPath(verticalLayoutOrientation), + #keyPath(isAutoTabExpandEnabled), + #keyPath(writingDirection), + ] } override class func allowedClasses(forRestorableStateKeyPath keyPath: String) -> [AnyClass] { - if self.restorableNumberStateKeyPaths.contains(keyPath) { - [NSNumber.self] - } else { - super.allowedClasses(forRestorableStateKeyPath: keyPath) + switch keyPath { + case #keyPath(showsLineNumber), + #keyPath(showsPageGuide), + #keyPath(showsIndentGuides), + #keyPath(showsInvisibles), + #keyPath(wrapsLines), + #keyPath(verticalLayoutOrientation), + #keyPath(isAutoTabExpandEnabled), + #keyPath(writingDirection): + // -> Bool is also an NSNumber + [NSNumber.self] + default: + super.allowedClasses(forRestorableStateKeyPath: keyPath) } } @@ -229,13 +259,6 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool // MARK: Split View Controller Methods - override func splitView(_ splitView: NSSplitView, effectiveRect proposedEffectiveRect: NSRect, forDrawnRect drawnRect: NSRect, ofDividerAt dividerIndex: Int) -> NSRect { - - // avoid showing draggable cursor for the status bar boundary - .zero - } - - func validateToolbarItem(_ item: NSToolbarItem) -> Bool { // manually pass toolbar items to `validateUserInterfaceItem(_:)`, @@ -247,21 +270,11 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool override func validateUserInterfaceItem(_ item: any NSValidatedUserInterfaceItem) -> Bool { switch item.action { - case #selector(changeTheme): - if let item = item as? NSMenuItem { - item.state = (self.theme?.name == item.title) ? .on : .off - } - case #selector(toggleLineNumber): (item as? NSMenuItem)?.title = self.showsLineNumber ? String(localized: "Hide Line Numbers", table: "MainMenu") : String(localized: "Show Line Numbers", table: "MainMenu") - case #selector(toggleStatusBar): - (item as? NSMenuItem)?.title = self.statusBarItem?.isCollapsed == false - ? String(localized: "Hide Status Bar", table: "MainMenu") - : String(localized: "Show Status Bar", table: "MainMenu") - case #selector(togglePageGuide): (item as? NSMenuItem)?.title = self.showsPageGuide ? String(localized: "Hide Page Guide", table: "MainMenu") @@ -363,8 +376,21 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool case #selector(showOpacitySlider): return self.view.window?.styleMask.contains(.fullScreen) == false + case #selector(changeTheme): + if let item = item as? NSMenuItem { + item.state = (self.theme?.name == item.title) ? .on : .off + } + + case #selector(toggleSplitOrientation): + (item as? NSMenuItem)?.title = self.splitView.isVertical + ? String(localized: "Stack Editors Horizontally", table: "MainMenu") + : String(localized: "Stack Editors Vertically", table: "MainMenu") + + case #selector(focusNextSplitTextView), #selector(focusPrevSplitTextView): + return self.splitViewItems.count > 1 + case #selector(closeSplitTextView): - return self.splitViewController.splitViewItems.count > 1 + return self.splitViewItems.count > 1 default: break } @@ -388,13 +414,13 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool self.focusedTextView?.hasMarkedText() != true else { return } - self.document.analyzer.invalidateContent() + self.document.counter.invalidateContent() self.outlineParseDebouncer.schedule() // -> Perform in the next run loop to give layoutManagers time to update their values. let editedRange = textStorage.editedRange DispatchQueue.main.async { [weak self] in - self?.syntaxParser.highlight(around: editedRange) + self?.document.syntaxParser.highlight(around: editedRange) } } @@ -402,19 +428,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool /// Invoked when the selection did change. @objc private func textViewDidLiveChangeSelection(_ notification: Notification) { - self.document.analyzer.invalidateSelection() - } - - - /// The document updated its syntax. - private func didChangeSyntax() { - - for viewController in self.editorViewControllers { - viewController.apply(syntax: self.syntaxParser.syntax, name: self.syntaxParser.name) - } - - self.outlineParseDebouncer.perform() - self.syntaxParser.highlight() + self.document.counter.invalidateSelection() } @@ -424,7 +438,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool /// The text view currently focused on. var focusedTextView: EditorTextView? { - self.splitViewController.focusedChild?.textView ?? self.editorViewControllers.first?.textView + self.focusedChild?.textView ?? self.editorViewControllers.first?.textView } @@ -527,7 +541,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool var tabWidth: Int { get { - self.focusedTextView?.tabWidth ?? 0 + self.focusedTextView?.tabWidth ?? UserDefaults.standard[.tabWidth] } set { @@ -560,16 +574,11 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool guard let textView = self.focusedTextView, - let textStorage = textView.textStorage - else { return assertionFailure() } - - guard textStorage.length > 0 else { return } + let textStorage = textView.textStorage, + textStorage.length > 0 + else { return } textStorage.addAttributes(textView.typingAttributes, range: textStorage.range) - - self.editorViewControllers - .compactMap(\.textView) - .forEach { $0.setNeedsDisplay($0.visibleRect) } } @@ -579,7 +588,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool /// Recolors whole document. @IBAction func recolorAll(_ sender: Any?) { - self.syntaxParser.highlight() + self.document.syntaxParser.highlight() } @@ -597,13 +606,6 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool } - /// Toggles the visibility of status bar with fancy animation (sync all documents). - @IBAction func toggleStatusBar(_ sender: Any?) { - - UserDefaults.standard[.showStatusBar].toggle() - } - - /// Toggles the visibility of page guide line in the text views. @IBAction func togglePageGuide(_ sender: Any?) { @@ -744,7 +746,7 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool let opacityView = EditorOpacityView(window: self.view.window as? DocumentWindow) let viewController = NSHostingController(rootView: opacityView) - if #available(macOS 14, *), let toolbarItem = sender as? NSToolbarItem { + if let toolbarItem = sender as? NSToolbarItem { let popover = NSPopover() popover.behavior = .semitransient popover.contentViewController = viewController @@ -758,28 +760,41 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool } + /// Toggles divider orientation. + @IBAction func toggleSplitOrientation(_ sender: Any?) { + + self.splitView.isVertical.toggle() + self.splitState.isVertical = self.splitView.isVertical + + UserDefaults.standard[.splitViewVertical] = self.splitView.isVertical + } + + + /// Moves focus to the next text view. + @IBAction func focusNextSplitTextView(_ sender: Any?) { + + self.focusSplitTextView(onNext: true) + } + + + /// Moves focus to the previous text view. + @IBAction func focusPrevSplitTextView(_ sender: Any?) { + + self.focusSplitTextView(onNext: false) + } + + /// Splits editor view. @IBAction func openSplitTextView(_ sender: Any?) { - guard self.splitViewController.splitViewItems.count < maximumNumberOfSplitEditors else { return NSSound.beep() } + guard self.splitViewItems.count < Self.maximumNumberOfSplitEditors else { return NSSound.beep() } - guard - let currentEditorViewController = self.baseEditorViewController(for: sender) - else { return assertionFailure() } + guard let currentEditorViewController = self.baseEditorViewController(for: sender) else { return assertionFailure() } // end current editing NSTextInputContext.current?.discardMarkedText() let newEditorViewController = self.addEditorView(below: currentEditorViewController) - self.replace(document: self.document, in: newEditorViewController) - - // copy parsed syntax highlight - if let textView = newEditorViewController.textView, - let highlights = currentEditorViewController.textView?.layoutManager?.syntaxHighlights(), - !highlights.isEmpty - { - textView.layoutManager?.apply(highlights: highlights, range: textView.string.range) - } // adjust visible areas if let selectedRange = currentEditorViewController.textView?.selectedRange { @@ -796,19 +811,19 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool /// Closes one of the split editors. @IBAction func closeSplitTextView(_ sender: Any?) { - assert(self.splitViewController.splitViewItems.count > 1) + assert(self.splitViewItems.count > 1) guard let currentEditorViewController = self.baseEditorViewController(for: sender) else { return } if let textView = currentEditorViewController.textView { - NotificationCenter.default.removeObserver(self, name: NSTextView.didChangeSelectionNotification, object: textView) + NotificationCenter.default.removeObserver(self, name: EditorTextView.didLiveChangeSelectionNotification, object: textView) } // end current editing NSTextInputContext.current?.discardMarkedText() // move focus to the next text view if the view to close has a focus - if self.splitViewController.focusedChild == currentEditorViewController { + if self.focusedChild == currentEditorViewController { let children = self.editorViewControllers let deleteIndex = children.firstIndex(of: currentEditorViewController) ?? 0 let newFocusEditorViewController = children[safe: deleteIndex - 1] ?? children.last! @@ -818,63 +833,18 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool // close currentEditorViewController.removeFromParent() + + self.splitState.canClose = self.splitViewItems.count > 1 } // MARK: Private Methods - /// The document's syntax parser. - private var syntaxParser: SyntaxParser { - - self.document.syntaxParser - } - - /// The array of all child editor view controllers. private var editorViewControllers: [EditorViewController] { - self.splitViewController.children.compactMap { $0 as? EditorViewController } - } - - - /// Sets the receiver and its children with the given document. - private func updateDocument() { - - for editorViewController in self.editorViewControllers { - self.replace(document: self.document, in: editorViewController) - } - - // detect indent style - if UserDefaults.standard[.detectsIndentStyle], - let indentStyle = self.document.textStorage.string.detectedIndentStyle - { - self.isAutoTabExpandEnabled = switch indentStyle { - case .tab: false - case .space: true - } - } - - // start parsing syntax for highlighting and outlines - self.outlineParseDebouncer.perform() - self.document.syntaxParser.highlight() - - NotificationCenter.default.addObserver(self, selector: #selector(textStorageDidProcessEditing), - name: NSTextStorage.didProcessEditingNotification, - object: self.document.textStorage) - - // observe syntax change - self.documentSyntaxObserver = self.document.didChangeSyntax - .receive(on: RunLoop.main) - .sink { [weak self] _ in self?.didChangeSyntax() } - - // observe syntaxParser for outline update - self.outlineObserver = self.document.syntaxParser.$outlineItems - .removeDuplicates() - .receive(on: RunLoop.main) - .sink { [weak self] outlineItems in - self?.editorViewControllers.forEach { $0.outlineItems = outlineItems } - } + self.children.compactMap { $0 as? EditorViewController } } @@ -885,16 +855,16 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool @discardableResult private func addEditorView(below otherViewController: EditorViewController? = nil) -> EditorViewController { - let viewController = EditorViewController() + let viewController = EditorViewController(document: self.document, splitState: self.splitState) let splitViewItem = NSSplitViewItem(viewController: viewController) splitViewItem.minimumThickness = 100 // add to the split view - let index = otherViewController - .flatMap { self.splitViewController.children.firstIndex(of: $0) }? - .advanced(by: 1) ?? 0 - self.splitViewController.insertSplitViewItem(splitViewItem, at: index) + let index = otherViewController.flatMap(self.children.firstIndex(of:))?.advanced(by: 1) ?? 0 + self.insertSplitViewItem(splitViewItem, at: index) + + self.splitState.canClose = self.splitViewItems.count > 1 // observe cursor NotificationCenter.default.addObserver(self, selector: #selector(textViewDidLiveChangeSelection), @@ -919,22 +889,49 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool textView.theme = baseTextView.theme textView.tabWidth = baseTextView.tabWidth textView.isAutomaticTabExpansionEnabled = baseTextView.isAutomaticTabExpansionEnabled + + // copy parsed syntax highlight + if let highlights = baseTextView.layoutManager?.syntaxHighlights(), !highlights.isEmpty { + textView.layoutManager?.apply(highlights: highlights, range: textView.string.range) + } } return viewController } - /// Replaces the document in the editorViewController with the given document. + /// Finds the base `EditorViewController` for split editor management actions. /// - /// - Parameters: - /// - document: The new document to be replaced with. - /// - editorViewController: The editor view controller of which document is replaced. - private func replace(document: Document, in editorViewController: EditorViewController) { + /// - Parameter sender: The action sender. + /// - Returns: An editor view controller, or `nil` if not found. + private func baseEditorViewController(for sender: Any?) -> EditorViewController? { - editorViewController.setTextStorage(document.textStorage) - editorViewController.apply(syntax: document.syntaxParser.syntax, name: document.syntaxParser.name) - editorViewController.outlineItems = document.syntaxParser.outlineItems + if let view = sender as? NSView, + let controller = self.editorViewControllers.first(where: { view.isDescendant(of: $0.view) }) + { + controller + } else { + self.focusedChild + } + } + + + /// Moves focus to the next/previous text view. + /// + /// - Parameter onNext: Move to the next if `true`, otherwise previous. + private func focusSplitTextView(onNext: Bool) { + + let children = self.editorViewControllers + + guard children.count > 1 else { return } + guard let focusedChild = self.focusedChild, + let focusIndex = children.firstIndex(of: focusedChild), + let nextChild = onNext + ? children[safe: focusIndex + 1] ?? children.first + : children[safe: focusIndex - 1] ?? children.last + else { return assertionFailure() } + + self.view.window?.makeFirstResponder(nextChild.textView) } @@ -959,21 +956,4 @@ final class DocumentViewController: NSSplitViewController, ThemeChanging, NSTool self.invalidateRestorableState() } - - - /// Finds the base `EditorViewController` for split editor management actions. - /// - /// - Parameter sender: The action sender. - /// - Returns: An editor view controller, or `nil` if not found. - private func baseEditorViewController(for sender: Any?) -> EditorViewController? { - - if let view = sender as? NSView, - let controller = self.splitViewController.children - .first(where: { view.isDescendant(of: $0.view) }) as? EditorViewController - { - return controller - } - - return self.splitViewController.focusedChild - } } diff --git a/CotEditor/Sources/DocumentWindow.swift b/CotEditor/Sources/DocumentWindow.swift index 3cd69ed55..fef22b3a0 100644 --- a/CotEditor/Sources/DocumentWindow.swift +++ b/CotEditor/Sources/DocumentWindow.swift @@ -24,6 +24,8 @@ // import AppKit +import Defaults +import Shortcut final class DocumentWindow: NSWindow { @@ -89,28 +91,6 @@ final class DocumentWindow: NSWindow { } - override func miniaturize(_ sender: Any?) { - - super.miniaturize(sender) - - // workaround an issue with Stage Manager (2023-04 macOS 13, FB12129976, fixed on macOS 14) - if self.isFloating, ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 14 { - self.level = .normal - } - } - - - override func makeKey() { - - super.makeKey() - - // workaround an issue with Stage Manager (2023-04 macOS 13, FB12129976, fixed on macOS 14) - if self.isFloating, ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 14 { - self.level = .floating - } - } - - // MARK: Actions override func validateUserInterfaceItem(_ item: any NSValidatedUserInterfaceItem) -> Bool { diff --git a/CotEditor/Sources/DocumentWindowController.swift b/CotEditor/Sources/DocumentWindowController.swift index f8047a384..384a8bfcf 100644 --- a/CotEditor/Sources/DocumentWindowController.swift +++ b/CotEditor/Sources/DocumentWindowController.swift @@ -27,6 +27,7 @@ import AppKit import Combine import SwiftUI +import Defaults final class DocumentWindowController: NSWindowController, NSWindowDelegate { @@ -66,7 +67,7 @@ final class DocumentWindowController: NSWindowController, NSWindowDelegate { // MARK: Lifecycle - convenience init(document: Document) { + required init(document: Document) { let window = DocumentWindow(contentViewController: WindowContentViewController(document: document)) window.styleMask.update(with: .fullSizeContentView) @@ -81,7 +82,7 @@ final class DocumentWindowController: NSWindowController, NSWindowDelegate { window.setFrame(.init(origin: window.frame.origin, size: frameSize), display: false) } - self.init(window: window) + super.init(window: window) window.delegate = self @@ -125,27 +126,22 @@ final class DocumentWindowController: NSWindowController, NSWindowDelegate { } + required init?(coder: NSCoder) { + + fatalError("init(coder:) has not been implemented") + } + + // MARK: Window Controller Methods override unowned(unsafe) var document: AnyObject? { - willSet { - self.documentSyntaxObserver = nil - } - didSet { - guard let document = document as? Document else { return } - - if document != oldValue as? Document { - (self.contentViewController as? WindowContentViewController)?.document = document + self.documentSyntaxObserver = nil + if let document = document as? Document { + self.updateDocument(document) } - - // observe document's syntax change - self.documentSyntaxObserver = document.didChangeSyntax - .merge(with: Just(document.syntaxParser.name)) - .receive(on: RunLoop.main) - .sink { [weak self] in self?.selectSyntaxPopUpItem(with: $0) } } } @@ -197,6 +193,23 @@ final class DocumentWindowController: NSWindowController, NSWindowDelegate { // MARK: Private Methods + /// Updates document by passing it to the content view controller and updating the observation. + /// + /// - Parameter document: The new document. + private func updateDocument(_ document: Document) { + + if let viewController = self.contentViewController as? WindowContentViewController, viewController.document != document { + viewController.document = document + } + + // observe document's syntax change for toolbar + self.documentSyntaxObserver = document.didChangeSyntax + .merge(with: Just(document.syntaxParser.name)) + .receive(on: RunLoop.main) + .sink { [weak self] in self?.selectSyntaxPopUpItem(with: $0) } + } + + /// Restores the window opacity. private func restoreWindowOpacity() { @@ -336,14 +349,6 @@ private extension NSToolbarItem.Identifier { } -public extension NSToolbarItem.Identifier { - - /// The back-deployed version of the `.inspectorTrackingSeparator` to use the same identifier to the original one for the autosaving compatibility. - @backDeployed(before: macOS 14) - static var inspectorTrackingSeparator: Self { Self("NSToolbarInspectorTrackingSeparatorItemIdentifier") } -} - - extension DocumentWindowController: NSToolbarDelegate { func toolbarImmovableItemIdentifiers(_ toolbar: NSToolbar) -> Set { @@ -426,11 +431,7 @@ extension DocumentWindowController: NSToolbarDelegate { item.toolTip = String(localized: "Toolbar.inspector.tooltip", defaultValue: "Show document information", table: "Document") item.image = NSImage(systemSymbolName: "info.circle", accessibilityDescription: item.label) - item.action = if #available(macOS 14, *) { - #selector(NSSplitViewController.toggleInspector) - } else { - #selector(WindowContentViewController.toggleInspector) - } + item.action = #selector(NSSplitViewController.toggleInspector) item.visibilityPriority = .high return item @@ -566,8 +567,8 @@ extension DocumentWindowController: NSToolbarDelegate { defaultValue: "Tab Style", table: "Document") item.toolTip = String(localized: "Toolbar.tabStyle.tooltip.off", defaultValue: "Use spaces for indentation", table: "Document") - item.stateImages[.on] = NSImage(resource: .tabRightSplit) - item.stateImages[.off] = NSImage(resource: .tabRight) + item.stateImages[.on] = NSImage(resource: .tabForwardSplit) + item.stateImages[.off] = NSImage(resource: .tabForward) item.action = #selector(DocumentViewController.toggleAutoTabExpand) item.menu.items = [ .sectionHeader(title: String(localized: "Toolbar.tabStyle.menu.tabWidth.label", @@ -621,7 +622,8 @@ extension DocumentWindowController: NSToolbarDelegate { defaultValue: "Indent Guides", table: "Document") item.toolTip = String(localized: "Toolbar.indentGuides.tooltip.off", defaultValue: "Show indent guide lines", table: "Document") - item.stateImages[.on] = NSImage(resource: .textIndentguidesHide) + item.stateImages[.on] = NSImage(resource: .textIndentguides) + .withSymbolConfiguration(.init(paletteColors: [.tertiaryLabelColor, .labelColor])) item.stateImages[.off] = NSImage(resource: .textIndentguides) item.action = #selector(DocumentViewController.toggleIndentGuides) item.menuFormRepresentation = NSMenuItem(title: item.label, action: item.action, keyEquivalent: "") @@ -640,21 +642,6 @@ extension DocumentWindowController: NSToolbarDelegate { return item case .opacity: - guard #available(macOS 14, *) else { - let menuItem = NSMenuItem() - menuItem.view = OpacityHostingView(window: self.window as? DocumentWindow) - let item = MenuToolbarItem(itemIdentifier: itemIdentifier) - item.label = String(localized: "Toolbar.opacity.label", - defaultValue: "Opacity", table: "Document") - item.toolTip = String(localized: "Toolbar.opacity.tooltip", - defaultValue: "Change editor’s opacity", table: "Document") - item.image = NSImage(resource: .uiwindowOpacity) - item.target = self - item.showsIndicator = false - item.menu = NSMenu() - item.menu.items = [menuItem] - return item - } let item = NSToolbarItem(itemIdentifier: itemIdentifier) item.isBordered = true item.label = String(localized: "Toolbar.opacity.label", @@ -744,11 +731,6 @@ extension DocumentWindowController: NSToolbarDelegate { item.delegate = self return item - case .inspectorTrackingSeparator where ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 14: - let splitView = (self.contentViewController as! NSSplitViewController).splitView - let item = NSTrackingSeparatorToolbarItem(identifier: itemIdentifier, splitView: splitView, dividerIndex: 0) - return item - default: return NSToolbarItem(itemIdentifier: itemIdentifier) } diff --git a/CotEditor/Sources/Donation.swift b/CotEditor/Sources/Donation.swift new file mode 100644 index 000000000..d8d54e81a --- /dev/null +++ b/CotEditor/Sources/Donation.swift @@ -0,0 +1,68 @@ +// +// Donation.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-04-28. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +enum Donation { + + static let groupID = "21481959" + + enum ProductID { + + static let allCases = [Self.onetime, Self.continuous] + + static let onetime = "com.coteditor.CotEditor.donation.onetime" + static let continuous = "com.coteditor.CotEditor.donation.continuous.yearly" + } +} + + +enum BadgeType: Int, CaseIterable, Equatable { + + case mug + case invisible + + + var symbolName: String { + + switch self { + case .mug: "mug" + case .invisible: "circle.dotted" + } + } + + + var label: String { + + switch self { + case .mug: + String(localized: "BadgeType.mug.label", + defaultValue: "Coffee Mug", + table: "Donation") + case .invisible: + String(localized: "BadgeType.invisible.label", + defaultValue: "Invisible Coffee", + table: "Donation") + } + } +} diff --git a/CotEditor/Sources/DonationSettingsView.swift b/CotEditor/Sources/DonationSettingsView.swift new file mode 100644 index 000000000..3f72ee1ed --- /dev/null +++ b/CotEditor/Sources/DonationSettingsView.swift @@ -0,0 +1,248 @@ +// +// DonationSettingsView.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2023-11-13. +// +// --------------------------------------------------------------------------- +// +// © 2023-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import SwiftUI +import StoreKit +import Defaults + +struct DonationSettingsView: View { + +#if SPARKLE + var isInAppPurchaseAvailable = false +#else + var isInAppPurchaseAvailable = true +#endif + + @AppStorage(.donationBadgeType) private var badgeType: BadgeType + + @State private var error: (any Error)? + @State private var hasDonated = false + + + // MARK: View + + var body: some View { + + VStack(alignment: .leading) { + Text("CotEditor provides all features for free to everyone. You can support this project by offering coffee.", tableName: "DonationSettings") + .padding(.bottom, 10) + + if self.isInAppPurchaseAvailable { + HStack(alignment: .top, spacing: 18) { + VStack(alignment: .leading) { + Text("Continuous support", tableName: "DonationSettings") + .font(.system(size: 14)) + .accessibilityAddTraits(.isHeader) + + ProductView(id: Donation.ProductID.continuous, prefersPromotionalIcon: true) { + Label(String(localized: "donation.continuous.yearly.displayName", table: "InAppPurchase"), image: .bagCoffee) + .labelStyle(.iconOnly) + .font(.system(size: 40)) + .foregroundStyle(.secondary) + .productIconBorder() + } + + Link(String(localized: "Manage subscriptions", table: "DonationSettings"), + destination: URL(string: "itms-apps://apps.apple.com/account/subscriptions")!) + .textScale(.secondary) + .foregroundStyle(.tint) + .frame(maxWidth: .infinity) + .opacity(self.hasDonated ? 1 : 0) + .padding(.bottom, 10) + + Form { + Picker(String(localized: "Badge type:", table: "DonationSettings"), selection: $badgeType) { + ForEach(BadgeType.allCases, id: \.self) { item in + HStack { + Image(systemName: item.symbolName) + Text(item.label) + } + } + }.fixedSize() + + Text("As a proof of your kind support, a coffee badge appears on the status bar during continuous support.", tableName: "DonationSettings") + .foregroundStyle(.secondary) + .controlSize(.small) + }.disabled(!self.hasDonated) + } + .accessibilityElement(children: .contain) + .subscriptionStatusTask(for: Donation.groupID) { taskState in + self.hasDonated = taskState.value?.map(\.state).contains(.subscribed) == true + } + + Divider() + + VStack(alignment: .leading) { + Text("One-time donation", tableName: "DonationSettings") + .font(.system(size: 14)) + .accessibilityAddTraits(.isHeader) + + ProductView(id: Donation.ProductID.onetime, prefersPromotionalIcon: true) { + Label(String(localized: "donation.onetime.displayName", table: "InAppPurchase"), image: .espresso) + .labelStyle(.iconOnly) + }.productViewStyle(OnetimeProductViewStyle()) + } + .accessibilityElement(children: .contain) + } + .overlay(alignment: .top) { + if let error = self.error { + VStack { + let description = switch error { + case StoreKitError.networkError: + String(localized: "An internet connection is required to donate.", table: "DonationSettings") + default: + error.localizedDescription + } + Text("Donation is currently not available.", tableName: "DonationSettings") + Text(description) + .foregroundStyle(.tertiary) + .textScale(.secondary) + } + .textSelection(.enabled) + .accessibilityElement(children: .contain) + .padding(.vertical, 8) + .padding(.horizontal, 12) + .background(.background.shadow(.drop(radius: 3, y: 1.5)), + in: RoundedRectangle(cornerRadius: 8)) + .offset(y: 40) + } + } + .storeProductsTask(for: Donation.ProductID.allCases) { taskState in + self.error = switch taskState { + case .failure(let error): error + default: nil + } + } + + } else { + VStack(alignment: .center) { + Image(.bagCoffee) + .font(.system(size: 64, weight: .light)) + .foregroundStyle(.tertiary) + .padding(.vertical, 6) + Text("The donation feature is available only in CotEditor distributed in the App Store.", tableName: "DonationSettings") + .foregroundStyle(.secondary) + + if let url = URL(string: "itms-apps://itunes.apple.com/app/id1024640650") { + Link(String(localized: "Open in App Store", table: "DonationSettings"), destination: url) + } + if let url = URL(string: "https://github.com/sponsors/1024jp/") { + Link(String(localized: "Open GitHub Sponsors", table: "DonationSettings", comment: "\"GitHub Sponsors\" is the name of a service by GitHub. Check the official localization if exists."), destination: url) + } + } + .buttonStyle(.capsule) + .frame(maxWidth: .infinity, alignment: .center) + } + + HStack { + Spacer() + HelpLink(anchor: "settings_appearance") + } + } + .scenePadding() + .frame(minWidth: 600, idealWidth: 600) + } +} + + +private struct OnetimeProductViewStyle: ProductViewStyle { + + @State private var quantity = 1 + @State private var error: (any Error)? + + + func makeBody(configuration: Configuration) -> some View { + + switch configuration.state { + case .success(let product): + self.productView(product, icon: configuration.icon) + default: + ProductView(configuration) + } + } + + + /// Returns the view to display when the state is success. + @ViewBuilder private func productView(_ product: Product, icon: ProductViewStyleConfiguration.Icon) -> some View { + + HStack(alignment: .top, spacing: 10) { + icon + .font(.system(size: 22)) + .foregroundStyle(.secondary) + .productIconBorder() + .frame(width: 50, height: 50) + + VStack(alignment: .leading, spacing: 1) { + HStack(alignment: .firstTextBaseline, spacing: 4) { + HStack { + Text(product.displayName) + .fixedSize() + Text("× \(self.quantity)", tableName: "DonationSettings", comment: "multiple sign for the quantity of items to purchase") + .monospacedDigit() + .accessibilityLabel(String(localized: "\(self.quantity) cups", table: "DonationSettings", comment: "accessibility label for item quantity")) + .frame(minWidth: 28, alignment: .trailing) + }.accessibilityElement(children: .combine) + Stepper(value: $quantity, in: 1...99, label: EmptyView.init) + .accessibilityValue(String(localized: "\(self.quantity) cups", table: "DonationSettings")) + .accessibilityLabel(String(localized: "Quantity", table: "DonationSettings", comment: "accessibility label for item quantity stepper")) + Spacer() + Button((product.price * Decimal(self.quantity)).formatted(product.priceFormatStyle)) { + Task { + do { + _ = try await product.purchase(options: [.quantity(self.quantity)]) + } catch { + self.error = error + } + } + } + .monospacedDigit() + .fixedSize() + .contentTransition(.numericText()) + .animation(.default, value: self.quantity) + .accessibilitySortPriority(-1) + } + + Text(product.description) + .font(.system(size: 12)) + .foregroundStyle(.secondary) + .fixedSize(horizontal: false, vertical: true) + } + .accessibilityElement(children: .contain) + } + .alert(error: $error) + } +} + + + +// MARK: - Preview + +#Preview { + DonationSettingsView(isInAppPurchaseAvailable: true) +} + +#Preview("Non-AppStore version") { + DonationSettingsView(isInAppPurchaseAvailable: false) +} diff --git a/CotEditor/Sources/DraggableArrayController.swift b/CotEditor/Sources/DraggableArrayController.swift deleted file mode 100644 index 79196690c..000000000 --- a/CotEditor/Sources/DraggableArrayController.swift +++ /dev/null @@ -1,106 +0,0 @@ -// -// DraggableArrayController.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2014-08-18. -// -// --------------------------------------------------------------------------- -// -// © 2014-2023 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit - -final class DraggableArrayController: NSArrayController, NSTableViewDataSource { - - // MARK: Table Data Source Protocol - - /// Starts dragging. - func tableView(_ tableView: NSTableView, pasteboardWriterForRow row: Int) -> (any NSPasteboardWriting)? { - - tableView.registerForDraggedTypes([.string]) - - let item = NSPasteboardItem() - item.setString(String(row), forType: .string) - - return item - } - - - /// Validates when dragged items come to tableView. - func tableView(_ tableView: NSTableView, validateDrop info: any NSDraggingInfo, proposedRow row: Int, proposedDropOperation dropOperation: NSTableView.DropOperation) -> NSDragOperation { - - // accept only self drag-and-drop - guard info.draggingSource as? NSTableView == tableView else { return [] } - - if dropOperation == .on { - tableView.setDropRow(row, dropOperation: .above) - } - - return .move - } - - - /// Checks acceptability of dragged items and insert them to table. - func tableView(_ tableView: NSTableView, acceptDrop info: any NSDraggingInfo, row: Int, dropOperation: NSTableView.DropOperation) -> Bool { - - // accept only self drag-and-drop - guard info.draggingSource as? NSTableView == tableView else { return false } - - // obtain original rows from pasteboard - var sourceRows = IndexSet() - info.enumerateDraggingItems(options: .concurrent, for: tableView, classes: [NSPasteboardItem.self]) { (item, _, _) in - guard - let string = (item.item as? NSPasteboardItem)?.string(forType: .string), - let row = Int(string) - else { return } - - sourceRows.insert(row) - } - - let draggingItems = (self.arrangedObjects as AnyObject).objects(at: sourceRows) - - let destinationRow = row - sourceRows.count(in: 0...row) // real insertion point after removing items to move - let destinationRows = IndexSet(destinationRow..<(destinationRow + draggingItems.count)) - - // update - NSAnimationContext.runAnimationGroup { _ in - // update UI - var sourceOffset = 0 - var destinationOffset = 0 - - tableView.beginUpdates() - for sourceRow in sourceRows { - if sourceRow < row { - tableView.moveRow(at: sourceRow + sourceOffset, to: row - 1) - sourceOffset -= 1 - } else { - tableView.moveRow(at: sourceRow, to: row + destinationOffset) - destinationOffset += 1 - } - } - tableView.endUpdates() - - } completionHandler: { - // update data - self.remove(atArrangedObjectIndexes: sourceRows) - self.insert(contentsOf: draggingItems, atArrangedObjectIndexes: destinationRows) - } - - return true - } -} diff --git a/CotEditor/Sources/DraggableHostingView.swift b/CotEditor/Sources/DraggableHostingView.swift index c5c0999ce..d0192c86a 100644 --- a/CotEditor/Sources/DraggableHostingView.swift +++ b/CotEditor/Sources/DraggableHostingView.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -130,7 +130,7 @@ final class DraggableHostingView: NSHostingView where Content: // MARK: Private Methods /// The area the receiver located in the superview. - @MainActor private var preferredEdge: Edge? { + private var preferredEdge: Edge? { self.superview.flatMap { superview in Edge(horizontal: superview.frame.width/2 < self.frame.midX ? .right : .left, @@ -140,7 +140,7 @@ final class DraggableHostingView: NSHostingView where Content: /// Keeps position to be inside of the parent frame. - @MainActor private func adjustPosition() { + private func adjustPosition() { guard let superFrame = self.superview?.frame else { return assertionFailure() } diff --git a/CotEditor/Sources/EditSettingsView.swift b/CotEditor/Sources/EditSettingsView.swift index dd48fe47a..569203650 100644 --- a/CotEditor/Sources/EditSettingsView.swift +++ b/CotEditor/Sources/EditSettingsView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct EditSettingsView: View { @@ -114,7 +115,7 @@ struct EditSettingsView: View { HStack { Spacer() - HelpButton(anchor: "settings_edit") + HelpLink(anchor: "settings_edit") } } .scenePadding() diff --git a/CotEditor/Sources/EditingContext.swift b/CotEditor/Sources/EditingContext.swift new file mode 100644 index 000000000..eddf1f31e --- /dev/null +++ b/CotEditor/Sources/EditingContext.swift @@ -0,0 +1,49 @@ +// +// EditingContext.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-06-16. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import struct Foundation.NSRange + +public struct EditingContext: Equatable, Sendable { + + public var strings: [String] + public var ranges: [NSRange] + public var selectedRanges: [NSRange]? + + + /// Creates abstracted context how to edit strings in a text editor. + /// + /// - Parameters: + /// - strings: The strings to replace with. + /// - ranges: The ranges where replace with `strings`. + /// - selectedRanges: The new selected ranges, or `nil` to let the editor set them. + public init(strings: [String], ranges: [NSRange], selectedRanges: [NSRange]? = nil) { + + assert(strings.count == ranges.count) + + self.strings = strings + self.ranges = ranges + self.selectedRanges = selectedRanges + } +} diff --git a/CotEditor/Sources/EditorCounter.swift b/CotEditor/Sources/EditorCounter.swift index a427b8175..f5636c4bc 100644 --- a/CotEditor/Sources/EditorCounter.swift +++ b/CotEditor/Sources/EditorCounter.swift @@ -4,7 +4,7 @@ // CotEditor // https://coteditor.com // -// Created by 1024jp on 2017-03-05. +// Created by 1024jp on 2014-12-18. // // --------------------------------------------------------------------------- // @@ -23,24 +23,51 @@ // limitations under the License. // -actor EditorCounter { +import AppKit +import Observation + +extension NSValue: @retroactive @unchecked Sendable { } + + +protocol TextViewProvider: AnyObject { - struct Result: Equatable { + @MainActor var textView: NSTextView? { get } +} + +extension Document: TextViewProvider { } + + +struct EditorCount: Equatable { + + var entire: Int? + var selected = 0 + + + var formatted: String? { - struct Count: Equatable { - - var entire: Int? - var selected = 0 + if let entire, self.selected > 0 { + "\(entire.formatted()) (\(self.selected.formatted()))" + } else { + self.entire?.formatted() } + } +} + + +@MainActor final class EditorCounter { + + @Observable final class Result { - var characters = Count() - var lines = Count() - var words = Count() + var characters = EditorCount() + var lines = EditorCount() + var words = EditorCount() /// Cursor location from the beginning of the content. var location: Int? + /// Current line. var line: Int? + /// Cursor location from the beginning of the line. var column: Int? @@ -68,109 +95,137 @@ actor EditorCounter { // MARK: Public Properties - private(set) var result = Result() - private(set) var types: Types = [] + let result: Result = .init() + + weak var document: (any TextViewProvider)? // weak to avoid cycle retain + + var updatesAll = false { didSet { self.updateTypes() } } + var statusBarRequirements: Types = [] { didSet { self.updateTypes() } } + + + // MARK: Private Properties + + private var types: Types = [] + + private var contentTask: Task? + private var selectionTask: Task? // MARK: Public Methods - func update(types: Types) { + /// Cancels all remaining tasks. + func cancel() { - self.types = types + self.contentTask?.cancel() + self.selectionTask?.cancel() } - /// Update the given types by counting the given string. - /// - /// - Parameters: - /// - string: The string to count. - @discardableResult func count(string: String) throws -> Result { + /// Updates content counts. + func invalidateContent() { - guard !self.types.isDisjoint(with: .count) else { return self.result } + self.contentTask?.cancel() - if self.types.contains(.characters) { - try Task.checkCancellation() - self.result.characters.entire = string.count + guard !self.types.isDisjoint(with: .count) else { return } + + self.contentTask = Task { + try await Task.sleep(for: .milliseconds(20), tolerance: .milliseconds(20)) // debounce + + guard let string = self.document?.textView?.string.immutable else { return } + + if self.types.contains(.characters) { + try Task.checkCancellation() + self.result.characters.entire = await Task.detached { string.count }.value + } + + if self.types.contains(.lines) { + try Task.checkCancellation() + self.result.lines.entire = await Task.detached { string.numberOfLines }.value + } + + if self.types.contains(.words) { + try Task.checkCancellation() + self.result.words.entire = await Task.detached { string.numberOfWords }.value + } } - - if self.types.contains(.lines) { - try Task.checkCancellation() - self.result.lines.entire = string.numberOfLines - } - - if self.types.contains(.words) { - try Task.checkCancellation() - self.result.words.entire = string.numberOfWords - } - - return self.result } - /// Update the given types by counting the given string. - /// - /// - Parameters: - /// - selectedRanges: The editor's selected ranges. - /// - string: The string to count. - @discardableResult func move(selectedRanges: [Range], string: String) throws -> Result { + /// Updates selection-related values. + func invalidateSelection() { - assert(!selectedRanges.isEmpty) - assert(selectedRanges.map(\.upperBound).allSatisfy({ $0 <= string.endIndex })) + self.selectionTask?.cancel() - guard !self.types.isEmpty else { return self.result } + guard !self.types.isEmpty else { return } - let selectedStrings = selectedRanges.map { string[$0] } - let location = selectedRanges.first?.lowerBound ?? string.startIndex + self.selectionTask = Task { + try await Task.sleep(for: .milliseconds(200), tolerance: .milliseconds(40)) // debounce + + guard let textView = self.document?.textView else { return } + + let string = textView.string.immutable + let selectedRanges = textView.selectedRanges.compactMap { Range($0.rangeValue, in: string) } + + let selectedStrings = selectedRanges.map { string[$0] } + let location = selectedRanges.first?.lowerBound ?? string.startIndex + + if self.types.contains(.character) { + self.result.character = (selectedStrings.first?.compareCount(with: 1) == .equal) + ? selectedStrings.first?.first + : nil + } + + if self.types.contains(.characters) { + try Task.checkCancellation() + self.result.characters.selected = await Task.detached { selectedStrings.map(\.count).reduce(0, +) }.value + } + + if self.types.contains(.lines) { + try Task.checkCancellation() + self.result.lines.selected = await Task.detached { string.numberOfLines(in: selectedRanges) }.value + } + + if self.types.contains(.words) { + try Task.checkCancellation() + self.result.words.selected = await Task.detached { selectedStrings.map(\.numberOfWords).reduce(0, +) }.value + } + + if self.types.contains(.location) { + try Task.checkCancellation() + self.result.location = await Task.detached { string.distance(from: string.startIndex, to: location) }.value + } + + if self.types.contains(.line) { + try Task.checkCancellation() + self.result.line = await Task.detached { string.lineNumber(at: location) }.value + } + + if self.types.contains(.column) { + try Task.checkCancellation() + self.result.column = await Task.detached { string.columnNumber(at: location) }.value + } + } + } + + + // MARK: Private Methods + + /// Update types to count. + private func updateTypes() { - if self.types.contains(.characters) { - try Task.checkCancellation() - self.result.characters.selected = selectedStrings.map(\.count).reduce(0, +) + let oldValue = self.types + + self.types = self.updatesAll ? .all : self.statusBarRequirements + + if self.types.isEmpty { + self.contentTask?.cancel() + self.selectionTask?.cancel() + return } - if self.types.contains(.lines) { - try Task.checkCancellation() - self.result.lines.selected = string.numberOfLines(in: selectedRanges) - } - - if self.types.contains(.words) { - try Task.checkCancellation() - self.result.words.selected = selectedStrings.map(\.numberOfWords).reduce(0, +) - } - - if self.types.contains(.location) { - try Task.checkCancellation() - self.result.location = string.distance(from: string.startIndex, to: location) - } - - if self.types.contains(.line) { - try Task.checkCancellation() - self.result.line = string.lineNumber(at: location) - } - - if self.types.contains(.column) { - try Task.checkCancellation() - self.result.column = string.columnNumber(at: location) - } - - if self.types.contains(.character) { - self.result.character = (selectedStrings.first?.compareCount(with: 1) == .equal) - ? selectedStrings.first?.first - : nil - } - - return self.result - } -} - - -extension EditorCounter.Result.Count { - - var formatted: String? { - - if let entire, self.selected > 0 { - "\(entire.formatted()) (\(self.selected.formatted()))" - } else { - self.entire?.formatted() + if !self.types.intersection(.count).isSubset(of: oldValue.intersection(.count)) { + self.invalidateContent() } + self.invalidateSelection() } } diff --git a/CotEditor/Sources/EditorOpacityView.swift b/CotEditor/Sources/EditorOpacityView.swift index 0e88597e3..0d38db19e 100644 --- a/CotEditor/Sources/EditorOpacityView.swift +++ b/CotEditor/Sources/EditorOpacityView.swift @@ -25,39 +25,6 @@ import SwiftUI -@available(macOS, deprecated: 14) -@MainActor final class OpacityHostingView: NSHostingView { - - convenience init(window: DocumentWindow?) { - - assert(window != nil) - - self.init(rootView: EditorOpacityView(window: window)) - - self.frame.size = self.intrinsicContentSize - } - - - required init?(coder aDecoder: NSCoder) { - - // Implementing `init(coder:)` is required for toolbar item menu representation. - - let window = NSDocumentController.shared.currentDocument?.windowControllers.first?.window as? DocumentWindow - assert(window != nil) - - super.init(rootView: EditorOpacityView(window: window)) - - self.frame.size = self.intrinsicContentSize - } - - - @MainActor required init(rootView: EditorOpacityView) { - - super.init(rootView: rootView) - } -} - - struct EditorOpacityView: View { weak var window: DocumentWindow? @@ -73,7 +40,7 @@ struct EditorOpacityView: View { .foregroundStyle(.secondary) OpacitySlider(value: $opacity) - .onChange(of: self.opacity) { newValue in + .onChange(of: self.opacity) { (_, newValue) in self.window?.backgroundAlpha = newValue } .controlSize(.small) diff --git a/CotEditor/Sources/EditorTextView+Commenting.swift b/CotEditor/Sources/EditorTextView+Commenting.swift index 09fce3cbb..89b86e8e7 100644 --- a/CotEditor/Sources/EditorTextView+Commenting.swift +++ b/CotEditor/Sources/EditorTextView+Commenting.swift @@ -91,8 +91,6 @@ struct CommentTypes: OptionSet { extension Commenting { - // MARK: Public Methods - /// Comments out the selections by appending comment delimiters. /// /// - Parameters: @@ -101,32 +99,11 @@ extension Commenting { func commentOut(types: CommentTypes, fromLineHead: Bool) { guard - self.commentDelimiters.block != nil || self.commentDelimiters.inline != nil, - let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) + let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue), + let context = self.string.commentOut(types: types, delimiters: self.commentDelimiters, fromLineHead: fromLineHead, in: selectedRanges) else { return } - let items: [NSRange.InsertionItem] = { - let targetRanges = selectedRanges - .map { fromLineHead ? self.string.lineContentsRange(for: $0) : $0 } - .uniqued - - if types.contains(.inline), let delimiter = self.commentDelimiters.inline { - return self.string.inlineCommentOut(delimiter: delimiter, ranges: targetRanges) - } - if types.contains(.block), let delimiters = self.commentDelimiters.block { - return self.string.blockCommentOut(delimiters: delimiters, ranges: targetRanges) - } - return [] - }() - - guard !items.isEmpty else { return } - - let newStrings = items.map(\.string) - let replacementRanges = items.map { NSRange(location: $0.location, length: 0) } - let newSelectedRanges = selectedRanges.map { $0.inserted(items: items) } - - self.replace(with: newStrings, ranges: replacementRanges, selectedRanges: newSelectedRanges, - actionName: String(localized: "Comment Out", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Comment Out", table: "MainMenu")) } @@ -134,33 +111,11 @@ extension Commenting { func uncomment() { guard - self.commentDelimiters.block != nil || self.commentDelimiters.inline != nil, - let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) + let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue), + let context = self.string.uncomment(delimiters: self.commentDelimiters, in: selectedRanges) else { return } - let deletionRanges: [NSRange] = { - if let delimiters = self.commentDelimiters.block { - let targetRanges = selectedRanges.map { $0.isEmpty ? self.string.lineContentsRange(for: $0) : $0 }.uniqued - if let ranges = self.string.rangesOfBlockDelimiters(delimiters, ranges: targetRanges) { - return ranges - } - } - if let delimiter = self.commentDelimiters.inline { - let targetRanges = selectedRanges.map { self.string.lineContentsRange(for: $0) }.uniqued - if let ranges = self.string.rangesOfInlineDelimiter(delimiter, ranges: targetRanges) { - return ranges - } - } - return [] - }() - - guard !deletionRanges.isEmpty else { return } - - let newStrings = [String](repeating: "", count: deletionRanges.count) - let newSelectedRanges = selectedRanges.map { $0.removed(ranges: deletionRanges) } - - self.replace(with: newStrings, ranges: deletionRanges, selectedRanges: newSelectedRanges, - actionName: String(localized: "Uncomment", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Uncomment", table: "MainMenu")) } @@ -171,116 +126,8 @@ extension Commenting { /// - Returns: `true` when selection can be uncommented. func canUncomment(partly: Bool) -> Bool { - guard - self.commentDelimiters.block != nil || self.commentDelimiters.inline != nil, - let targetRanges = self.rangesForUserTextChange?.map(\.rangeValue) - .map(self.string.lineContentsRange(for:)) - .filter({ !$0.isEmpty }) - .uniqued, - !targetRanges.isEmpty - else { return false } + guard let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) else { return false } - if let delimiters = self.commentDelimiters.block, - let ranges = self.string.rangesOfBlockDelimiters(delimiters, ranges: targetRanges) - { - return partly ? true : (ranges.count == (2 * targetRanges.count)) - } - - if let delimiter = self.commentDelimiters.inline, - let ranges = self.string.rangesOfInlineDelimiter(delimiter, ranges: targetRanges) - { - let lineRanges = targetRanges.flatMap { self.string.lineContentsRanges(for: $0) }.uniqued - return partly ? true : (ranges.count == lineRanges.count) - } - - return false - } -} - - - -extension String { - - /// Returns the editing information to comment out the given `ranges` by appending inline-style comment delimiters. - /// - /// - Parameters: - /// - delimiter: The inline comment delimiter to insert. - /// - ranges: The ranges where to comment out. - /// - Returns: Items that contain editing information to insert comment delimiters. - func inlineCommentOut(delimiter: String, ranges: [NSRange]) -> [NSRange.InsertionItem] { - - let regex = try! NSRegularExpression(pattern: "^", options: [.anchorsMatchLines]) - - return ranges.flatMap { regex.matches(in: self, range: $0) } - .map(\.range.location) - .uniqued - .map { NSRange.InsertionItem(string: delimiter, location: $0, forward: true) } - } - - - /// Returns the editing information to comment out the given `ranges` by appending block-style comment delimiters. - /// - /// - Parameters: - /// - delimiters: The pair of block comment delimiters to insert. - /// - ranges: The ranges where to comment out. - /// - Returns: Items that contain editing information to insert comment delimiters. - func blockCommentOut(delimiters: Pair, ranges: [NSRange]) -> [NSRange.InsertionItem] { - - ranges.flatMap { - [NSRange.InsertionItem(string: delimiters.begin, location: $0.lowerBound, forward: true), - NSRange.InsertionItem(string: delimiters.end, location: $0.upperBound, forward: false)] - } - } - - - /// Finds inline-style delimiters in `ranges`. - /// - /// - Parameters: - /// - delimiter: The inline delimiter to find. - /// - ranges: The ranges where to find. - /// - Returns: Ranges where delimiters are, or `nil` when no delimiters was found. - func rangesOfInlineDelimiter(_ delimiter: String, ranges: [NSRange]) -> [NSRange]? { - - let ranges = ranges.filter { !$0.isEmpty } - - guard !ranges.isEmpty, !self.isEmpty else { return [] } - - let delimiterPattern = NSRegularExpression.escapedPattern(for: delimiter) - let pattern = "^[ \t]*(\(delimiterPattern))" - let regex = try! NSRegularExpression(pattern: pattern, options: [.anchorsMatchLines]) - - let delimiterRanges = ranges - .flatMap { regex.matches(in: self, range: $0) } - .map { $0.range(at: 1) } - .uniqued - - return delimiterRanges.isEmpty ? nil : delimiterRanges - } - - - /// Finds block-style delimiters in `ranges`. - /// - /// - Note: This method matches a block only when one of the given `ranges` fits exactly. - /// - /// - Parameters: - /// - delimiters: The pair of block delimiters to find. - /// - ranges: The ranges where to find. - /// - Returns: Ranges where delimiters are, or `nil` when no delimiters was found. - func rangesOfBlockDelimiters(_ delimiters: Pair, ranges: [NSRange]) -> [NSRange]? { - - let ranges = ranges.filter { !$0.isEmpty } - - guard !ranges.isEmpty, !self.isEmpty else { return [] } - - let beginPattern = NSRegularExpression.escapedPattern(for: delimiters.begin) - let endPattern = NSRegularExpression.escapedPattern(for: delimiters.end) - let pattern = "\\A[ \t]*(\(beginPattern)).*?(\(endPattern))[ \t]*\\Z" - let regex = try! NSRegularExpression(pattern: pattern, options: [.dotMatchesLineSeparators]) - - let delimiterRanges = ranges - .flatMap { regex.matches(in: self, range: $0) } - .flatMap { [$0.range(at: 1), $0.range(at: 2)] } - - return delimiterRanges.isEmpty ? nil : delimiterRanges + return self.string.canUncomment(partly: partly, delimiters: self.commentDelimiters, in: selectedRanges) } } diff --git a/CotEditor/Sources/EditorTextView+CursorMovement.swift b/CotEditor/Sources/EditorTextView+CursorMovement.swift index 13bc79c7f..462a1813b 100644 --- a/CotEditor/Sources/EditorTextView+CursorMovement.swift +++ b/CotEditor/Sources/EditorTextView+CursorMovement.swift @@ -584,34 +584,6 @@ extension EditorTextView { // MARK: Actions - /// Processes user's shortcut input. - override func performKeyEquivalent(with event: NSEvent) -> Bool { - - guard !super.performKeyEquivalent(with: event) else { return true } - - // interrupt for selectColumnUp/Down actions - guard - event.modifierFlags.intersection([.shift, .control, .option, .command]) == [.shift, .control], - let key = event.specialKey - else { return false } - - switch (key, self.layoutOrientation) { - case (.upArrow, .horizontal), - (.rightArrow, .vertical): - self.doCommand(by: #selector(selectColumnUp)) - return true - - case (.downArrow, .horizontal), - (.leftArrow, .vertical): - self.doCommand(by: #selector(selectColumnDown)) - return true - - default: - return false - } - } - - /// Adds insertion point just above the first selected range (^⇧↑). @IBAction func selectColumnUp(_ sender: Any?) { @@ -624,6 +596,16 @@ extension EditorTextView { self.addSelectedColumn(affinity: .upstream) } + + + /// Splits selections by lines. + @IBAction func splitSelectionByLines(_ sender: Any?) { + + guard let ranges = self.rangesForUserTextChange?.map(\.rangeValue) else { return } + + self.selectedRanges = ranges + .flatMap(self.string.lineContentsRanges(for:)) as [NSValue] + } } diff --git a/CotEditor/Sources/EditorTextView+Indenting.swift b/CotEditor/Sources/EditorTextView+Indenting.swift index 3eaafbdcd..b8f7b469e 100644 --- a/CotEditor/Sources/EditorTextView+Indenting.swift +++ b/CotEditor/Sources/EditorTextView+Indenting.swift @@ -32,26 +32,26 @@ extension EditorTextView: Indenting { /// Increases indent level. @IBAction func shiftRight(_ sender: Any?) { - if self.baseWritingDirection == .rightToLeft { - guard self.outdent() else { return } - } else { - guard self.indent() else { return } - } + let actionName = String(localized: "Shift Right", table: "MainMenu") - self.undoManager?.setActionName(String(localized: "Shift Right", table: "MainMenu")) + if self.baseWritingDirection == .rightToLeft { + guard self.outdent(actionName: actionName) else { return } + } else { + guard self.indent(actionName: actionName) else { return } + } } /// Decreases indent level. @IBAction func shiftLeft(_ sender: Any?) { - if self.baseWritingDirection == .rightToLeft { - guard self.indent() else { return } - } else { - guard self.outdent() else { return } - } + let actionName = String(localized: "Shift Left", table: "MainMenu") - self.undoManager?.setActionName(String(localized: "Shift Left", table: "MainMenu")) + if self.baseWritingDirection == .rightToLeft { + guard self.indent(actionName: actionName) else { return } + } else { + guard self.outdent(actionName: actionName) else { return } + } } @@ -96,114 +96,47 @@ extension EditorTextView: Indenting { extension Indenting { + private var indentStyle: IndentStyle { self.isAutomaticTabExpansionEnabled ? .space : .tab } + + /// Increases indent level. @discardableResult - func indent() -> Bool { + func indent(actionName: String? = nil) -> Bool { guard self.tabWidth > 0, let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) else { return false } - // get indent target - let string = self.string as NSString + let textEditing = self.string.indent(style: self.indentStyle, indentWidth: self.tabWidth, in: selectedRanges) - // create indent string to prepend - let indent = self.isAutomaticTabExpansionEnabled ? String(repeating: " ", count: self.tabWidth) : "\t" - let indentLength = indent.length - - // create shifted string - let lineRanges = string.lineRanges(for: selectedRanges, includingLastEmptyLine: true) - let newLines = lineRanges.map { indent + string.substring(with: $0) } - - // calculate new selection range - let newSelectedRanges = selectedRanges.map { selectedRange -> NSRange in - let shift = lineRanges.countPrefix { $0.location <= selectedRange.location } - let lineCount = lineRanges.count { selectedRange.intersects($0) } - let lengthDiff = max(lineCount - 1, 0) * indentLength - - return NSRange(location: selectedRange.location + shift * indentLength, - length: selectedRange.length + lengthDiff) - } - - // apply to textView - return self.replace(with: newLines, ranges: lineRanges, selectedRanges: newSelectedRanges) + return self.edit(with: textEditing, actionName: actionName) } /// Decreases indent level. @discardableResult - func outdent() -> Bool { + func outdent(actionName: String? = nil) -> Bool { guard self.tabWidth > 0, - let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) + let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue), + let textEditing = self.string.outdent(style: self.indentStyle, indentWidth: self.tabWidth, in: selectedRanges) else { return false } - // get indent target - let string = self.string as NSString - - // find ranges to remove - let lineRanges = string.lineRanges(for: selectedRanges) - let lines = lineRanges.map { string.substring(with: $0) } - let dropCounts = lines.map { line -> Int in - switch line.first { - case "\t": 1 - case " ": line.prefix(self.tabWidth).countPrefix { $0 == " " } - default: 0 - } - } - - // cancel if nothing to shift - guard dropCounts.contains(where: { $0 > 0 }) else { return false } - - // create shifted string - let newLines = zip(lines, dropCounts).map { String($0.dropFirst($1)) } - - // calculate new selection range - let droppedRanges: [NSRange] = zip(lineRanges, dropCounts) - .filter { $1 > 0 } - .map { NSRange(location: $0.location, length: $1) } - let newSelectedRanges = selectedRanges.map { selectedRange -> NSRange in - let offset = droppedRanges - .prefix { $0.location < selectedRange.location } - .map { (selectedRange.intersection($0) ?? $0).length } - .reduce(0, +) - let lengthDiff = droppedRanges - .compactMap { selectedRange.intersection($0)?.length } - .reduce(0, +) - - return NSRange(location: selectedRange.location - offset, - length: selectedRange.length - lengthDiff) - } - - // apply to textView - return self.replace(with: newLines, ranges: lineRanges, selectedRanges: newSelectedRanges) + return self.edit(with: textEditing) } /// Standardizes indentation of given ranges. func convertIndentation(style: IndentStyle) { - guard !self.string.isEmpty else { return } + guard + self.tabWidth > 0, + let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue), + let textEditing = self.string.convertIndentation(to: self.indentStyle, indentWidth: self.tabWidth, in: selectedRanges) + else { return } - // process whole document if no text selected - let ranges = self.selectedRange.isEmpty ? [self.string.nsRange] : self.selectedRanges.map(\.rangeValue) - - var replacementRanges: [NSRange] = [] - var replacementStrings: [String] = [] - - for range in ranges { - let selectedString = (self.string as NSString).substring(with: range) - let convertedString = selectedString.standardizingIndent(to: style, tabWidth: self.tabWidth) - - guard convertedString != selectedString else { continue } // no need to convert - - replacementRanges.append(range) - replacementStrings.append(convertedString) - } - - self.replace(with: replacementStrings, ranges: replacementRanges, selectedRanges: nil, - actionName: String(localized: "Convert Indentation", table: "MainMenu")) + self.edit(with: textEditing, actionName: String(localized: "Convert Indentation", table: "MainMenu")) } } diff --git a/CotEditor/Sources/EditorTextView+LineProcessing.swift b/CotEditor/Sources/EditorTextView+LineProcessing.swift index 545680677..ef5d570e4 100644 --- a/CotEditor/Sources/EditorTextView+LineProcessing.swift +++ b/CotEditor/Sources/EditorTextView+LineProcessing.swift @@ -25,6 +25,7 @@ import AppKit import SwiftUI +import Defaults extension EditorTextView { @@ -35,10 +36,10 @@ extension EditorTextView { guard let ranges = self.rangesForUserTextChange?.map(\.rangeValue), - let editingInfo = self.string.moveLineUp(in: ranges) + let context = self.string.moveLineUp(in: ranges) else { return NSSound.beep() } - self.edit(with: editingInfo, actionName: String(localized: "Move Line", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Move Line", table: "MainMenu")) self.scrollRangeToVisible(self.selectedRange) } @@ -48,10 +49,10 @@ extension EditorTextView { guard let ranges = self.rangesForUserTextChange?.map(\.rangeValue), - let editingInfo = self.string.moveLineDown(in: ranges) + let context = self.string.moveLineDown(in: ranges) else { return NSSound.beep() } - self.edit(with: editingInfo, actionName: String(localized: "Move Line", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Move Line", table: "MainMenu")) self.scrollRangeToVisible(self.selectedRange) } @@ -62,9 +63,9 @@ extension EditorTextView { // process whole document if no text selected let range = self.selectedRange.isEmpty ? self.string.nsRange : self.selectedRange - guard let editingInfo = self.string.sortLinesAscending(in: range) else { return } + guard let context = self.string.sortLinesAscending(in: range) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Sort Lines", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Sort Lines", table: "MainMenu")) } @@ -74,9 +75,9 @@ extension EditorTextView { // process whole document if no text selected let range = self.selectedRange.isEmpty ? self.string.nsRange : self.selectedRange - guard let editingInfo = self.string.reverseLines(in: range) else { return } + guard let context = self.string.reverseLines(in: range) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Reverse Lines", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Reverse Lines", table: "MainMenu")) } @@ -86,9 +87,9 @@ extension EditorTextView { // process whole document if no text selected let range = self.selectedRange.isEmpty ? self.string.nsRange : self.selectedRange - guard let editingInfo = self.string.shuffleLines(in: range) else { return } + guard let context = self.string.shuffleLines(in: range) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Shuffle Lines", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Shuffle Lines", table: "MainMenu")) } @@ -100,9 +101,9 @@ extension EditorTextView { // process whole document if no text selected let ranges = self.selectedRange.isEmpty ? [self.string.nsRange] : selectedRanges - guard let editingInfo = self.string.deleteDuplicateLine(in: ranges) else { return } + guard let context = self.string.deleteDuplicateLine(in: ranges) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Delete Duplicate Lines", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Delete Duplicate Lines", table: "MainMenu")) } @@ -111,9 +112,9 @@ extension EditorTextView { guard let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) else { return } - guard let editingInfo = self.string.duplicateLine(in: selectedRanges, lineEnding: self.lineEnding.rawValue) else { return } + guard let context = self.string.duplicateLine(in: selectedRanges, lineEnding: self.lineEnding.rawValue) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Duplicate Line", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Duplicate Line", table: "MainMenu")) } @@ -122,9 +123,9 @@ extension EditorTextView { guard let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) else { return } - guard let editingInfo = self.string.deleteLine(in: selectedRanges) else { return } + guard let context = self.string.deleteLine(in: selectedRanges) else { return } - self.edit(with: editingInfo, actionName: String(localized: "Delete Line", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Delete Line", table: "MainMenu")) } @@ -133,13 +134,13 @@ extension EditorTextView { guard let selectedRanges = self.rangesForUserTextChange?.map(\.rangeValue) else { return } - let editingInfo = if selectedRanges.contains(where: { !$0.isEmpty }) { + let context = if selectedRanges.contains(where: { !$0.isEmpty }) { self.string.joinLines(in: selectedRanges) } else { self.string.joinLines(after: selectedRanges) } - self.edit(with: editingInfo, actionName: String(localized: "Join Lines", table: "MainMenu")) + self.edit(with: context, actionName: String(localized: "Join Lines", table: "MainMenu")) } @@ -148,7 +149,7 @@ extension EditorTextView { let trimsWhitespaceOnlyLines = UserDefaults.standard[.trimsWhitespaceOnlyLines] - self.trimTrailingWhitespace(ignoresEmptyLines: !trimsWhitespaceOnlyLines) + self.trimTrailingWhitespace(ignoringEmptyLines: !trimsWhitespaceOnlyLines) } @@ -175,16 +176,8 @@ extension EditorTextView { } - // MARK: Private Methods - /// Replaces content according to EditingInfo. - private func edit(with info: String.EditingInfo, actionName: String) { - - self.replace(with: info.strings, ranges: info.ranges, selectedRanges: info.selectedRanges, actionName: actionName) - } - - /// Sorts lines in the text content. /// /// - Parameters: @@ -208,287 +201,15 @@ extension EditorTextView { } - -// MARK: - - -extension String { +extension NSTextView { - struct EditingInfo { + /// Trims all trailing whitespace with/without keeping editing point. + final func trimTrailingWhitespace(ignoringEmptyLines: Bool, keepingEditingPoint: Bool = false) { - var strings: [String] - var ranges: [NSRange] - var selectedRanges: [NSRange]? - } - - - /// Moves selected line up. - func moveLineUp(in ranges: [NSRange]) -> EditingInfo? { + let editingRanges = (self.rangesForUserTextChange ?? self.selectedRanges).map(\.rangeValue) - // get line ranges to process - let lineRanges = (self as NSString).lineRanges(for: ranges, includingLastEmptyLine: true) + guard let context = self.string.trimTrailingWhitespace(ignoringEmptyLines: ignoringEmptyLines, keepingEditingPoint: keepingEditingPoint, in: editingRanges) else { return } - // cannot perform Move Line Up if one of the selections is already in the first line - guard !lineRanges.isEmpty, lineRanges.first!.lowerBound != 0 else { return nil } - - var string = self as NSString - var replacementRange = NSRange() - var selectedRanges: [NSRange] = [] - - // swap lines - for lineRange in lineRanges { - let upperLineRange = string.lineRange(at: lineRange.location - 1) - var lineString = string.substring(with: lineRange) - var upperLineString = string.substring(with: upperLineRange) - - // last line - if lineString.last?.isNewline != true, let lineEnding = upperLineString.popLast() { - lineString.append(lineEnding) - } - - // swap - let editRange = lineRange.union(upperLineRange) - string = string.replacingCharacters(in: editRange, with: lineString + upperLineString) as NSString - replacementRange.formUnion(editRange) - - // move selected ranges in the line to move - for selectedRange in ranges { - if let intersectionRange = selectedRange.intersection(editRange) { - selectedRanges.append(intersectionRange.shifted(by: -upperLineRange.length)) - - } else if editRange.touches(selectedRange.location) { - selectedRanges.append(selectedRange.shifted(by: -upperLineRange.length)) - } - } - } - selectedRanges = selectedRanges.uniqued.sorted(\.location) - - let replacementString = string.substring(with: replacementRange) - - return EditingInfo(strings: [replacementString], ranges: [replacementRange], selectedRanges: selectedRanges) - } - - - /// Moves selected line down. - func moveLineDown(in ranges: [NSRange]) -> EditingInfo? { - - // get line ranges to process - let lineRanges = (self as NSString).lineRanges(for: ranges) - - // cannot perform Move Line Down if one of the selections is already in the last line - guard !lineRanges.isEmpty, (lineRanges.last!.upperBound != self.length || self.last?.isNewline == true) else { return nil } - - var string = self as NSString - var replacementRange = NSRange() - var selectedRanges: [NSRange] = [] - - // swap lines - for lineRange in lineRanges.reversed() { - let lowerLineRange = string.lineRange(at: lineRange.upperBound) - var lineString = string.substring(with: lineRange) - var lowerLineString = string.substring(with: lowerLineRange) - - // last line - if lowerLineString.last?.isNewline != true, let lineEnding = lineString.popLast() { - lowerLineString.append(lineEnding) - } - - // swap - let editRange = lineRange.union(lowerLineRange) - string = string.replacingCharacters(in: editRange, with: lowerLineString + lineString) as NSString - replacementRange.formUnion(editRange) - - // move selected ranges in the line to move - for selectedRange in ranges { - if let intersectionRange = selectedRange.intersection(editRange) { - let offset = (lineString.last?.isNewline == true) - ? lowerLineRange.length - : lowerLineRange.length + lowerLineString.last!.utf16.count - selectedRanges.append(intersectionRange.shifted(by: offset)) - - } else if editRange.touches(selectedRange.location) { - selectedRanges.append(selectedRange.shifted(by: lowerLineRange.length)) - } - } - } - selectedRanges = selectedRanges.uniqued.sorted(\.location) - - let replacementString = string.substring(with: replacementRange) - - return EditingInfo(strings: [replacementString], ranges: [replacementRange], selectedRanges: selectedRanges) - } - - - /// Sorts selected lines ascending. - func sortLinesAscending(in range: NSRange) -> EditingInfo? { - - self.sortLines(in: range) { $0.sorted(options: [.localized, .caseInsensitive]) } - } - - - /// Reverses selected lines. - func reverseLines(in range: NSRange) -> EditingInfo? { - - self.sortLines(in: range) { $0.reversed() } - } - - - /// Shuffles selected lines. - func shuffleLines(in range: NSRange) -> EditingInfo? { - - self.sortLines(in: range) { $0.shuffled() } - } - - - /// Deletes duplicate lines in selection. - func deleteDuplicateLine(in ranges: [NSRange]) -> EditingInfo? { - - let string = self as NSString - let lineContentRanges = ranges - .map { string.lineRange(for: $0) } - .flatMap { self.lineContentsRanges(for: $0) } - .uniqued - .sorted(\.location) - - var replacementRanges: [NSRange] = [] - var uniqueLines: [String] = [] - for lineContentRange in lineContentRanges { - let line = string.substring(with: lineContentRange) - - if uniqueLines.contains(line) { - replacementRanges.append(string.lineRange(for: lineContentRange)) - } else { - uniqueLines.append(line) - } - } - - guard !replacementRanges.isEmpty else { return nil } - - let replacementStrings = [String](repeating: "", count: replacementRanges.count) - - return EditingInfo(strings: replacementStrings, ranges: replacementRanges, selectedRanges: nil) - } - - - /// Duplicates selected lines below. - func duplicateLine(in ranges: [NSRange], lineEnding: Character) -> EditingInfo? { - - let string = self as NSString - var replacementStrings: [String] = [] - var replacementRanges: [NSRange] = [] - var selectedRanges: [NSRange] = [] - - // group the ranges sharing the same lines - let rangeGroups: [[NSRange]] = ranges.sorted(\.location) - .reduce(into: []) { (groups, range) in - if let last = groups.last?.last, - string.lineRange(for: last).intersects(string.lineRange(for: range)) - { - groups[groups.endIndex - 1].append(range) - } else { - groups.append([range]) - } - } - - var offset = 0 - for group in rangeGroups { - let unionRange = group.reduce(into: group[0]) { $0.formUnion($1) } - let lineRange = string.lineRange(for: unionRange) - let replacementRange = NSRange(location: lineRange.location, length: 0) - var lineString = string.substring(with: lineRange) - - // add line break if it's the last line - if lineString.last?.isNewline != true { - lineString.append(lineEnding) - } - - replacementStrings.append(lineString) - replacementRanges.append(replacementRange) - - offset += lineString.length - for range in group { - selectedRanges.append(range.shifted(by: offset)) - } - } - - return EditingInfo(strings: replacementStrings, ranges: replacementRanges, selectedRanges: selectedRanges) - } - - - /// Removes selected lines. - func deleteLine(in ranges: [NSRange]) -> EditingInfo? { - - guard !ranges.isEmpty else { return nil } - - let lineRanges = (self as NSString).lineRanges(for: ranges) - let replacementStrings = [String](repeating: "", count: lineRanges.count) - - var selectedRanges: [NSRange] = [] - var offset = 0 - for range in lineRanges { - selectedRanges.append(NSRange(location: range.location + offset, length: 0)) - offset -= range.length - } - selectedRanges = selectedRanges.uniqued.sorted(\.location) - - return EditingInfo(strings: replacementStrings, ranges: lineRanges, selectedRanges: selectedRanges) - } - - - /// Joins lines in the ranges by replacing continuous whitespaces with a space. - func joinLines(in ranges: [NSRange]) -> EditingInfo { - - let replacementStrings = ranges - .map { (self as NSString).substring(with: $0) } - .map { $0.replacing(/\s*\R\s*/, with: " ") } - var selectedRanges: [NSRange] = [] - var offset = 0 - for (range, replacementString) in zip(ranges, replacementStrings) { - selectedRanges.append(NSRange(location: range.location + offset, length: replacementString.length)) - offset += replacementString.length - range.length - } - - return EditingInfo(strings: replacementStrings, ranges: ranges, selectedRanges: selectedRanges) - } - - - /// Joins each of lines containing the given ranges with the subsequent line by replacing continuous whitespaces with a space. - func joinLines(after ranges: [NSRange]) -> EditingInfo { - - let lineRanges = (self as NSString).lineRanges(for: ranges) - let replacementRanges = lineRanges - .map { (self as NSString).range(of: #"\s*\R\s*"#, options: .regularExpression, range: NSRange($0.lowerBound.. [String]) -> EditingInfo? { - - let string = self as NSString - let lineEndingRange = string.range(of: "\\R", options: .regularExpression, range: range) - - // do nothing with single line - guard !lineEndingRange.isNotFound else { return nil } - - let lineEnding = string.substring(with: lineEndingRange) - let lineRange = string.lineContentsRange(for: range) - let lines = string - .substring(with: lineRange) - .components(separatedBy: .newlines) - let newString = predicate(lines) - .joined(separator: lineEnding) - - return EditingInfo(strings: [newString], ranges: [lineRange], selectedRanges: [lineRange]) + self.edit(with: context, actionName: String(localized: "Trim Trailing Whitespace", table: "MainMenu")) } } diff --git a/CotEditor/Sources/EditorTextView+Transformation.swift b/CotEditor/Sources/EditorTextView+Transformation.swift index e565b82e1..240711d1a 100644 --- a/CotEditor/Sources/EditorTextView+Transformation.swift +++ b/CotEditor/Sources/EditorTextView+Transformation.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import AppKit +import UnicodeNormalization extension EditorTextView { diff --git a/CotEditor/Sources/EditorTextView.swift b/CotEditor/Sources/EditorTextView.swift index 7ccd0f98f..db3f04bee 100644 --- a/CotEditor/Sources/EditorTextView.swift +++ b/CotEditor/Sources/EditorTextView.swift @@ -26,6 +26,8 @@ import AppKit import Combine +import Defaults +import Shortcut private extension NSAttributedString.Key { @@ -35,12 +37,18 @@ private extension NSAttributedString.Key { // MARK: - -class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursorEditing { +final class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursorEditing { + + @MainActor protocol Delegate: AnyObject { + + func editorTextView(_ textView: EditorTextView, readDroppedURLs URLs: [URL]) -> Bool + } + // MARK: Notification Names - static let didBecomeFirstResponderNotification = Notification.Name("TextViewDidBecomeFirstResponder") - static let didLiveChangeSelectionNotification = Notification.Name("TextViewDidLiveChangeSelectionNotification") + nonisolated static let didBecomeFirstResponderNotification = Notification.Name("TextViewDidBecomeFirstResponder") + nonisolated static let didLiveChangeSelectionNotification = Notification.Name("TextViewDidLiveChangeSelectionNotification") // MARK: Enums @@ -56,6 +64,9 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor // MARK: Public Properties + var lineEnding: LineEnding = .lf + + var syntaxName: String = SyntaxName.none var mode: ModeOptions = ModeOptions() { didSet { if mode != oldValue { self.applyMode() } } } var theme: Theme? { didSet { self.applyTheme() } } @@ -79,26 +90,11 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor var lineHighlightRects: [NSRect] = [] private(set) var lineHighlightColor: NSColor? - var insertionLocations: [Int] = [] { - - didSet { - self.needsUpdateInsertionIndicators = true - self.updateInsertionPointTimer() - } - } + var insertionLocations: [Int] = [] { didSet { self.needsUpdateInsertionIndicators = true } } var selectionOrigins: [Int] = [] - var insertionPointTimer: (any DispatchSourceTimer)? - var insertionPointOn = false + var insertionIndicators: [NSTextInsertionIndicator] = [] private(set) var isPerformingRectangularSelection = false - @available(macOS 14, *) - var insertionIndicators: [NSTextInsertionIndicator] { - - get { self._insertionIndicators.compactMap { $0 as? NSTextInsertionIndicator } } - set { self._insertionIndicators = newValue } - } - private var _insertionIndicators: [NSView] = [] - // for Scaling extension var initialMagnificationScale: CGFloat = 0 var deferredMagnification: CGFloat = 0 @@ -129,7 +125,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor private var partialCompletionWord: String? private lazy var completionDebouncer = Debouncer { [weak self] in self?.performCompletion() } - private lazy var trimTrailingWhitespaceTask = Debouncer { [weak self] in self?.trimTrailingWhitespace(ignoresEmptyLines: !UserDefaults.standard[.trimsWhitespaceOnlyLines], keepingEditingPoint: true) } + private lazy var trimTrailingWhitespaceTask = Debouncer { [weak self] in self?.trimTrailingWhitespace(ignoringEmptyLines: !UserDefaults.standard[.trimsWhitespaceOnlyLines], keepingEditingPoint: true) } private var defaultsObservers: Set = [] private var fontObservers: Set = [] @@ -140,15 +136,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor // MARK: Lifecycle - convenience init() { - - self.init(frame: .zero, textContainer: nil) - } - - - required override init(frame: NSRect, textContainer: NSTextContainer?) { - - assert(textContainer == nil) + required override init(frame: NSRect = .zero) { // setup textContainer and layoutManager let textContainer = TextContainer() @@ -171,12 +159,9 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor self.textContainerInset = Self.textContainerInset // set NSTextView behaviors - self.baseWritingDirection = .leftToRight // default is fixed in LTR - self.allowsDocumentBackgroundColorChange = false self.allowsUndo = true self.isRichText = false - self.usesFindPanel = true - self.acceptsGlyphInfo = true + self.baseWritingDirection = .leftToRight // default is fixed in LTR self.linkTextAttributes = [.cursor: NSCursor.pointingHand, .underlineStyle: NSUnderlineStyle.single.rawValue] @@ -243,7 +228,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor deinit { - self.insertionPointTimer?.cancel() self.instanceHighlightTask?.cancel() } @@ -347,17 +331,20 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor .sink { [weak self] in self?.drawsBackground = $0 self?.enclosingScrollView?.drawsBackground = $0 - self?.lineHighlightColor = self?.theme?.lineHighlightColor(forOpaqueBackground: $0) } // observe key window state for insertion points drawing - if #available(macOS 14, *), let window { + if let window { self.keyStateObservers = [ - NotificationCenter.default.addObserver(forName: NSWindow.didBecomeKeyNotification, object: window, queue: .main) { [weak self] _ in - self?.invalidateInsertionIndicatorDisplayMode() + NotificationCenter.default.addObserver(forName: NSWindow.didBecomeKeyNotification, object: window, queue: .main) { [unowned self] _ in + MainActor.assumeIsolated { + self.invalidateInsertionIndicatorDisplayMode() + } }, - NotificationCenter.default.addObserver(forName: NSWindow.didResignKeyNotification, object: window, queue: .main) { [weak self] _ in - self?.invalidateInsertionIndicatorDisplayMode() + NotificationCenter.default.addObserver(forName: NSWindow.didResignKeyNotification, object: window, queue: .main) { [unowned self] _ in + MainActor.assumeIsolated { + self.invalidateInsertionIndicatorDisplayMode() + } }, ] } else { @@ -408,7 +395,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor self.mouseDownPoint = self.convert(event.locationInWindow, from: nil) self.isPerformingRectangularSelection = event.modifierFlags.contains(.option) self.needsUpdateInsertionIndicators = true // to draw dummy indicator for proper one while selecting - self.updateInsertionPointTimer() let selectedRange = self.selectedRange.isEmpty ? self.selectedRange : nil @@ -440,7 +426,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor } self.isPerformingRectangularSelection = false - self.updateInsertionPointTimer() } @@ -449,8 +434,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor // perform snippet insertion if not in the middle of Japanese input if !self.hasMarkedText(), let shortcut = Shortcut(keyDownEvent: event), - let document = self.document, - let snippet = SnippetManager.shared.snippet(for: shortcut, scope: document.syntaxParser.name) + let snippet = SnippetManager.shared.snippet(for: shortcut, scope: self.syntaxName) { return self.insert(snippet: snippet) } @@ -484,9 +468,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor self.instanceHighlightTask?.cancel() // trim trailing whitespace if needed - if UserDefaults.standard[.autoTrimsTrailingWhitespace], - self.document?.isLocked != true - { + if UserDefaults.standard[.autoTrimsTrailingWhitespace] { self.trimTrailingWhitespaceTask.schedule(delay: .seconds(3)) } @@ -787,8 +769,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor self.selectionOrigins = [self.selectedRange.location] } - self.updateInsertionPointTimer() - self.needsUpdateLineHighlight = true // invalidate current instances highlight @@ -943,7 +923,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor super.viewWillDraw() - if #available(macOS 14, *), self.needsUpdateInsertionIndicators { + if self.needsUpdateInsertionIndicators { self.updateInsertionIndicators() self.needsUpdateInsertionIndicators = false } @@ -992,16 +972,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor NSGraphicsContext.restoreGraphicsState() } } - - // draw zero-width insertion points while rectangular selection - // -> Because the insertion point blink timer stops while dragging. (macOS 10.14) - if self.needsDrawInsertionPoints, ProcessInfo.processInfo.operatingSystemVersion.majorVersion < 14 { - self.insertionRanges - .filter(\.isEmpty) - .flatMap { self.insertionPointRects(at: $0.location) } - .filter { $0.intersects(dirtyRect) } - .forEach { super.drawInsertionPoint(in: $0, color: self.insertionPointColor, turnedOn: self.insertionPointOn) } - } } @@ -1043,6 +1013,9 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor let keyPath = (orientation == .vertical) ? \NSSize.height : \NSSize.width self.frame.size[keyPath: keyPath] = self.visibleRect.width * self.scale } + + // update keyboard shortcuts + NSApp.mainMenu?.updateAll() } @@ -1052,7 +1025,7 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor // on file drop if pboard.name == .drag, let urls = pboard.readObjects(forClasses: [NSURL.self]) as? [URL], - self.insertDroppedFiles(urls) + (self.delegate as? any Delegate)?.editorTextView(self, readDroppedURLs: urls) == true { return true } @@ -1131,6 +1104,44 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor override func validateUserInterfaceItem(_ item: any NSValidatedUserInterfaceItem) -> Bool { switch item.action { + case #selector(selectColumnUp): + if let menuItem = item as? NSMenuItem { + switch self.layoutOrientation { + case .horizontal: + if menuItem.keyEquivalent == NSEvent.SpecialKey.rightArrow.string { + menuItem.keyEquivalent = NSEvent.SpecialKey.upArrow.string + } + menuItem.title = String(localized: "Select Column Up", table: "MainMenu") + case .vertical: + if menuItem.keyEquivalent == NSEvent.SpecialKey.upArrow.string { + menuItem.keyEquivalent = NSEvent.SpecialKey.rightArrow.string + } + menuItem.title = String(localized: "Select Column Right", table: "MainMenu", + comment: "vertical orientation version of the Select Column Up command") + @unknown default: + assertionFailure() + } + } + + case #selector(selectColumnDown): + if let menuItem = item as? NSMenuItem { + switch self.layoutOrientation { + case .horizontal: + if menuItem.keyEquivalent == NSEvent.SpecialKey.leftArrow.string { + menuItem.keyEquivalent = NSEvent.SpecialKey.downArrow.string + } + menuItem.title = String(localized: "Select Column down", table: "MainMenu") + case .vertical: + if menuItem.keyEquivalent == NSEvent.SpecialKey.downArrow.string { + menuItem.keyEquivalent = NSEvent.SpecialKey.leftArrow.string + } + menuItem.title = String(localized: "Select Column Left", table: "MainMenu", + comment: "vertical orientation version of the Select Column Down command") + @unknown default: + assertionFailure() + } + } + case #selector(performTextFinderAction): guard let action = TextFinder.Action(rawValue: item.tag) else { return false } return self.textFinder.validateAction(action) @@ -1168,12 +1179,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor // MARK: Public Accessors - var lineEnding: LineEnding { - - self.document?.lineEnding ?? .lf - } - - /// Tab width in number of spaces. var tabWidth: Int = 4 { @@ -1337,16 +1342,21 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor } - - // MARK: Private Methods - - /// The document object representing the text view contents. - private var document: Document? { + /// Selects the content of the enclosing paired symbols, such as brackets or quotation marks. + @IBAction func selectEnclosingSymbols(_ sender: Any?) { - self.window?.windowController?.document as? Document + guard + let selectedRange = Range(self.selectedRange, in: self.string), + let enclosingRange = self.string.rangeOfEnclosingBracePair(at: selectedRange, candidates: BracePair.braces + [.ltgt]) + else { return } + + self.selectedRange = NSRange(enclosingRange, in: self.string) } + + // MARK: Private Methods + /// Updates coloring settings with the current theme. private func applyTheme() { @@ -1358,12 +1368,10 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor self.textColor = theme.text.color self.backgroundColor = theme.background.color - self.lineHighlightColor = theme.lineHighlightColor(forOpaqueBackground: self.isOpaque) + self.lineHighlightColor = theme.lineHighlight.color self.insertionPointColor = theme.effectiveInsertionPointColor - if #available(macOS 14, *) { - for indicator in self.insertionIndicators { - indicator.color = self.insertionPointColor - } + for indicator in self.insertionIndicators { + indicator.color = self.insertionPointColor } self.selectedTextAttributes[.backgroundColor] = theme.effectiveSelectionColor(for: self.effectiveAppearance) (self.layoutManager as? LayoutManager)?.invisiblesColor = theme.invisibles.color @@ -1481,48 +1489,6 @@ class EditorTextView: NSTextView, Themable, CurrentLineHighlighting, MultiCursor } - /// Inserts string representation of dropped files applying the user's file drop settings. - /// - /// - Parameter urls: The file URLs of dropped files. - /// - Returns: Whether the file drop was performed. - private func insertDroppedFiles(_ urls: [URL]) -> Bool { - - guard !urls.isEmpty else { return false } - - let fileDropItems = UserDefaults.standard[.fileDropArray].map(FileDropItem.init(dictionary:)) - let documentURL = self.document?.fileURL - let syntax = self.document?.syntaxParser.name - - let replacementString = urls.reduce(into: "") { (string, url) in - if url.pathExtension == "textClipping", let textClipping = try? TextClipping(contentsOf: url) { - string += textClipping.string - return - } - - if let fileDropItem = fileDropItems.first(where: { $0.supports(extension: url.pathExtension, scope: syntax) }) { - string += fileDropItem.dropText(forFileURL: url, documentURL: documentURL) - return - } - - // just insert the absolute path if no specific setting for the file type was found - // -> This is the default behavior of NSTextView by file dropping. - if !string.isEmpty { - string += self.lineEnding.string - } - - string += url.isFileURL ? url.path : url.absoluteString - } - - // insert drop text to view - guard self.shouldChangeText(in: self.rangeForUserTextChange, replacementString: replacementString) else { return false } - - self.replaceCharacters(in: self.rangeForUserTextChange, with: replacementString) - self.didChangeText() - - return true - } - - /// Highlights the brace matching to the brace next to the cursor. private func highlightMatchingBrace() { @@ -1607,7 +1573,7 @@ extension EditorTextView: TextFinderClient { let action = TextFinder.Action(rawValue: tag) else { return } - self.textFinder.performAction(action) + self.textFinder.performAction(action, representedItem: (sender as? NSMenuItem)?.representedObject) } @@ -1664,7 +1630,7 @@ extension EditorTextView { // do nothing if completion is not suggested from the typed characters guard !charRange.isEmpty else { return nil } - var candidateWords = OrderedSet() + var candidateWords: [String] = [] let partialWord = (self.string as NSString).substring(with: charRange) // add words in document @@ -1701,7 +1667,7 @@ extension EditorTextView { return [] } - return candidateWords.array + return candidateWords.uniqued } diff --git a/CotEditor/Sources/EditorTextViewController.swift b/CotEditor/Sources/EditorTextViewController.swift index aea80eca4..252bf4406 100644 --- a/CotEditor/Sources/EditorTextViewController.swift +++ b/CotEditor/Sources/EditorTextViewController.swift @@ -27,6 +27,8 @@ import AppKit import Combine import SwiftUI +import CharacterInfo +import Defaults final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, NSTextViewDelegate { @@ -40,28 +42,52 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, // MARK: Public Properties - private(set) weak var textView: EditorTextView? + @ViewLoading private(set) var textView: EditorTextView // MARK: Private Properties + private let document: NSDocument + private var stackView: NSStackView? { self.view as? NSStackView } - private weak var lineNumberView: LineNumberView? + @ViewLoading private var lineNumberView: LineNumberView private weak var advancedCounterView: NSView? - private weak var horizontalCounterConstraint: NSLayoutConstraint? - private var orientationObserver: AnyCancellable? - private var writingDirectionObserver: AnyCancellable? - private var defaultsObservers: Set = [] + private var observers: Set = [] // MARK: Lifecycle + init(document: NSDocument) { + + self.document = document + + super.init(nibName: nil, bundle: nil) + } + + + required init?(coder: NSCoder) { + + fatalError("init(coder:) has not been implemented") + } + + + deinit { + // detach layoutManager safely + guard + let textStorage = self.textView.textStorage, + let layoutManager = self.textView.layoutManager + else { return assertionFailure() } + + textStorage.removeLayoutManager(layoutManager) + } + + override func loadView() { - let textView = if #available(macOS 14, *) { EditorTextView() } else { LegacyEditorTextView() } + let textView = EditorTextView() textView.delegate = self let scrollView = BidiScrollView() @@ -71,7 +97,8 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, scrollView.documentView = textView scrollView.identifier = NSUserInterfaceItemIdentifier("EditorScrollView") - let lineNumberView = LineNumberView(textView: textView) + let lineNumberView = LineNumberView() + lineNumberView.textView = textView let stackView = NSStackView(views: [lineNumberView, scrollView]) stackView.spacing = 0 @@ -90,30 +117,31 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, // set identifier for state restoration self.identifier = NSUserInterfaceItemIdentifier("EditorTextViewController") - // observe text orientation for line number view - self.orientationObserver = self.textView!.publisher(for: \.layoutOrientation, options: .initial) - .sink { [weak self] orientation in - self?.stackView?.orientation = switch orientation { - case .horizontal: .horizontal - case .vertical: .vertical - @unknown default: fatalError() - } - self?.lineNumberView?.orientation = orientation - } - - // let line number view position follow writing direction - self.writingDirectionObserver = self.textView!.publisher(for: \.baseWritingDirection) - .removeDuplicates() - .map { ($0 == .rightToLeft) ? NSUserInterfaceLayoutDirection.rightToLeft : .leftToRight } - .sink { [weak self] direction in - self?.stackView?.userInterfaceLayoutDirection = direction - (self?.textView?.enclosingScrollView as? BidiScrollView)?.scrollerDirection = direction - } - - // toggle visibility of the separator of the line number view - self.defaultsObservers = [ + self.observers = [ + // observe text orientation for line number view + self.textView.publisher(for: \.layoutOrientation, options: .initial) + .sink { [weak self] orientation in + self?.stackView?.orientation = switch orientation { + case .horizontal: .horizontal + case .vertical: .vertical + @unknown default: fatalError() + } + self?.lineNumberView.orientation = orientation + }, + + // let line number view position follow writing direction + self.textView.publisher(for: \.baseWritingDirection) + .removeDuplicates() + .map { ($0 == .rightToLeft) ? NSUserInterfaceLayoutDirection.rightToLeft : .leftToRight } + .sink { [weak self] direction in + self?.stackView?.userInterfaceLayoutDirection = direction + (self?.textView.enclosingScrollView as? BidiScrollView)?.scrollerDirection = direction + self?.lineNumberView.layoutDirection = direction + }, + + // toggle visibility of the separator of the line number view UserDefaults.standard.publisher(for: .showLineNumberSeparator, initial: true) - .assign(to: \.drawsSeparator, on: self.lineNumberView!), + .assign(to: \.drawsSeparator, on: self.lineNumberView), ] } @@ -133,9 +161,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, super.restoreState(with: coder) if coder.decodeBool(forKey: SerializationKey.showsAdvancedCounter) { - Task { @MainActor in - self.showAdvancedCharacterCounter() - } + self.showAdvancedCharacterCounter() } } @@ -180,6 +206,12 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, // MARK: Text View Delegate + func undoManager(for view: NSTextView) -> UndoManager? { + + self.document.undoManager + } + + func textView(_ textView: NSTextView, shouldChangeTextIn affectedCharRange: NSRange, replacementString: String?) -> Bool { if textView.undoManager?.isUndoing == true { return true } // = undo @@ -216,7 +248,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, } // add "Inspect Character" menu item if single character is selected - if self.textView?.selectsSingleCharacter == true { + if self.textView.selectsSingleCharacter == true { menu.insertItem(withTitle: String(localized: "Inspect Character", table: "MainMenu"), action: #selector(showSelectionInfo), keyEquivalent: "", @@ -233,8 +265,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, /// Shows the Go To sheet. @IBAction func gotoLocation(_ sender: Any?) { - guard let textView = self.textView else { return assertionFailure() } - + let textView = self.textView let string = textView.string let lineNumber = string.lineNumber(at: textView.selectedRange.location) let lineCount = (string as NSString).substring(with: textView.selectedRange).numberOfLines @@ -257,8 +288,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, /// Shows the Unicode input view. @IBAction func showUnicodeInputPanel(_ sender: Any?) { - guard let textView = self.textView else { return assertionFailure() } - + let textView = self.textView let view = UnicodeInputView { [unowned textView] character in // flag to skip line ending sanitization textView.isApprovedTextChange = true @@ -300,9 +330,8 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, @IBAction func showSelectionInfo(_ sender: Any?) { guard - let textView = self.textView, - textView.selectsSingleCharacter, - let character = textView.selectedString.first + self.textView.selectsSingleCharacter, + let character = self.textView.selectedString.first else { return assertionFailure() } let characterInfo = CharacterInfo(character: character) @@ -310,6 +339,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, popoverController.view = NSHostingView(rootView: CharacterInspectorView(info: characterInfo)) popoverController.view.frame.size = popoverController.view.intrinsicContentSize + let textView = self.textView let positioningRect = textView.boundingRect(for: textView.selectedRange)?.insetBy(dx: -4, dy: -4) ?? .zero textView.scrollRangeToVisible(textView.selectedRange) @@ -324,8 +354,8 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, /// The visibility of the line number view. var showsLineNumber: Bool { - get { self.lineNumberView?.isHidden == false } - set { self.lineNumberView?.isHidden = !newValue } + get { self.lineNumberView.isHidden == false } + set { self.lineNumberView.isHidden = !newValue } } @@ -337,8 +367,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, /// - Parameter image: The image to scan text. private func popoverLiveText(image: NSImage) { - guard let textView = self.textView else { return assertionFailure() } - + let textView = self.textView let rootView = LiveTextInsertionView(image: image) { [weak textView] string in guard let textView else { return } textView.replace(with: string, range: textView.selectedRange, selectedRange: nil) @@ -374,8 +403,7 @@ final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, /// Sets and shows advanced character counter. private func showAdvancedCharacterCounter() { - guard let textView = self.textView else { return assertionFailure() } - + let textView = self.textView let counter = AdvancedCharacterCounter() counter.observe(textView: textView) let rootView = AdvancedCharacterCounterView(counter: counter) { [weak self] in @@ -409,7 +437,7 @@ extension EditorTextViewController: NSUserInterfaceValidations { return true case #selector(showSelectionInfo): - return self.textView?.selectsSingleCharacter == true + return self.textView.selectsSingleCharacter == true case nil: return false @@ -421,6 +449,53 @@ extension EditorTextViewController: NSUserInterfaceValidations { } +extension EditorTextViewController: EditorTextView.Delegate { + + /// Inserts string representation of dropped files applying the user's file drop snippets. + /// + /// - Parameter urls: The file URLs of dropped files. + /// - Returns: Whether the file drop was performed. + func editorTextView(_ textView: EditorTextView, readDroppedURLs urls: [URL]) -> Bool { + + guard !urls.isEmpty else { return false } + + let fileDropItems = UserDefaults.standard[.fileDropArray].map(FileDropItem.init(dictionary:)) + + guard !fileDropItems.isEmpty else { return false } + + let replacementString = urls.reduce(into: "") { (string, url) in + if url.pathExtension == "textClipping", let textClipping = try? TextClipping(contentsOf: url) { + string += textClipping.string + return + } + + if let fileDropItem = fileDropItems.first(where: { $0.supports(extension: url.pathExtension, scope: textView.syntaxName) }) { + string += fileDropItem.dropText(forFileURL: url, documentURL: self.document.fileURL) + return + } + + // just insert the absolute path if no specific setting for the file type was found + // -> This is the default behavior of NSTextView by file dropping. + if !string.isEmpty { + string += textView.lineEnding.string + } + + string += url.isFileURL ? url.path : url.absoluteString + } + + guard replacementString.isEmpty else { return true } + + // insert snippets to view + guard textView.shouldChangeText(in: textView.rangeForUserTextChange, replacementString: replacementString) else { return false } + + textView.replaceCharacters(in: textView.rangeForUserTextChange, with: replacementString) + textView.didChangeText() + + return true + } +} + + extension EditorTextViewController: NSFontChanging { diff --git a/CotEditor/Sources/EditorViewController.swift b/CotEditor/Sources/EditorViewController.swift index 29c4fedac..641c69e5a 100644 --- a/CotEditor/Sources/EditorViewController.swift +++ b/CotEditor/Sources/EditorViewController.swift @@ -25,7 +25,9 @@ // import AppKit +import SwiftUI import Combine +import Defaults final class EditorViewController: NSSplitViewController { @@ -33,36 +35,33 @@ final class EditorViewController: NSSplitViewController { var textView: EditorTextView? { self.textViewController.textView } - var outlineItems: [OutlineItem]? { - - didSet { - self.navigationBarController.outlineItems = outlineItems - } - } - // MARK: Private Properties - private lazy var navigationBarController: NavigationBarController = NSStoryboard(name: "NavigationBar", bundle: nil).instantiateInitialController()! - private lazy var textViewController = EditorTextViewController() + private let document: Document + private let splitState: SplitState - private var navigationBarItem: NSSplitViewItem? - - private var syntaxName: String? - private var defaultObservers: [AnyCancellable] = [] + private lazy var outlineNavigator = OutlineNavigator() + private lazy var textViewController = EditorTextViewController(document: self.document) + @ViewLoading private var navigationBarItem: NSSplitViewItem + private var observers: [AnyCancellable] = [] // MARK: Lifecycle - deinit { - // detach layoutManager safely - guard - let textStorage = self.textView?.textStorage, - let layoutManager = self.textView?.layoutManager - else { return assertionFailure() } + init(document: Document, splitState: SplitState) { - textStorage.removeLayoutManager(layoutManager) + self.document = document + self.splitState = splitState + + super.init(nibName: nil, bundle: nil) + } + + + required init?(coder: NSCoder) { + + fatalError("init(coder:) has not been implemented") } @@ -72,22 +71,38 @@ final class EditorViewController: NSSplitViewController { self.splitView.isVertical = false - let navigationBarItem = NSSplitViewItem(viewController: self.navigationBarController) - navigationBarItem.isCollapsed = true // avoid initial view loading - self.navigationBarItem = navigationBarItem - self.addSplitViewItem(navigationBarItem) + // setup navigation bar + self.outlineNavigator.textView = self.textView + let navigationBar = NavigationBar(outlineNavigator: self.outlineNavigator, splitState: self.splitState) + self.navigationBarItem = NSSplitViewItem(viewController: NSHostingController(rootView: navigationBar)) + self.navigationBarItem.isCollapsed = !UserDefaults.standard[.showNavigationBar] + self.addSplitViewItem(self.navigationBarItem) + // setup text view controller + self.textView?.layoutManager?.replaceTextStorage(self.document.textStorage) + self.applySyntax() self.addChild(self.textViewController) - self.navigationBarController.textView = self.textView - - // set user defaults - navigationBarItem.isCollapsed = !UserDefaults.standard[.showNavigationBar] - self.defaultObservers = [ + // observe document and defaults + self.observers = [ + self.document.$lineEnding + .receive(on: RunLoop.main) + .sink { [weak self] in self?.textView?.lineEnding = $0 }, + self.document.didChangeSyntax + .sink { [weak self] _ in self?.applySyntax() }, + self.document.syntaxParser.$outlineItems + .removeDuplicates() + .receive(on: RunLoop.main) + .sink { [weak self] in self?.outlineNavigator.items = $0 }, + self.document.$mode + .removeDuplicates() + .sink { [weak self] mode in + Task { @MainActor in + self?.textView?.mode = await ModeManager.shared.setting(for: mode) + } + }, UserDefaults.standard.publisher(for: .showNavigationBar) - .sink { [weak self] in self?.navigationBarItem?.animator().isCollapsed = !$0 }, - UserDefaults.standard.publisher(for: .modes) - .sink { [weak self] _ in self?.invalidateMode() }, + .sink { [weak self] in self?.navigationBarItem.animator().isCollapsed = !$0 }, ] // set accessibility @@ -111,20 +126,18 @@ final class EditorViewController: NSSplitViewController { switch item.action { case #selector(toggleNavigationBar): - (item as? NSMenuItem)?.title = self.navigationBarItem?.isCollapsed == false - ? String(localized: "Hide Navigation Bar", table: "MainMenu") - : String(localized: "Show Navigation Bar", table: "MainMenu") + (item as? NSMenuItem)?.title = !self.navigationBarItem.isCollapsed + ? String(localized: "Hide Navigation Bar", table: "MainMenu") + : String(localized: "Show Navigation Bar", table: "MainMenu") case #selector(openOutlineMenu): - return self.outlineItems?.isEmpty == false + return self.outlineNavigator.items?.isEmpty == false case #selector(selectPrevItemOfOutlineMenu): - guard let textView = self.textView else { return false } - return self.outlineItems?.previousItem(for: textView.selectedRange) != nil + return self.outlineNavigator.canSelectPreviousItem case #selector(selectNextItemOfOutlineMenu): - guard let textView = self.textView else { return false } - return self.outlineItems?.nextItem(for: textView.selectedRange) != nil + return self.outlineNavigator.canSelectNextItem default: break } @@ -144,35 +157,6 @@ final class EditorViewController: NSSplitViewController { } - /// Sets textStorage to the inner text view. - /// - /// - Parameter textStorage: The text storage to set. - func setTextStorage(_ textStorage: NSTextStorage) { - - guard let layoutManager = self.textView?.layoutManager else { return assertionFailure() } - - layoutManager.replaceTextStorage(textStorage) - } - - - /// Applies syntax to the inner text view. - /// - /// - Parameters: - /// - syntax: The syntax to apply. - /// - name: The name of the syntax. - func apply(syntax: Syntax, name: String) { - - self.syntaxName = name - - guard let textView = self.textView else { return assertionFailure() } - - textView.commentDelimiters = syntax.commentDelimiters - textView.syntaxCompletionWords = syntax.completionWords - - self.invalidateMode() - } - - // MARK: Action Messages @@ -186,44 +170,35 @@ final class EditorViewController: NSSplitViewController { /// Shows the menu items of the outline menu in the navigation bar. @IBAction func openOutlineMenu(_ sender: Any) { - self.navigationBarItem?.isCollapsed = false - self.navigationBarController.openOutlineMenu() + self.navigationBarItem.isCollapsed = false + self.outlineNavigator.isOutlinePickerPresented = true } /// Selects the previous outline item. @IBAction func selectPrevItemOfOutlineMenu(_ sender: Any?) { - guard - let textView = self.textView, - let item = self.outlineItems?.previousItem(for: textView.selectedRange) - else { return } - - textView.select(range: item.range) + self.outlineNavigator.selectPreviousItem() } /// Selects the next outline item. @IBAction func selectNextItemOfOutlineMenu(_ sender: Any?) { - guard - let textView = self.textView, - let item = self.outlineItems?.nextItem(for: textView.selectedRange) - else { return } - - textView.select(range: item.range) + self.outlineNavigator.selectNextItem() } // MARK: Private Methods - /// Updates the editing mode options in the text view. - private func invalidateMode() { + /// Applies syntax to the inner text view. + private func applySyntax() { - guard let syntaxName else { return assertionFailure() } + guard let textView = self.textView else { return assertionFailure() } - Task { - self.textView?.mode = await ModeManager.shared.setting(for: .syntax(syntaxName)) - } + let parser = self.document.syntaxParser + textView.syntaxName = parser.name + textView.commentDelimiters = parser.syntax.commentDelimiters + textView.syntaxCompletionWords = parser.syntax.completionWords } } diff --git a/CotEditor/Sources/EncodingListView.swift b/CotEditor/Sources/EncodingListView.swift index bc90e3ce9..34ad92103 100644 --- a/CotEditor/Sources/EncodingListView.swift +++ b/CotEditor/Sources/EncodingListView.swift @@ -24,6 +24,9 @@ // import SwiftUI +import Observation +import Defaults +import FileEncoding private struct EncodingItem: Identifiable { @@ -39,12 +42,12 @@ private struct EncodingItem: Identifiable { struct EncodingListView: View { - fileprivate final class Model: ObservableObject { + @Observable fileprivate final class Model { typealias Item = EncodingItem - @Published var items: [Item] + var items: [Item] private let defaults: UserDefaults @@ -57,7 +60,7 @@ struct EncodingListView: View { } - @StateObject private var model = Model() + @State private var model = Model() @Environment(\.undoManager) private var undoManager @Environment(\.dismiss) private var dismiss @@ -112,7 +115,7 @@ struct EncodingListView: View { .padding(.bottom) HStack { - HelpButton(anchor: "howto_customize_encoding_order") + HelpLink(anchor: "howto_customize_encoding_order") Button(String(localized: "Restore Defaults", table: "EncodingList", comment: "button label")) { self.model.restore() @@ -286,7 +289,6 @@ private extension CFStringEncoding { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 400, height: 400)) { EncodingListView() } diff --git a/CotEditor/Sources/EncodingManager.swift b/CotEditor/Sources/EncodingManager.swift index 947c708b7..f5bafd0cd 100644 --- a/CotEditor/Sources/EncodingManager.swift +++ b/CotEditor/Sources/EncodingManager.swift @@ -25,7 +25,10 @@ // import AppKit +import Observation import Combine +import Defaults +import FileEncoding @objc protocol EncodingChanging: AnyObject { @@ -33,34 +36,37 @@ import Combine } -extension Array { +extension Optional { - /// Creates menu items for available encodings with action `changeEncoding(_:)`. - var menuItems: [NSMenuItem] { + /// Creates menu item with action `changeEncoding(_:)`. + var menuItem: NSMenuItem { - self.map { fileEncoding in - if let fileEncoding { + switch self { + case .some(let fileEncoding): let item = NSMenuItem(title: fileEncoding.localizedName, action: #selector((any EncodingChanging).changeEncoding), keyEquivalent: "") item.representedObject = fileEncoding return item - } else { + case .none: return .separator() - } } } } - // MARK: - -final class EncodingManager { +@Observable final class EncodingManager { // MARK: Public Properties nonisolated(unsafe) static let shared = EncodingManager() - @Published private(set) var fileEncodings: [FileEncoding?] = [] + private(set) var fileEncodings: [FileEncoding?] = [] + + + // MARK: Private Properties + + private var defaultObserver: AnyCancellable? @@ -74,14 +80,14 @@ final class EncodingManager { self.sanitizeEncodingListSetting() } - UserDefaults.standard.publisher(for: .encodingList, initial: true) + self.defaultObserver = UserDefaults.standard.publisher(for: .encodingList, initial: true) .map { $0.map { $0 != kCFStringEncodingInvalidId ? FileEncoding(encoding: String.Encoding(cfEncoding: $0)) : nil } .flatMap { // add "UTF-8 with BOM" item just after the normal UTF-8 ($0?.encoding == .utf8) ? [$0, FileEncoding(encoding: .utf8, withUTF8BOM: true)] : [$0] } } - .assign(to: &self.$fileEncodings) + .sink { [weak self] in self?.fileEncodings = $0 } } diff --git a/CotEditor/Sources/FileAttributes.swift b/CotEditor/Sources/FileAttributes.swift new file mode 100644 index 000000000..6009621b8 --- /dev/null +++ b/CotEditor/Sources/FileAttributes.swift @@ -0,0 +1,80 @@ +// +// FileAttributes.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2018-03-05. +// +// --------------------------------------------------------------------------- +// +// © 2018-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import FilePermissions + +extension FileAttributeKey { + + static let extendedAttributes = FileAttributeKey("NSFileExtendedAttributes") +} + + +enum FileExtendedAttributeName { + + static let encoding = "com.apple.TextEncoding" + static let verticalText = "com.coteditor.VerticalText" + static let allowLineEndingInconsistency = "com.coteditor.AllowLineEndingInconsistency" +} + + +struct FileAttributes: Equatable { + + var creationDate: Date? + var modificationDate: Date? + var size: Int64 + var permissions: FilePermissions + var owner: String? +} + + +extension FileAttributes { + + init(dictionary: [FileAttributeKey: Any]) { + + self.creationDate = dictionary[.creationDate] as? Date + self.modificationDate = dictionary[.modificationDate] as? Date + self.size = dictionary[.size] as? Int64 ?? 0 + self.permissions = FilePermissions(mask: dictionary[.posixPermissions] as? Int16 ?? 0) + self.owner = dictionary[.ownerAccountName] as? String + } +} + + +struct ExtendedFileAttributes { + + var encoding: String.Encoding? + var isVerticalText: Bool = false + var allowsInconsistentLineEndings: Bool = false + + + init(dictionary: [FileAttributeKey: Any]) { + + let extendedAttributes = dictionary[.extendedAttributes] as? [String: Data] + self.encoding = extendedAttributes?[FileExtendedAttributeName.encoding]?.decodingXattrEncoding + self.isVerticalText = (extendedAttributes?[FileExtendedAttributeName.verticalText] != nil) + self.allowsInconsistentLineEndings = (extendedAttributes?[FileExtendedAttributeName.allowLineEndingInconsistency] != nil) + } +} diff --git a/CotEditor/Sources/FileDropItem.swift b/CotEditor/Sources/FileDropItem.swift index f1a540824..e8d5e7378 100644 --- a/CotEditor/Sources/FileDropItem.swift +++ b/CotEditor/Sources/FileDropItem.swift @@ -26,7 +26,9 @@ import Foundation import AppKit.NSImageRep -struct FileDropItem { +struct FileDropItem: Equatable, Identifiable { + + let id = UUID() var format: String = "" var extensions: [String] = [] { @@ -128,6 +130,7 @@ extension FileDropItem { case imageWidth = "IMAGEWIDTH" case imageHeight = "IMAGEHEIGHT" + static let allCases: [Variable?] = Self.pathTokens + [nil] + Self.textTokens + [nil] + Self.imageTokens static let pathTokens: [Self] = [.absolutePath, .relativePath, .filename, .filenameWithoutExtension, .fileExtension, .fileExtensionLowercase, .fileExtensionUppercase, .directory] static let textTokens: [Self] = [.fileContent] static let imageTokens: [Self] = [.imageWidth, .imageHeight] @@ -199,7 +202,7 @@ extension FileDropItem { // replace template var dropText = self.format .replacing(Variable.absolutePath.token, with: droppedFileURL.path) - .replacing(Variable.relativePath.token, with: droppedFileURL.path(relativeTo: documentURL) ?? droppedFileURL.path) + .replacing(Variable.relativePath.token, with: documentURL.flatMap(droppedFileURL.path(relativeTo:)) ?? droppedFileURL.path) .replacing(Variable.filename.token, with: droppedFileURL.lastPathComponent) .replacing(Variable.filenameWithoutExtension.token, with: droppedFileURL.deletingPathExtension().lastPathComponent) .replacing(Variable.fileExtension.token, with: droppedFileURL.pathExtension) @@ -224,7 +227,7 @@ extension FileDropItem { // get text content if needed // -> Replace this at last because the file content can contain other tokens. if self.format.contains(Variable.fileContent.token) { - let content = try? String(contentsOf: droppedFileURL) + let content = try? String(contentsOf: droppedFileURL, encoding: .utf8) dropText = dropText.replacing(Variable.fileContent.token, with: content ?? "") } diff --git a/CotEditor/Sources/FileDropViewController.swift b/CotEditor/Sources/FileDropViewController.swift deleted file mode 100644 index 2c44b2ddb..000000000 --- a/CotEditor/Sources/FileDropViewController.swift +++ /dev/null @@ -1,239 +0,0 @@ -// -// FileDropViewController.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2014-04-18. -// -// --------------------------------------------------------------------------- -// -// © 2004-2007 nakamuxu -// © 2014-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit -import Combine - -final class FileDropViewController: NSViewController, NSTableViewDelegate, NSTextFieldDelegate, NSTextViewDelegate { - - // MARK: Private Properties - - private var arrayObservers: Set = [] - - @objc private dynamic var canRestore = false // bound to Restore Defaults button - - @IBOutlet private var fileDropController: NSArrayController? - @IBOutlet private weak var tableView: NSTableView? - @IBOutlet private weak var addRemoveButton: NSSegmentedControl? - @IBOutlet private weak var variableInsertionMenu: NSPopUpButton? - @IBOutlet private weak var formatTextView: TokenTextView? - - - - // MARK: View Controller Methods - - override func viewDidLoad() { - - super.viewDidLoad() - - // setup add/remove button - self.arrayObservers = [ - self.fileDropController!.publisher(for: \.canAdd, options: .initial) - .sink { [weak self] in self?.addRemoveButton?.setEnabled($0, forSegment: 0) }, - self.fileDropController!.publisher(for: \.canRemove, options: .initial) - .sink { [weak self] in self?.addRemoveButton?.setEnabled($0, forSegment: 1) }, - ] - - // setup Restore Defaults button - self.canRestore = UserDefaults.standard[.fileDropArray] == UserDefaults.standard[initial: .fileDropArray] - - // setup variable menu - if let menu = self.variableInsertionMenu?.menu { - menu.items += FileDropItem.Variable.pathTokens - .map { $0.insertionMenuItem(target: self.formatTextView) } - - menu.addItem(.separator()) - menu.items += FileDropItem.Variable.textTokens - .map { $0.insertionMenuItem(target: self.formatTextView) } - - menu.addItem(.separator()) - menu.items += FileDropItem.Variable.imageTokens - .map { $0.insertionMenuItem(target: self.formatTextView) } - } - - // set tokenizer for format text view - self.formatTextView!.tokenizer = FileDropItem.Variable.tokenizer - } - - - override func viewWillAppear() { - - super.viewWillAppear() - - self.loadSetting() - } - - - override func viewWillDisappear() { - - super.viewWillDisappear() - - self.endEditing() - self.saveSetting() - } - - - - // MARK: Delegate - - /// The extension field was edited. - func control(_ control: NSControl, textShouldEndEditing fieldEditor: NSText) -> Bool { - - guard control.identifier?.rawValue == FileDropItem.CodingKeys.extensions.rawValue else { return true } - - // sanitize - fieldEditor.string = Self.sanitize(extensionsString: fieldEditor.string) - - self.saveSetting() - - return true - } - - - /// Sets the scope popup menu. - func tableView(_ tableView: NSTableView, didAdd rowView: NSTableRowView, forRow row: Int) { - - guard - let cellView = rowView.view(atColumn: 0) as? NSTableCellView, - let menu = cellView.subviews.first as? NSPopUpButton, - let item = cellView.objectValue as? [String: String] - else { return assertionFailure() } - - // reset attributed string for "All" item - // -> Otherwise, the title isn't localized. - let allItem = menu.itemArray.first! - allItem.attributedTitle = NSAttributedString(string: allItem.title, attributes: allItem.attributedTitle!.attributes(at: 0, effectiveRange: nil)) - - // add syntaxes - for settingName in SyntaxManager.shared.settingNames { - menu.addItem(withTitle: settingName) - menu.lastItem!.representedObject = settingName - } - - // select item - if let scope = item[FileDropItem.CodingKeys.scope] { - menu.selectItem(withTitle: scope) - } else { - if let emptyItem = menu.itemArray.first(where: { !$0.isSeparatorItem && $0.title.isEmpty }) { - menu.menu?.removeItem(emptyItem) - } - menu.selectItem(at: 0) - } - } - - - // MARK: Text View Delegate (format text view) - - /// Invoked when the insertion format text view was edited. - func textDidEndEditing(_ notification: Notification) { - - guard - let textView = notification.object as? NSTextView, - textView == self.formatTextView - else { return } - - self.saveSetting() - } - - - - // MARK: Action Messages - - @IBAction func addRemove(_ sender: NSSegmentedControl) { - - self.endEditing() - - switch sender.selectedSegment { - case 0: // add - self.fileDropController?.add(self) - - case 1: // remove - self.fileDropController?.remove(self) - self.saveSetting() - - default: - preconditionFailure() - } - } - - - /// Reverts the file drop settings to default. - @IBAction func restoreDefaults(_ sender: Any?) { - - UserDefaults.standard.restore(key: .fileDropArray) - self.canRestore = false - } - - - - // MARK: Private Methods - - /// Writes back the file drop settings to UserDefaults. - private func saveSetting() { - - guard let content = self.fileDropController?.content as? [[String: String]] else { return } - - // sanitize - let sanitized = content - .map { $0.filter { !($0.key == FileDropItem.CodingKeys.extensions.rawValue && $0.value.isEmpty) } } - .filter { $0[FileDropItem.CodingKeys.format] != nil } - - // check if the new setting is different from the default - self.canRestore = sanitized != UserDefaults.standard[initial: .fileDropArray] - if self.canRestore { - UserDefaults.standard[.fileDropArray] = sanitized - } else { - UserDefaults.standard.restore(key: .fileDropArray) - } - } - - - /// Sets the file drop settings to ArrayController. - private func loadSetting() { - - // load/save settings manually rather than binding directly to UserDefaults - // because Binding to UserDefaults has problems for example when zero-length string was set - // http://www.hmdt-web.net/bbs/bbs.cgi?bbsname=mkino&mode=res&no=203&oyano=203&line=0 - - // make data mutable for NSArrayController - self.fileDropController?.content = NSMutableArray(array: UserDefaults.standard[.fileDropArray] - .map(NSMutableDictionary.init(dictionary:))) - } - - - /// Sanitize the extensions string by trimming extra spaces. - /// - /// - Parameter extensionsString: The string to sanitize. - /// - Returns: A formatted sting of file extensions. - private static func sanitize(extensionsString: String) -> String { - - extensionsString - .components(separatedBy: .alphanumerics.inverted) // separator + typical invalid characters - .filter { !$0.isEmpty } - .joined(separator: ", ") - .lowercased() - } -} diff --git a/CotEditor/Sources/FilterField.swift b/CotEditor/Sources/FilterField.swift index 44e80842d..9e8dc4828 100644 --- a/CotEditor/Sources/FilterField.swift +++ b/CotEditor/Sources/FilterField.swift @@ -197,8 +197,10 @@ private final class InnerFilterField: NSSearchField { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var text = "" + @Previewable @State var text = "" + return FilterField(text: $text) .autosaveName("FilterField Preview") .frame(width: 160) diff --git a/CotEditor/Sources/FindPanelButtonView.swift b/CotEditor/Sources/FindPanelButtonView.swift index e43e13c31..fccea0303 100644 --- a/CotEditor/Sources/FindPanelButtonView.swift +++ b/CotEditor/Sources/FindPanelButtonView.swift @@ -58,18 +58,12 @@ struct FindPanelButtonView: View { .fixedSize() ControlGroup { - Button { + Button(String(localized: "Find Previous", table: "TextFind", comment: "button label"), systemImage: "chevron.backward") { self.performAction(.previousMatch) - } label: { - Label(String(localized: "Find Previous", table: "TextFind", comment: "button label"), - systemImage: "chevron.backward") }.help(String(localized: "Find previous match.", table: "TextFind", comment: "tooltip")) - Button { + Button(String(localized: "Find Next", table: "TextFind", comment: "button label"), systemImage: "chevron.forward") { self.performAction(.nextMatch) - } label: { - Label(String(localized: "Find Next", table: "TextFind", comment: "button label"), - systemImage: "chevron.forward") }.help(String(localized: "Find next match.", table: "TextFind", comment: "tooltip")) } .labelStyle(.iconOnly) @@ -85,7 +79,7 @@ struct FindPanelButtonView: View { /// Send a text finder action message to the legacy responder-chain. /// /// - Parameter action: The `TextFinder.Action` to perform. - @MainActor private func performAction(_ action: TextFinder.Action) { + private func performAction(_ action: TextFinder.Action) { // create a dummy sender for tag let sender = NSControl() diff --git a/CotEditor/Sources/FindPanelContentViewController.swift b/CotEditor/Sources/FindPanelContentViewController.swift index 607e3ccb5..64619d69f 100644 --- a/CotEditor/Sources/FindPanelContentViewController.swift +++ b/CotEditor/Sources/FindPanelContentViewController.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,8 +33,8 @@ final class FindPanelContentViewController: NSSplitViewController { private static let defaultResultViewHeight: Double = 200 - private var fieldSplitViewItem: NSSplitViewItem? - private var resultSplitViewItem: NSSplitViewItem? + @ViewLoading private var fieldSplitViewItem: NSSplitViewItem + @ViewLoading private var resultSplitViewItem: NSSplitViewItem private var resultObserver: AnyCancellable? @@ -87,17 +87,17 @@ final class FindPanelContentViewController: NSSplitViewController { super.viewWillAppear() - self.fieldSplitViewItem?.holdingPriority = .defaultLow + 1 + self.fieldSplitViewItem.holdingPriority = .defaultLow + 1 } - override func viewWillDisappear() { + override func viewDidDisappear() { - super.viewWillDisappear() + super.viewDidDisappear() - self.fieldSplitViewItem?.holdingPriority = .defaultHigh - self.resultSplitViewItem?.isCollapsed = true + self.fieldSplitViewItem.holdingPriority = .defaultHigh + self.resultSplitViewItem.isCollapsed = true } @@ -106,8 +106,8 @@ final class FindPanelContentViewController: NSSplitViewController { super.splitViewDidResizeSubviews(notification) // collapse result view if closed - if let item = self.resultSplitViewItem, - item.viewController.isViewShown, + let item = self.resultSplitViewItem + if item.viewController.isViewShown, item.viewController.view.frame.height < 1 { item.isCollapsed = true @@ -118,7 +118,7 @@ final class FindPanelContentViewController: NSSplitViewController { override func splitView(_ splitView: NSSplitView, effectiveRect proposedEffectiveRect: NSRect, forDrawnRect drawnRect: NSRect, ofDividerAt dividerIndex: Int) -> NSRect { // avoid showing draggable cursor when result view collapsed - (self.resultSplitViewItem?.isCollapsed == true) ? .zero : proposedEffectiveRect + self.resultSplitViewItem.isCollapsed ? .zero : proposedEffectiveRect } @@ -138,7 +138,7 @@ final class FindPanelContentViewController: NSSplitViewController { /// The view controller for the result view. private var resultViewController: FindPanelResultViewController? { - self.resultSplitViewItem?.viewController as? FindPanelResultViewController + self.resultSplitViewItem.viewController as? FindPanelResultViewController } @@ -163,7 +163,7 @@ final class FindPanelContentViewController: NSSplitViewController { /// - Parameter shown: `true` to open the result view; otherwise, `false`. private func setResultShown(_ shown: Bool) { - guard let item = self.resultSplitViewItem else { return assertionFailure() } + let item = self.resultSplitViewItem if shown { item.viewController.view.frame.size.height.clamp(to: Self.defaultResultViewHeight...(.infinity)) diff --git a/CotEditor/Sources/FindPanelFieldView.swift b/CotEditor/Sources/FindPanelFieldView.swift index 76f7e2e90..14d8b5b2b 100644 --- a/CotEditor/Sources/FindPanelFieldView.swift +++ b/CotEditor/Sources/FindPanelFieldView.swift @@ -26,6 +26,7 @@ import AppKit import Combine import SwiftUI +import Defaults struct FindPanelMainView: View { @@ -240,7 +241,7 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// Updates the result count in the input fields. /// /// - Parameter result: The find/replace result or `nil` to clear. - @MainActor private func update(result: TextFindResult?) { + private func update(result: TextFindResult?) { switch result { case .found: @@ -257,14 +258,14 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// Updates the find history menu. - @MainActor private func updateFindHistoryMenu() { + private func updateFindHistoryMenu() { self.buildHistoryMenu(self.findHistoryMenu!, defaultsKey: .findHistory, action: #selector(selectFindHistory)) } /// Updates the replace history menu. - @MainActor private func updateReplaceHistoryMenu() { + private func updateReplaceHistoryMenu() { self.buildHistoryMenu(self.replaceHistoryMenu!, defaultsKey: .replaceHistory, action: #selector(selectReplaceHistory)) } @@ -276,7 +277,7 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// - menu: The menu to update the content. /// - key: The default key for the history. /// - action: The action selector for menu items. - @MainActor private func buildHistoryMenu(_ menu: NSMenu, defaultsKey key: DefaultKey<[String]>, action: Selector) { + private func buildHistoryMenu(_ menu: NSMenu, defaultsKey key: DefaultKey<[String]>, action: Selector) { assert(Thread.isMainThread) @@ -299,7 +300,7 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// Updates the find result message on the input field. /// /// - Parameter message: The message to display in the input field, or `nil` to clear. - @MainActor private func updateFoundMessage(_ message: String?) { + private func updateFoundMessage(_ message: String?) { self.applyResult(message: message, textField: self.findResultField!, textView: self.findTextView!) } @@ -308,7 +309,7 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// Updates the replacement result message on the input field. /// /// - Parameter message: The message to display in the input field, or `nil` to clear. - @MainActor private func updateReplacedMessage(_ message: String?) { + private func updateReplacedMessage(_ message: String?) { self.applyResult(message: message, textField: self.replacementResultField!, textView: self.replacementTextView!) } @@ -320,7 +321,7 @@ final class FindPanelFieldViewController: NSViewController, NSTextViewDelegate { /// - message: The localized message to display. /// - textField: The text field displaying the message. /// - textView: The input text view where shows the message. - @MainActor private func applyResult(message: String?, textField: NSTextField, textView: NSTextView) { + private func applyResult(message: String?, textField: NSTextField, textView: NSTextView) { textField.isHidden = (message == nil) textField.stringValue = message ?? "" diff --git a/CotEditor/Sources/FindPanelLayoutManager.swift b/CotEditor/Sources/FindPanelLayoutManager.swift index 24b523bd5..12f18e253 100644 --- a/CotEditor/Sources/FindPanelLayoutManager.swift +++ b/CotEditor/Sources/FindPanelLayoutManager.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2022 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import AppKit import Combine +import Defaults final class FindPanelLayoutManager: NSLayoutManager, NSLayoutManagerDelegate, InvisibleDrawing { diff --git a/CotEditor/Sources/FindPanelOptionView.swift b/CotEditor/Sources/FindPanelOptionView.swift index 3152ed51b..43d605b8f 100644 --- a/CotEditor/Sources/FindPanelOptionView.swift +++ b/CotEditor/Sources/FindPanelOptionView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct FindPanelOptionView: View { @@ -45,7 +46,7 @@ struct FindPanelOptionView: View { Toggle(String(localized: "Regular Expression", table: "TextFind", comment: "toggle button label"), isOn: $usesRegularExpression) .help(String(localized: "Select to search with regular expression.", table: "TextFind", comment: "tooltip")) .fixedSize() - HelpButton { + HelpLink { self.isRegexReferencePresented.toggle() } .help(String(localized: "Show quick reference for regular expression syntax.", table: "TextFind", comment: "tooltip")) @@ -63,15 +64,14 @@ struct FindPanelOptionView: View { Spacer() - Button { + Button(String(localized: "Advanced options", table: "TextFind", comment: "accessibility label"), systemImage: "ellipsis") { self.isSettingsPresented.toggle() - } label: { - Image(systemName: "ellipsis").symbolVariant(.circle) } .popover(isPresented: $isSettingsPresented, arrowEdge: .trailing) { FindSettingsView() } - .accessibilityLabel(String(localized: "Advanced options", table: "TextFind", comment: "accessibility label")) + .symbolVariant(.circle) + .labelStyle(.iconOnly) .help(String(localized: "Show advanced options", table: "TextFind", comment: "tooltip")) } .controlSize(.small) diff --git a/CotEditor/Sources/FindPanelResultView.swift b/CotEditor/Sources/FindPanelResultView.swift index f793418de..f4df4e698 100644 --- a/CotEditor/Sources/FindPanelResultView.swift +++ b/CotEditor/Sources/FindPanelResultView.swift @@ -25,6 +25,8 @@ import AppKit import SwiftUI +import Observation +import Defaults final class FindPanelResultViewController: NSHostingController { @@ -37,7 +39,7 @@ final class FindPanelResultViewController: NSHostingController = [] @State private var sortOrder = [KeyPathComparator(\Match.range.location)] @@ -82,14 +84,12 @@ struct FindPanelResultView: View { VStack(alignment: .leading) { HStack { - Button { + Button(String(localized: "Close", table: "TextFind", comment: "button label"), systemImage: "chevron.up") { NSApp.sendAction(#selector(FindPanelContentViewController.closeResultView), to: nil, from: nil) - } label: { - Image(systemName: "chevron.up") - .fontWeight(.medium) - .imageScale(.small) } - .accessibilityLabel(String(localized: "Close", table: "TextFind", comment: "button label")) + .fontWeight(.medium) + .imageScale(.small) + .labelStyle(.iconOnly) .help(String(localized: "Close find result.", table: "TextFind", comment: "tooltip")) Text(self.message) @@ -103,9 +103,10 @@ struct FindPanelResultView: View { TableColumn(String(localized: "Line", table: "TextFind", comment: "table column header"), value: \.range.location) { Text(self.model.target?.lineNumber(at: $0.range.location) ?? 0, format: .number) .monospacedDigit() - .frame(maxWidth: .infinity, alignment: .trailing) .padding(.vertical, -2) - }.width(ideal: 30, max: 64) + } + .width(ideal: 30, max: 64) + .alignment(.trailing) TableColumn(String(localized: "Found String", table: "TextFind", comment: "table column header")) { Text(AttributedString($0.attributedLineString(offset: 16))) @@ -121,7 +122,7 @@ struct FindPanelResultView: View { .copyable(self.model.matches .filter(with: self.selection) .map(\.attributedLineString.string)) - .onChange(of: self.selection) { newValue in + .onChange(of: self.selection) { (_, newValue) in // remove selection of previous data if newValue.count > 1 { let ids = self.model.matches.map(\.id) @@ -133,7 +134,7 @@ struct FindPanelResultView: View { guard newValue.count == 1 else { return } self.selectMatch(newValue.first) } - .onChange(of: self.sortOrder) { newValue in + .onChange(of: self.sortOrder) { (_, newValue) in self.model.matches.sort(using: newValue) } .contextMenu { @@ -156,7 +157,7 @@ struct FindPanelResultView: View { // MARK: Private Methods - @MainActor private var message: String { + private var message: String { let documentName = self.model.target?.documentName ?? "Unknown" // This should never be nil. @@ -171,11 +172,11 @@ struct FindPanelResultView: View { /// Selects the match in the target text view. /// /// - Parameter id: The identifier of the match to select. - @MainActor private func selectMatch(_ id: Match.ID?) { + private func selectMatch(_ id: Match.ID?) { // abandon if text becomes shorter than range to select guard - let range = self.model.matches.first(where: { $0.id == id })?.range, + let range = self.model.matches[id: id]?.range, let textView = self.model.target, textView.string.length >= range.upperBound else { return } diff --git a/CotEditor/Sources/FindProgress.swift b/CotEditor/Sources/FindProgress.swift index c06ccbe3d..754b0376e 100644 --- a/CotEditor/Sources/FindProgress.swift +++ b/CotEditor/Sources/FindProgress.swift @@ -24,14 +24,15 @@ // import Foundation +import Observation -final class FindProgress: ObservableObject, @unchecked Sendable { +@Observable final class FindProgress: @unchecked Sendable { - private(set) var count = 0 - var completedUnit = 0 + @ObservationIgnored private(set) var count = 0 + @ObservationIgnored var completedUnit = 0 - @Published private(set) var isCancelled = false - @Published private(set) var isFinished = false + private(set) var isCancelled = false + private(set) var isFinished = false private let scope: Range diff --git a/CotEditor/Sources/FindProgressView.swift b/CotEditor/Sources/FindProgressView.swift index 394fcff8e..5b8f27b63 100644 --- a/CotEditor/Sources/FindProgressView.swift +++ b/CotEditor/Sources/FindProgressView.swift @@ -36,7 +36,7 @@ struct FindProgressView: View { weak var parent: NSHostingController? - @ObservedObject private var progress: FindProgress + @State private var progress: FindProgress private let unit: Unit private let label: String @@ -72,14 +72,13 @@ struct FindProgressView: View { Text(self.description) } - Button(role: .cancel) { + Button("Cancel", systemImage: "xmark", role: .cancel) { self.progress.cancel() - } label: { - Image(systemName: "xmark") - .symbolVariant(.circle) - .symbolVariant(.fill) - .accessibilityLabel("Cancel") - }.buttonStyle(.borderless) + } + .symbolVariant(.circle) + .symbolVariant(.fill) + .labelStyle(.iconOnly) + .buttonStyle(.borderless) } .onAppear { self.updateDescription() @@ -87,12 +86,12 @@ struct FindProgressView: View { .onReceive(self.timer) { _ in self.updateDescription() } - .onChange(of: self.progress.isCancelled) { newValue in + .onChange(of: self.progress.isCancelled) { (_, newValue) in if newValue { self.parent?.dismiss(nil) } } - .onChange(of: self.progress.isFinished) { newValue in + .onChange(of: self.progress.isFinished) { (_, newValue) in if newValue { self.updateDescription() self.parent?.dismiss(nil) diff --git a/CotEditor/Sources/FindSettingsView.swift b/CotEditor/Sources/FindSettingsView.swift index e0186c0ba..589097f5d 100644 --- a/CotEditor/Sources/FindSettingsView.swift +++ b/CotEditor/Sources/FindSettingsView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct FindSettingsView: View { @@ -83,7 +84,7 @@ struct FindSettingsView: View { HStack { Spacer() - HelpButton(anchor: "howto_find") + HelpLink(anchor: "howto_find") } } } diff --git a/CotEditor/Sources/FormPopUpButton.swift b/CotEditor/Sources/FormPopUpButton.swift index 6963bd148..2fc2bb280 100644 --- a/CotEditor/Sources/FormPopUpButton.swift +++ b/CotEditor/Sources/FormPopUpButton.swift @@ -132,7 +132,6 @@ final class FormPopUpButtonCell: NSPopUpButtonCell { // MARK: - Preview -@available(macOS 14, *) #Preview("Enabled") { let button = FormPopUpButton() button.addItem(withTitle: "Inu dog") @@ -140,7 +139,6 @@ final class FormPopUpButtonCell: NSPopUpButtonCell { return button } -@available(macOS 14, *) #Preview("Disabled") { let button = FormPopUpButton() button.addItem(withTitle: "Inu dog") diff --git a/CotEditor/Sources/FormatSettingsView.swift b/CotEditor/Sources/FormatSettingsView.swift index c69bd0325..8b5cd65e5 100644 --- a/CotEditor/Sources/FormatSettingsView.swift +++ b/CotEditor/Sources/FormatSettingsView.swift @@ -24,6 +24,8 @@ // import SwiftUI +import Defaults +import FileEncoding struct FormatSettingsView: View { @@ -37,7 +39,7 @@ struct FormatSettingsView: View { @AppStorage(.syntax) private var syntax - @State private var fileEncodings: [FileEncoding?] = [] + @State private var encodingManager: EncodingManager = .shared @State private var syntaxNames: [String] = [] @@ -86,7 +88,7 @@ struct FormatSettingsView: View { .gridColumnAlignment(.trailing) Picker(selection: self.fileEncoding) { - ForEach(Array(self.fileEncodings.enumerated()), id: \.offset) { (_, encoding) in + ForEach(Array(self.encodingManager.fileEncodings.enumerated()), id: \.offset) { (_, encoding) in if let encoding { Text(encoding.localizedName) .tag(encoding) @@ -164,12 +166,9 @@ struct FormatSettingsView: View { HStack { Spacer() - HelpButton(anchor: "settings_format") + HelpLink(anchor: "settings_format") } } - .onReceive(EncodingManager.shared.$fileEncodings) { fileEncodings in - self.fileEncodings = fileEncodings - } .onReceive(SyntaxManager.shared.$settingNames) { settingNames in self.syntaxNames = settingNames } diff --git a/CotEditor/Sources/FourCharCode.swift b/CotEditor/Sources/FourCharCode.swift index 43656f571..6a7c86763 100644 --- a/CotEditor/Sources/FourCharCode.swift +++ b/CotEditor/Sources/FourCharCode.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2020 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import typealias Darwin.FourCharCode -extension FourCharCode: ExpressibleByStringLiteral { +extension FourCharCode: @retroactive ExpressibleByStringLiteral { public init(stringLiteral value: StringLiteralType) { diff --git a/CotEditor/Sources/FuzzyRange.swift b/CotEditor/Sources/FuzzyRange.swift index 1a7d88732..d1ca3c201 100644 --- a/CotEditor/Sources/FuzzyRange.swift +++ b/CotEditor/Sources/FuzzyRange.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2023 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -122,11 +122,11 @@ extension String { /// e.g. Passing `FuzzyRange(location: 3, length: -1)` to a string that has 10 characters returns `NSRange(3..<9)`. /// /// - Parameters: - /// - range: The character range that allows also negative values. + /// - range: The character range using the grapheme cluster unit that allows also negative values. /// - Returns: A character range, or `nil` if the given value is out of range. func range(in range: FuzzyRange) -> NSRange? { - let wholeLength = self.length + let wholeLength = self.count let newLocation = (range.location >= 0) ? range.location : (wholeLength + range.location + 1) let newLength = (range.length >= 0) ? range.length : (wholeLength - newLocation + range.length) @@ -136,7 +136,10 @@ extension String { newLocation <= wholeLength else { return nil } - return NSRange(newLocation.. NSMenuItem { - - HeadingMenuItem(title: title) - } - - - /// A Boolean value indicating whether the menu item is a section header. - @backDeployed(before: macOS 14) - final var isSectionHeader: Bool { - - self is HeadingMenuItem - } -} - - -public final class HeadingMenuItem: NSMenuItem { +final class HeadingMenuItem: NSMenuItem { // MARK: Lifecycle - public convenience init(title: String) { + convenience init(title: String) { self.init(title: title, action: nil, keyEquivalent: "") self.isEnabled = false @@ -60,7 +38,7 @@ public final class HeadingMenuItem: NSMenuItem { } - public override func awakeFromNib() { + override func awakeFromNib() { super.awakeFromNib() @@ -68,6 +46,12 @@ public final class HeadingMenuItem: NSMenuItem { } + override var isSectionHeader: Bool { + + true + } + + // MARK: Private Methods /// Makes the menu item label heading style. diff --git a/CotEditor/Sources/HelpButton.swift b/CotEditor/Sources/HelpButton.swift deleted file mode 100644 index 42d4a7668..000000000 --- a/CotEditor/Sources/HelpButton.swift +++ /dev/null @@ -1,102 +0,0 @@ -// -// HelpButton.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2022-06-13. -// -// --------------------------------------------------------------------------- -// -// © 2022 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit -import SwiftUI - -struct HelpButton: NSViewRepresentable { - - typealias NSViewType = NSButton - - private var anchor: String? - private var action: (() -> Void)? - - - - /// Initializes a help button to jump the specific anchor in the system help viewer. - /// - /// - Parameter anchor: The help anchor. - init(anchor: String) { - - self.anchor = anchor - } - - - /// Initializes a help button to perform the action when clicked. - /// - /// - Parameter action: The action to perform. - init(action: @escaping () -> Void) { - - self.action = action - } - - - func makeNSView(context: Context) -> NSButton { - - let nsView = NSButton(title: "", target: nil, action: nil) - nsView.bezelStyle = .helpButton - - if let anchor { - nsView.identifier = .init(anchor) - nsView.action = #selector(AppDelegate.openHelpAnchor) - } else if self.action != nil { - nsView.target = context.coordinator - nsView.action = #selector(Coordinator.performAction) - } - - return nsView - } - - - func updateNSView(_ nsView: NSButton, context: Context) { } - - - - func makeCoordinator() -> Coordinator { - - Coordinator(action: self.action) - } - - - - final class Coordinator: NSObject { - - var action: (() -> Void)? - - - init(action: (() -> Void)?) { - - self.action = action - - super.init() - } - - - @objc func performAction(_ sender: NSButton) { - - self.action?() - } - } -} diff --git a/CotEditor/Sources/HoleContentView.swift b/CotEditor/Sources/HoleContentView.swift index bcdee5838..27ff3374a 100644 --- a/CotEditor/Sources/HoleContentView.swift +++ b/CotEditor/Sources/HoleContentView.swift @@ -49,6 +49,7 @@ final class HoleContentView: NSView { super.viewWillMove(toWindow: newWindow) + self.holeViewObserver?.cancel() self.windowOpacityObserver = newWindow?.publisher(for: \.isOpaque, options: .initial) .sink { [unowned self] isOpaque in self.holes.removeAll() @@ -75,11 +76,13 @@ final class HoleContentView: NSView { guard self.window?.isOpaque == false else { return super.draw(dirtyRect) } + let fillRect = dirtyRect.intersection(self.bounds) + NSColor.windowBackgroundColor.setFill() - dirtyRect.fill() + fillRect.fill() for hole in self.holes { - hole.intersection(dirtyRect).fill(using: .clear) + hole.intersection(fillRect).fill(using: .clear) } } } diff --git a/CotEditor/Sources/Identifiable.swift b/CotEditor/Sources/Identifiable.swift index 565f12daf..40b721768 100644 --- a/CotEditor/Sources/Identifiable.swift +++ b/CotEditor/Sources/Identifiable.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,12 @@ extension Sequence where Element: Identifiable { + subscript(id id: Element.ID?) -> Element? { + + self.first { $0.id == id } + } + + func filter(with ids: Set) -> [Element] { self.filter { ids.contains($0.id) } diff --git a/CotEditor/Sources/IncompatibleCharactersView.swift b/CotEditor/Sources/IncompatibleCharactersView.swift index 1a8b20cc6..86525745b 100644 --- a/CotEditor/Sources/IncompatibleCharactersView.swift +++ b/CotEditor/Sources/IncompatibleCharactersView.swift @@ -24,18 +24,19 @@ // import SwiftUI +import Observation import Combine import AppKit.NSTextStorage struct IncompatibleCharactersView: View { - @MainActor final class Model: ObservableObject { + @MainActor @Observable final class Model { typealias Item = ValueRange - @Published var items: [Item] = [] - @Published private(set) var isScanning = false + var items: [Item] = [] + private(set) var isScanning = false var document: Document? { didSet { self.invalidateObservation() } } @@ -44,7 +45,7 @@ struct IncompatibleCharactersView: View { } - @ObservedObject var model: Model + @State var model: Model @State private var selection: Model.Item.ID? @State private var sortOrder: [KeyPathComparator] = [] @@ -76,9 +77,9 @@ struct IncompatibleCharactersView: View { if let line = self.model.document?.lineEndingScanner.lineNumber(at: $0.location) { Text(line, format: .number) .monospacedDigit() - .frame(maxWidth: .infinity, alignment: .trailing) } } + .alignment(.trailing) TableColumn(String(localized: "Character", table: "Document", comment: "table column header"), value: \.value.character) { let character = $0.value.character @@ -93,16 +94,16 @@ struct IncompatibleCharactersView: View { } } - TableColumn(String(localized: "Converted", table: "Document", comment: "table column header for converted character")) { + TableColumn(String(localized: "Converted", table: "Document", comment: "table column header for converted character"), sortUsing: KeyPathComparator(\.value.converted)) { if let converted = $0.value.converted { Text(converted) } } } - .onChange(of: self.selection) { newValue in + .onChange(of: self.selection) { (_, newValue) in self.model.selectItem(id: newValue) } - .onChange(of: self.sortOrder) { newValue in + .onChange(of: self.sortOrder) { (_, newValue) in withAnimation { self.model.items.sort(using: newValue) } @@ -130,7 +131,7 @@ private extension IncompatibleCharactersView.Model { func selectItem(id: Item.ID?) { guard - let item = self.items.first(where: { $0.id == id }), + let item = self.items[id: id], let textView = self.document?.textView, textView.string.length >= item.range.upperBound else { return } @@ -165,10 +166,11 @@ private extension IncompatibleCharactersView.Model { self.items = items } } - } else { self.observer = nil self.task?.cancel() + self.items.removeAll() + self.isScanning = false self.updateMarkup([]) } } @@ -180,7 +182,7 @@ private extension IncompatibleCharactersView.Model { /// /// - Returns: An array of Item. /// - Throws: `CancellationError` - @MainActor private func scan() async throws -> [ValueRange] { + private func scan() async throws -> [ValueRange] { assert(Thread.isMainThread) @@ -203,7 +205,7 @@ private extension IncompatibleCharactersView.Model { /// Update markup in the editors. /// /// - Parameter items: The new incompatible characters. - @MainActor private func updateMarkup(_ items: [ValueRange]) { + private func updateMarkup(_ items: [ValueRange]) { if !self.items.isEmpty { self.document?.textStorage.clearAllMarkup() @@ -247,7 +249,6 @@ private extension NSTextStorage { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 240, height: 300)) { let model = IncompatibleCharactersView.Model() model.items = [ @@ -259,7 +260,6 @@ private extension NSTextStorage { .padding(12) } -@available(macOS 14, *) #Preview("Empty", traits: .fixedLayout(width: 240, height: 300)) { IncompatibleCharactersView(model: .init()) .padding(12) diff --git a/CotEditor/Sources/InconsistentLineEndingsView.swift b/CotEditor/Sources/InconsistentLineEndingsView.swift index 44fa00083..11791013f 100644 --- a/CotEditor/Sources/InconsistentLineEndingsView.swift +++ b/CotEditor/Sources/InconsistentLineEndingsView.swift @@ -24,28 +24,20 @@ // import SwiftUI -import Combine +import Observation struct InconsistentLineEndingsView: View { - @MainActor final class Model: ObservableObject { - - typealias Item = ValueRange - - - @Published var items: [Item] = [] - @Published var lineEnding: LineEnding = .lf - - var document: Document? { didSet { self.invalidateObservation() } } - - private var observers: Set = [] - } + typealias Item = ValueRange - @ObservedObject var model: Model + var document: Document? - @State private var selection: Model.Item.ID? - @State private var sortOrder: [KeyPathComparator] = [] + @State var items: [Item] = [] + @State var lineEnding: LineEnding = .lf + + @State private var selection: Item.ID? + @State private var sortOrder: [KeyPathComparator] = [] var body: some View { @@ -56,59 +48,64 @@ struct InconsistentLineEndingsView: View { .foregroundStyle(.secondary) .accessibilityRemoveTraits(.isHeader) - if self.model.items.isEmpty { + if self.items.isEmpty { Text("No issues found.", tableName: "Document") .foregroundStyle(.secondary) } else { - Text("Found \(self.model.items.count) line endings other than \(self.model.lineEnding.label).", + Text("Found \(self.items.count) line endings other than \(self.lineEnding.label).", tableName: "Document", comment: "%lld is the number of inconsistent line endings and %@ is a line ending type, such as LF") } - if !self.model.items.isEmpty { - Table(self.model.items, selection: $selection, sortOrder: $sortOrder) { + if !self.items.isEmpty { + Table(self.items, selection: $selection, sortOrder: $sortOrder) { TableColumn(String(localized: "Line", table: "Document", comment: "table column header"), value: \.location) { // calculate the line number first at this point to postpone the high cost processing as much as possible - if let line = self.model.document?.lineEndingScanner.lineNumber(at: $0.location) { + if let line = self.document?.lineEndingScanner.lineNumber(at: $0.location) { Text(line, format: .number) .monospacedDigit() - .frame(maxWidth: .infinity, alignment: .trailing) } } + .alignment(.trailing) TableColumn(String(localized: "Line Ending", table: "Document", comment: "table column header"), value: \.value.rawValue) { Text($0.value.label) } } - .onChange(of: self.selection) { newValue in - self.model.selectItem(id: newValue) + .onChange(of: self.selection) { (_, newValue) in + self.selectItem(id: newValue) } - .onChange(of: self.sortOrder) { newValue in + .onChange(of: self.sortOrder) { (_, newValue) in withAnimation { - self.model.items.sort(using: newValue) + self.items.sort(using: newValue) } } .tableStyle(.bordered) .border(Color(nsColor: .gridColor)) } } + .onChange(of: self.document?.lineEndingScanner.inconsistentLineEndings, initial: true) { (_, newValue) in + self.items = (newValue ?? []).sorted(using: self.sortOrder) + } + .onChange(of: self.document?.lineEndingScanner.documentLineEnding, initial: true) { (_, newValue) in + self.lineEnding = newValue ?? .lf + } .accessibilityElement(children: .contain) .accessibilityLabel(Text("Inconsistent Line Endings", tableName: "Document")) .controlSize(.small) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading) } -} - - -private extension InconsistentLineEndingsView.Model { + + + // MARK: Private Methods /// Selects correspondence range of the item in the editor. /// /// - Parameter id: The `id` of the item to select. - func selectItem(id: Item.ID?) { + private func selectItem(id: Item.ID?) { guard - let item = self.items.first(where: { $0.id == id }), + let item = self.items[id: id], let textView = self.document?.textView, textView.string.length >= item.range.upperBound else { return } @@ -116,44 +113,20 @@ private extension InconsistentLineEndingsView.Model { textView.selectedRange = item.range textView.centerSelectionInVisibleArea(self) } - - - func invalidateObservation() { - - if let document { - self.observers = [ - document.lineEndingScanner.$inconsistentLineEndings - .removeDuplicates() - .receive(on: RunLoop.main) - .sink { [weak self] in self?.items = $0 }, - document.$lineEnding - .removeDuplicates() - .receive(on: RunLoop.main) - .sink { [weak self] in self?.lineEnding = $0 }, - ] - } else { - self.observers.removeAll() - } - } } // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 240, height: 300)) { - let model = InconsistentLineEndingsView.Model() - model.items = [ + InconsistentLineEndingsView(items: [ .init(value: .cr, range: .notFound) - ] - - return InconsistentLineEndingsView(model: model) - .padding(12) + ]) + .padding(12) } -@available(macOS 14, *) #Preview("Empty", traits: .fixedLayout(width: 240, height: 300)) { - InconsistentLineEndingsView(model: .init()) + InconsistentLineEndingsView() .padding(12) } diff --git a/CotEditor/Sources/InsetTextField.swift b/CotEditor/Sources/InsetTextField.swift index b0cc985b5..042abb130 100644 --- a/CotEditor/Sources/InsetTextField.swift +++ b/CotEditor/Sources/InsetTextField.swift @@ -189,8 +189,9 @@ final class PaddingTextField: NSTextField { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var text = "" + @Previewable @State var text = "" return InsetTextField(text: $text, prompt: "Prompt") .inset(.leading, 20) diff --git a/CotEditor/Sources/InspectorViewController.swift b/CotEditor/Sources/InspectorViewController.swift index 35c5d987e..85905c9c6 100644 --- a/CotEditor/Sources/InspectorViewController.swift +++ b/CotEditor/Sources/InspectorViewController.swift @@ -25,6 +25,7 @@ import AppKit import SwiftUI +import Defaults enum InspectorPane: Int, CaseIterable { @@ -36,7 +37,7 @@ enum InspectorPane: Int, CaseIterable { protocol DocumentOwner: NSViewController { - var document: Document { get set } + @MainActor var document: Document? { get set } } @@ -44,14 +45,14 @@ final class InspectorViewController: NSTabViewController { // MARK: Public Properties - var document: Document { didSet { self.updateDocument() } } + var document: Document? { didSet { self.updateDocument() } } var selectedPane: InspectorPane { InspectorPane(rawValue: self.selectedTabViewItemIndex) ?? .document } // MARK: Lifecycle - init(document: Document) { + init(document: Document? = nil) { self.document = document @@ -178,7 +179,7 @@ private extension InspectorPane { } - @MainActor func viewController(document: Document) -> NSViewController { + @MainActor func viewController(document: Document?) -> NSViewController { switch self { case .document: diff --git a/CotEditor/Sources/Invisible.swift b/CotEditor/Sources/Invisible.swift index 5b69c13d0..f790b3478 100644 --- a/CotEditor/Sources/Invisible.swift +++ b/CotEditor/Sources/Invisible.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import class Foundation.UserDefaults +import Defaults enum Invisible { diff --git a/CotEditor/Sources/KeyBinding.swift b/CotEditor/Sources/KeyBinding.swift index b84f37dc4..7a09a9a21 100644 --- a/CotEditor/Sources/KeyBinding.swift +++ b/CotEditor/Sources/KeyBinding.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2023 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import struct Foundation.Selector +import Shortcut struct KeyBinding: Hashable, Codable { diff --git a/CotEditor/Sources/KeyBindingItem.swift b/CotEditor/Sources/KeyBindingItem.swift index 52c53cc21..b2b71d19c 100644 --- a/CotEditor/Sources/KeyBindingItem.swift +++ b/CotEditor/Sources/KeyBindingItem.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import struct Foundation.Selector +import Shortcut final class KeyBindingItem { diff --git a/CotEditor/Sources/KeyBindingManager.swift b/CotEditor/Sources/KeyBindingManager.swift index 05a2adbd2..460d7b49e 100644 --- a/CotEditor/Sources/KeyBindingManager.swift +++ b/CotEditor/Sources/KeyBindingManager.swift @@ -25,12 +25,13 @@ // import AppKit +import Shortcut -final class KeyBindingManager { +@MainActor final class KeyBindingManager { // MARK: Public Properties - nonisolated(unsafe) static let shared = KeyBindingManager() + static let shared = KeyBindingManager() // MARK: Private Properties diff --git a/CotEditor/Sources/KeyBindingsSettingsView.swift b/CotEditor/Sources/KeyBindingsSettingsView.swift index ffeb2e6e1..d952e0438 100644 --- a/CotEditor/Sources/KeyBindingsSettingsView.swift +++ b/CotEditor/Sources/KeyBindingsSettingsView.swift @@ -25,12 +25,13 @@ import SwiftUI import AppKit -import Combine +import Observation import OSLog +import Shortcut struct KeyBindingsSettingsView: View { - @StateObject private var model = KeyBindingModel() + @State private var model = KeyBindingModel() var body: some View { @@ -40,7 +41,7 @@ struct KeyBindingsSettingsView: View { .lineLimit(10) .fixedSize(horizontal: false, vertical: true) - KeyBindingTreeView(model: self.model) + KeyBindingTreeView(model: $model) HStack(alignment: .firstTextBaseline) { Button(String(localized: "Restore Defaults", table: "KeyBindingsSettings", comment: "button label")) { @@ -56,7 +57,7 @@ struct KeyBindingsSettingsView: View { .foregroundStyle(.red) .controlSize(.small) } - HelpButton(anchor: "settings_keybindings") + HelpLink(anchor: "settings_keybindings") }.frame(minHeight: 20) } .onAppear { @@ -68,15 +69,15 @@ struct KeyBindingsSettingsView: View { } -private final class KeyBindingModel: ObservableObject { +@MainActor @Observable private final class KeyBindingModel { typealias Item = Node - @Published private(set) var tree: [Item] = [] - @Published private(set) var isRestorable: Bool = false - @Published var error: (any Error)? + private(set) var tree: [Item] = [] + private(set) var isRestorable: Bool = false + var error: (any Error)? - @Published var rootIndex: Int? + var rootIndex: Int? /// Loads data from the user defaults. @@ -122,7 +123,7 @@ private struct KeyBindingTreeView: NSViewControllerRepresentable { typealias NSViewControllerType = NSViewController - @ObservedObject var model: KeyBindingModel + @Binding var model: KeyBindingModel func makeNSViewController(context: Context) -> NSViewController { @@ -156,8 +157,6 @@ final class KeyBindingTreeViewController: NSViewController, NSOutlineViewDataSou private let model: KeyBindingModel - private var observer: AnyCancellable? - @IBOutlet private weak var listView: NSTableView? @IBOutlet private weak var outlineView: NSOutlineView? @@ -186,18 +185,7 @@ final class KeyBindingTreeViewController: NSViewController, NSOutlineViewDataSou self.listView?.reloadData() self.outlineView?.reloadData() - // observe restoration - self.observer = self.model.$isRestorable - .filter { !$0 } - .sink { [weak self] _ in self?.outlineView?.reloadData() } - } - - - override func viewDidDisappear() { - - super.viewDidDisappear() - - self.observer?.cancel() + self.observe() } @@ -271,7 +259,7 @@ final class KeyBindingTreeViewController: NSViewController, NSOutlineViewDataSou // MARK: Action Messages /// Validates and apply new shortcut key input. - @IBAction func didEditShortcut(_ sender: ShortcutField) { + @IBAction func didEditShortcut(_ sender: ShortcutTextField) { guard let outlineView = self.outlineView else { return assertionFailure() } @@ -314,6 +302,23 @@ final class KeyBindingTreeViewController: NSViewController, NSOutlineViewDataSou self.model.save() outlineView.reloadData(forRowIndexes: [row], columnIndexes: [column]) } + + + // MARK: Private Methods + + /// Recursively observes the `.isRestorable` flag. + private func observe() { + + withObservationTracking { [weak self] in + if self?.model.isRestorable == false { + self?.outlineView?.reloadData() + } + } onChange: { + Task { @MainActor [weak self] in + self?.observe() + } + } + } } diff --git a/CotEditor/Sources/LayoutManager.swift b/CotEditor/Sources/LayoutManager.swift index b034dd65d..635861b21 100644 --- a/CotEditor/Sources/LayoutManager.swift +++ b/CotEditor/Sources/LayoutManager.swift @@ -9,7 +9,7 @@ // --------------------------------------------------------------------------- // // © 2004-2007 nakamuxu -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import AppKit import Combine +import Defaults class LayoutManager: NSLayoutManager, InvisibleDrawing, ValidationIgnorable, LineRangeCacheable { @@ -110,6 +111,15 @@ class LayoutManager: NSLayoutManager, InvisibleDrawing, ValidationIgnorable, Lin // MARK: Layout Manager Methods + override func replaceTextStorage(_ newTextStorage: NSTextStorage) { + + super.replaceTextStorage(newTextStorage) + + // reset line range cache + self.lineRangeCache = .init() + } + + /// Adjusts rect of last empty line. override func setExtraLineFragmentRect(_ fragmentRect: NSRect, usedRect: NSRect, textContainer container: NSTextContainer) { diff --git a/CotEditor/Sources/String+Normalization.swift b/CotEditor/Sources/Libraries/UnicodeNormalizationForm.swift similarity index 52% rename from CotEditor/Sources/String+Normalization.swift rename to CotEditor/Sources/Libraries/UnicodeNormalizationForm.swift index 10627d23f..59bacf7f6 100644 --- a/CotEditor/Sources/String+Normalization.swift +++ b/CotEditor/Sources/Libraries/UnicodeNormalizationForm.swift @@ -1,14 +1,14 @@ // -// String+Normalization.swift +// UnicodeNormalizationForm.swift // // CotEditor // https://coteditor.com // -// Created by 1024jp on 2015-08-25. +// Created by 1024jp on 2024-06-13. // // --------------------------------------------------------------------------- // -// © 2015-2024 1024jp +// © 2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,23 +23,11 @@ // limitations under the License. // -import Foundation +import UnicodeNormalization -enum UnicodeNormalizationForm: String, CaseIterable { +extension UnicodeNormalizationForm { - case nfd - case nfc - case nfkd - case nfkc - case nfkcCasefold - case modifiedNFD - case modifiedNFC - - static let standardForms: [Self] = [.nfd, .nfc, .nfkd, .nfkc, .nfkcCasefold] - static let modifiedForms: [Self] = [.modifiedNFD, .modifiedNFC] - - - /// Localized name. + /// The localized name. var localizedName: String { switch self { @@ -75,7 +63,7 @@ enum UnicodeNormalizationForm: String, CaseIterable { } - /// Localized description for user. + /// The localized description. var localizedDescription: String { switch self { @@ -117,87 +105,9 @@ enum UnicodeNormalizationForm: String, CaseIterable { } } - /// Unique identifier for menu item. var tag: Int { Self.allCases.firstIndex(of: self)! } } - - -extension UnicodeNormalizationForm: DefaultInitializable { - - static let defaultValue: Self = .nfc -} - - -extension StringProtocol { - - /// Returns a string created by normalizing the string’s contents using the specified form. - /// - /// - Parameter form: The Unicode normalization form. - /// - Returns: A normalized string. - func normalizing(in form: UnicodeNormalizationForm) -> String { - - switch form { - case .nfd: - self.decomposedStringWithCanonicalMapping - case .nfc: - self.precomposedStringWithCanonicalMapping - case .nfkd: - self.decomposedStringWithCompatibilityMapping - case .nfkc: - self.precomposedStringWithCompatibilityMapping - case .nfkcCasefold: - self.precomposedStringWithCompatibilityMappingWithCasefold - case .modifiedNFD: - String(self).decomposedStringWithHFSPlusMapping - case .modifiedNFC: - String(self).precomposedStringWithHFSPlusMapping - } - } -} - - -extension StringProtocol { - - /// A string made by normalizing the receiver’s contents using the Unicode Normalization Form KC with Casefold a.k.a. `NFKC_Casefold` or `NFKC_CF`. - var precomposedStringWithCompatibilityMappingWithCasefold: String { - - self.precomposedStringWithCompatibilityMapping - .folding(options: .caseInsensitive, locale: nil) - } -} - - -extension String { - - // MARK: Public Properties - - /// A string made by normalizing the receiver’s contents using the normalization form adopted by HFS+, a.k.a. Apple Modified NFC. - var precomposedStringWithHFSPlusMapping: String { - - let exclusionCharacters = "\\x{0340}\\x{0341}\\x{0343}\\x{0344}\\x{0374}\\x{037E}\\x{0387}\\x{0958}-\\x{095F}\\x{09DC}\\x{09DD}\\x{09DF}\\x{0A33}\\x{0A36}\\x{0A59}-\\x{0A5B}\\x{0A5E}\\x{0B5C}\\x{0B5D}\\x{0F43}\\x{0F4D}\\x{0F52}\\x{0F57}\\x{0F5C}\\x{0F69}\\x{0F73}\\x{0F75}\\x{0F76}\\x{0F78}\\x{0F81}\\x{0F93}\\x{0F9D}\\x{0FA2}\\x{0FA7}\\x{0FAC}\\x{0FB9}\\x{1F71}\\x{1F73}\\x{1F75}\\x{1F77}\\x{1F79}\\x{1F7B}\\x{1F7D}\\x{1FBB}\\x{1FBE}\\x{1FC9}\\x{1FCB}\\x{1FD3}\\x{1FDB}\\x{1FE3}\\x{1FEB}\\x{1FEE}\\x{1FEF}\\x{1FF9}\\x{1FFB}\\x{1FFD}\\x{2000}\\x{2001}\\x{2126}\\x{212A}\\x{212B}\\x{2329}\\x{232A}\\x{2ADC}\\x{F900}-\\x{FA0D}\\x{FA10}\\x{FA12}\\x{FA15}-\\x{FA1E}\\x{FA20}\\x{FA22}\\x{FA25}\\x{FA26}\\x{FA2A}-\\x{FA6D}\\x{FA70}-\\x{FAD9}\\x{FB1D}\\x{FB1F}\\x{FB2A}-\\x{FB36}\\x{FB38}-\\x{FB3C}\\x{FB3E}\\x{FB40}\\x{FB41}\\x{FB43}\\x{FB44}\\x{FB46}-\\x{FB4E}\\x{1D15E}-\\x{1D164}\\x{1D1BB}-\\x{1D1C0}\\x{2F800}-\\x{2FA1D}" - let regex = try! NSRegularExpression(pattern: "[^" + exclusionCharacters + "]+") - - let mutable = NSMutableString(string: self) - - return regex.matches(in: self, range: self.nsRange) - .map(\.range) - .reversed() - .reduce(into: mutable) { $0.replaceCharacters(in: $1, with: $0.substring(with: $1).precomposedStringWithCanonicalMapping) } as String - } - - - /// A string made by normalizing the receiver’s contents using the normalization form adopted by HFS+, a.k.a. Apple Modified NFD. - var decomposedStringWithHFSPlusMapping: String { - - let length = CFStringGetMaximumSizeOfFileSystemRepresentation(self as CFString) - var buffer = [CChar](repeating: 0, count: length) - - guard CFStringGetFileSystemRepresentation(self as CFString, &buffer, length) else { return self } - - return String(cString: buffer) - } -} diff --git a/CotEditor/Sources/LineEndingScanner.swift b/CotEditor/Sources/LineEndingScanner.swift index 96fd85187..06aa1701e 100644 --- a/CotEditor/Sources/LineEndingScanner.swift +++ b/CotEditor/Sources/LineEndingScanner.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,11 +25,13 @@ import Combine import Foundation +import Observation import class AppKit.NSTextStorage -final class LineEndingScanner { +@Observable final class LineEndingScanner { - @Published private(set) var inconsistentLineEndings: [ValueRange] + private(set) var documentLineEnding: LineEnding + private(set) var inconsistentLineEndings: [ValueRange] = [] // MARK: Private Properties @@ -37,13 +39,6 @@ final class LineEndingScanner { private let textStorage: NSTextStorage private var lineEndings: [ValueRange] - private var documentLineEnding: LineEnding { - - didSet { - self.inconsistentLineEndings = self.lineEndings.filter { $0.value != documentLineEnding } - } - } - private var lineEndingObserver: AnyCancellable? private var storageObserver: AnyCancellable? @@ -62,7 +57,12 @@ final class LineEndingScanner { self.storageObserver = NotificationCenter.default.publisher(for: NSTextStorage.didProcessEditingNotification, object: textStorage) .compactMap { $0.object as? NSTextStorage } .filter { $0.editedMask.contains(.editedCharacters) } - .sink { [weak self] in self?.invalidate(in: $0.editedRange, changeInLength: $0.changeInLength) } + .sink { [weak self] in + guard let self else { return } + + self.invalidate(in: $0.editedRange, changeInLength: $0.changeInLength) + self.inconsistentLineEndings = self.lineEndings.filter { $0.value != self.documentLineEnding } + } } diff --git a/CotEditor/Sources/LineNumberView.swift b/CotEditor/Sources/LineNumberView.swift index ffc60c1f1..65a2326bc 100644 --- a/CotEditor/Sources/LineNumberView.swift +++ b/CotEditor/Sources/LineNumberView.swift @@ -58,31 +58,7 @@ final class LineNumberView: NSView { } - // MARK: Public Properties - - var orientation: NSLayoutManager.TextLayoutOrientation = .horizontal { - - didSet { - if !self.isHiddenOrHasHiddenAncestor { - self.invalidateThickness() - } - } - } - - @Invalidating(.display) var drawsSeparator = false - - - // MARK: Constants - - private let minNumberOfDigits = 3 - private let minVerticalThickness = 32.0 - private let minHorizontalThickness = 20.0 - - private static let lineNumberFont: CGFont = NSFont.lineNumberFont().cgFont - private static let boldLineNumberFont: CGFont = NSFont.lineNumberFont(weight: .medium).cgFont - private static let highContrastBoldLineNumberFont: CGFont = NSFont.lineNumberFont(weight: .semibold).cgFont - - private enum ColorStrength: CGFloat { + private enum ColorStrength: Double { case normal = 0.6 case bold = 1.0 @@ -93,12 +69,33 @@ final class LineNumberView: NSView { } + // MARK: Public Properties + + weak var textView: NSTextView? { didSet { self.updateTextView(textView)} } + + var orientation: NSLayoutManager.TextLayoutOrientation = .horizontal { + + didSet { + if !self.isHiddenOrHasHiddenAncestor { + self.invalidateThickness() + } + } + } + + @Invalidating(.display) var layoutDirection: NSUserInterfaceLayoutDirection = .leftToRight + @Invalidating(.display) var drawsSeparator = false + + // MARK: Private Properties - private let textView: NSTextView + private static let lineNumberFont: CGFont = NSFont.lineNumberFont().cgFont + private static let boldLineNumberFont: CGFont = NSFont.lineNumberFont(weight: .medium).cgFont + private static let highContrastBoldLineNumberFont: CGFont = NSFont.lineNumberFont(weight: .semibold).cgFont - private var drawingInfo: DrawingInfo - @Invalidating(.intrinsicContentSize) private var thickness = 32.0 + private let minimumNumberOfDigits = 3 + + private var drawingInfo: DrawingInfo? + @Invalidating(.intrinsicContentSize) private var thickness: Double = 32 @Invalidating(.display) private var textColor: NSColor = .textColor @Invalidating(.display) private var backgroundColor: NSColor = .textBackgroundColor @@ -111,26 +108,6 @@ final class LineNumberView: NSView { - // MARK: Lifecycle - - init(textView: NSTextView) { - - self.textView = textView - self.drawingInfo = DrawingInfo(fontSize: textView.font!.pointSize, scale: textView.scale) - - super.init(frame: .zero) - - self.observeTextView(textView) - } - - - required init?(coder: NSCoder) { - - fatalError("init(coder:) has not been implemented") - } - - - // MARK: View Methods override func accessibilityLabel() -> String? { @@ -141,7 +118,7 @@ final class LineNumberView: NSView { override var isOpaque: Bool { - self.textView.isOpaque + self.textView?.isOpaque != false } @@ -161,10 +138,7 @@ final class LineNumberView: NSView { // remove observations before all observed objects are deallocated if newWindow == nil { - assert(self.textView.enclosingScrollView?.contentView != nil) - - self.textViewSubscriptions.removeAll() - self.textStorageObserver = nil + self.updateTextView(nil) } // redraw on window opacity change @@ -177,15 +151,17 @@ final class LineNumberView: NSView { NSGraphicsContext.saveGraphicsState() + let fillView = dirtyRect.intersection(self.bounds) + // fill background if self.isOpaque { self.backgroundColor.setFill() - dirtyRect.fill() + fillView.fill() } // draw separator if self.drawsSeparator { - let lineRect: NSRect = switch (self.orientation, self.textView.baseWritingDirection) { + let lineRect: NSRect = switch (self.orientation, self.layoutDirection) { case (.vertical, _): NSRect(x: 0, y: 0, width: self.frame.width, height: 1) case (_, .rightToLeft): NSRect(x: 0, y: 0, width: 1, height: self.frame.height) default: NSRect(x: self.frame.width - 1, y: 0, width: 1, height: self.frame.height) @@ -193,7 +169,7 @@ final class LineNumberView: NSView { self.foregroundColor(.separator).set() self.backingAlignedRect(lineRect, options: .alignAllEdgesOutward) - .intersection(dirtyRect) + .intersection(fillView) .fill() } @@ -209,9 +185,11 @@ final class LineNumberView: NSView { /// The total number of lines in the text view. private var numberOfLines: Int { - assert(self.textView.layoutManager is any LineRangeCacheable) + guard let textView = self.textView else { return 0 } - return self.textView.lineNumber(at: self.textView.string.length) + assert(textView.layoutManager is any LineRangeCacheable) + + return textView.lineNumber(at: textView.string.length) } @@ -240,20 +218,23 @@ final class LineNumberView: NSView { /// Draws line numbers. private func drawNumbers(in rect: NSRect) { + guard + let textView = self.textView, + let drawingInfo = self.drawingInfo + else { return } + guard // -> Requires additionalLayout to obtain glyphRange for markedText. (2018-12 macOS 10.14 SDK) - let range = self.textView.range(for: self.textView.visibleRect), - let layoutManager = self.textView.layoutManager as? LayoutManager, + let range = textView.range(for: textView.visibleRect), + let layoutManager = textView.layoutManager as? LayoutManager, let context = NSGraphicsContext.current?.cgContext else { return assertionFailure() } context.setFont(Self.lineNumberFont) - context.setFontSize(self.drawingInfo.fontSize) + context.setFontSize(drawingInfo.fontSize) context.setFillColor(self.foregroundColor().cgColor) context.setStrokeColor(self.foregroundColor(.stroke).cgColor) - let drawingInfo = self.drawingInfo - let textView = self.textView let isVerticalText = textView.layoutOrientation == .vertical let scale = textView.scale @@ -314,9 +295,12 @@ final class LineNumberView: NSView { /// Updates parameters related to drawing and layout based on textView's status. private func invalidateDrawingInfo() { - guard let textFont = self.textView.font else { return assertionFailure() } + guard + let textView = self.textView, + let textFont = textView.font + else { return assertionFailure() } - self.drawingInfo = DrawingInfo(fontSize: textFont.pointSize, scale: self.textView.scale) + self.drawingInfo = DrawingInfo(fontSize: textFont.pointSize, scale: textView.scale) self.invalidateThickness() self.needsDisplay = true @@ -326,28 +310,39 @@ final class LineNumberView: NSView { /// Updates receiver's thickness based on drawingInfo and textView's status. private func invalidateThickness() { - self.thickness = { + var thickness: Double = 0 + if let drawingInfo = self.drawingInfo { switch self.orientation { case .horizontal: - let requiredNumberOfDigits = max(self.numberOfLines.digits.count, self.minNumberOfDigits) - let thickness = CGFloat(requiredNumberOfDigits) * self.drawingInfo.charWidth + 2 * self.drawingInfo.padding - return max(thickness.rounded(.up), self.minVerticalThickness) + let requiredNumberOfDigits = max(self.numberOfLines.digits.count, self.minimumNumberOfDigits) + thickness = CGFloat(requiredNumberOfDigits) * drawingInfo.charWidth + 2 * drawingInfo.padding case .vertical: - let thickness = self.drawingInfo.fontSize + 4 * self.drawingInfo.tickLength - return max(thickness.rounded(.up), self.minHorizontalThickness) + thickness = drawingInfo.fontSize + 4 * drawingInfo.tickLength - @unknown default: fatalError() + @unknown default: break } - }() + } + + let minimumThickness: Double = (self.orientation == .vertical) ? 20 : 32 + self.thickness = max(thickness.rounded(.up), minimumThickness) } /// Observes textView's update to update line number drawing. - private func observeTextView(_ textView: NSTextView) { + private func updateTextView(_ textView: NSTextView?) { + + guard let textView else { + self.drawingInfo = nil + self.textStorageObserver?.cancel() + self.textViewSubscriptions.removeAll() + return + } assert(textView.enclosingScrollView?.contentView != nil) + self.drawingInfo = DrawingInfo(fontSize: textView.font!.pointSize, scale: textView.scale) + self.textViewSubscriptions = [ // observe content change textView.layoutManager!.publisher(for: \.textStorage, options: .initial) @@ -411,20 +406,23 @@ extension LineNumberView { /// Scrolls parent textView with scroll event. override func scrollWheel(with event: NSEvent) { - self.textView.scrollWheel(with: event) + self.textView?.scrollWheel(with: event) } /// Starts selecting correspondent lines in text view with a dragging / clicking event. override func mouseDown(with event: NSEvent) { - guard let window = self.window else { return assertionFailure() } + guard + let textView = self.textView, + let window = self.window + else { return assertionFailure() } // get start point let point = window.convertPoint(toScreen: event.locationInWindow) - let index = self.textView.characterIndex(for: point) + let index = textView.characterIndex(for: point) - let selectedRanges = self.textView.selectedRanges.map(\.rangeValue) + let selectedRanges = textView.selectedRanges.map(\.rangeValue) self.draggingInfo = DraggingInfo(index: index, selectedRanges: selectedRanges) @@ -454,12 +452,11 @@ extension LineNumberView { private func selectLines(with event: NSEvent) { guard + let textView = self.textView, let window = self.window, let draggingInfo = self.draggingInfo else { return assertionFailure() } - let textView = self.textView - // scroll text view if needed let point = textView.convert(event.locationInWindow, from: nil) // textView-based textView.scrollToVisible(NSRect(origin: point, size: .zero)) diff --git a/CotEditor/Sources/LiveTextInsertionView.swift b/CotEditor/Sources/LiveTextInsertionView.swift index e786da091..8063792ff 100644 --- a/CotEditor/Sources/LiveTextInsertionView.swift +++ b/CotEditor/Sources/LiveTextInsertionView.swift @@ -27,7 +27,7 @@ import AppKit import SwiftUI @preconcurrency import VisionKit -extension NSImage: @unchecked Sendable { } +extension NSImage: @retroactive @unchecked Sendable { } struct LiveTextInsertionView: View { @@ -56,7 +56,7 @@ struct LiveTextInsertionView: View { Divider() HStack(alignment: .firstTextBaseline) { - HelpButton(anchor: "howto_insert_camera_text") + HelpLink(anchor: "howto_insert_camera_text") Spacer() if case .success(let analysis) = self.result, !analysis.transcript.isEmpty { diff --git a/CotEditor/Sources/ModeSettingsView.swift b/CotEditor/Sources/ModeSettingsView.swift index a31538a3b..0c560302d 100644 --- a/CotEditor/Sources/ModeSettingsView.swift +++ b/CotEditor/Sources/ModeSettingsView.swift @@ -41,7 +41,7 @@ struct ModeSettingsView: View { GroupBox { ModeOptionsView(options: $options) .disabled(!self.selection.available) - .onChange(of: self.options) { newValue in + .onChange(of: self.options) { (_, newValue) in Task { await ModeManager.shared.save(setting: newValue, mode: self.selection) } @@ -52,15 +52,12 @@ struct ModeSettingsView: View { HStack { Spacer() - HelpButton(anchor: "settings_mode") + HelpLink(anchor: "settings_mode") } } - .task { - self.options = await ModeManager.shared.setting(for: self.selection) - } - .onChange(of: self.selection) { mode in // migrate to .onChange(of:initial:... + .onChange(of: self.selection, initial: true) { (_, newValue) in Task { - self.options = await ModeManager.shared.setting(for: mode) + self.options = await ModeManager.shared.setting(for: newValue) } } .scenePadding() @@ -97,8 +94,8 @@ private struct ModeListView: View { Text(mode.label) if !available { Spacer() - Image(systemName: "exclamationmark.triangle") - .accessibilityLabel(String(localized: "Not found", table: "ModeSettings", comment: "accessibility label")) + Label(String(localized: "Not found", table: "ModeSettings", comment: "accessibility label"), systemImage: "exclamationmark.triangle") + .labelStyle(.iconOnly) } } .tag(mode) @@ -115,7 +112,7 @@ private struct ModeListView: View { .padding(.horizontal, 6) HStack(spacing: 0) { - Menu { + Menu(String(localized: "Add", table: "ModeSettings"), systemImage: "plus") { Section(String(localized: "Syntax", table: "ModeSettings")) { ForEach(SyntaxManager.shared.settingNames, id: \.self) { syntaxName in Button(syntaxName) { @@ -134,12 +131,9 @@ private struct ModeListView: View { }.disabled(self.syntaxModes.compactMap(\.syntaxName).contains(syntaxName)) } } - } label: { - Image(systemName: "plus") } - .padding(4) + .padding(EdgeInsets(top: 4, leading: 2, bottom: 4, trailing: 2)) .menuIndicator(.hidden) - .accessibilityLabel(String(localized: "Add", table: "ModeSettings")) .alert(error: $error) Button { @@ -152,15 +146,15 @@ private struct ModeListView: View { } } } label: { - Image(systemName: "minus") + Label(String(localized: "Remove", table: "ModeSettings"), systemImage: "minus") .frame(width: 14, height: 14) .fontWeight(.medium) } - .padding(4) - .accessibilityLabel(String(localized: "Remove", table: "ModeSettings")) + .padding(EdgeInsets(top: 4, leading: 2, bottom: 4, trailing: 2)) .disabled(self.selection.syntaxName == nil) } .padding(2) + .labelStyle(.iconOnly) .buttonStyle(.borderless) } .task { diff --git a/CotEditor/Sources/MultipleReplaceListViewController.swift b/CotEditor/Sources/MultipleReplaceListViewController.swift index f1db4b574..bb40596e8 100644 --- a/CotEditor/Sources/MultipleReplaceListViewController.swift +++ b/CotEditor/Sources/MultipleReplaceListViewController.swift @@ -28,6 +28,7 @@ import AudioToolbox import Combine import UniformTypeIdentifiers import OSLog +import Defaults final class MultipleReplaceListViewController: NSViewController, NSMenuItemValidation { @@ -36,7 +37,6 @@ final class MultipleReplaceListViewController: NSViewController, NSMenuItemValid private var settingNames: [String] = [] private var settingUpdateObserver: AnyCancellable? - private var listUpdateObserver: AnyCancellable? private lazy var filePromiseQueue = OperationQueue() @IBOutlet private weak var tableView: NSTableView? @@ -78,9 +78,13 @@ final class MultipleReplaceListViewController: NSViewController, NSMenuItemValid self.tableView?.selectRowIndexes([row], byExtendingSelection: false) // observe replacement setting list change - self.listUpdateObserver = ReplacementManager.shared.$settingNames - .receive(on: RunLoop.main) - .sink { [weak self] _ in self?.updateSettingList() } + withContinuousObservationTracking(initial: true) { + _ = ReplacementManager.shared.settingNames + } onChange: { + Task { @MainActor in + self.updateSettingList() + } + } } @@ -93,6 +97,14 @@ final class MultipleReplaceListViewController: NSViewController, NSMenuItemValid self.settingUpdateObserver = self.detailViewController?.didSettingUpdate .sink { [weak self] in self?.saveSetting(setting: $0) } } + + + override func viewDidDisappear() { + + super.viewDidDisappear() + + self.settingUpdateObserver?.cancel() + } diff --git a/CotEditor/Sources/MultipleReplaceViewController.swift b/CotEditor/Sources/MultipleReplaceViewController.swift index 53c67ce49..7211b40ed 100644 --- a/CotEditor/Sources/MultipleReplaceViewController.swift +++ b/CotEditor/Sources/MultipleReplaceViewController.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2023 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import AppKit import Combine import SwiftUI +import Defaults final class MultipleReplaceViewController: NSViewController { @@ -53,6 +54,8 @@ final class MultipleReplaceViewController: NSViewController { super.viewDidLoad() + // register dragged type + self.tableView?.registerForDraggedTypes([.row]) self.tableView?.setDraggingSourceOperationMask([.delete], forLocal: false) } @@ -403,7 +406,7 @@ private extension NSUserInterfaceItemIdentifier { private extension NSPasteboard.PasteboardType { - static let rows = NSPasteboard.PasteboardType("rows") + static let row = NSPasteboard.PasteboardType("com.coteditor.row") } @@ -454,7 +457,7 @@ extension MultipleReplaceViewController: NSTableViewDelegate { do { try replacement.validate(regexOptions: self.definition.settings.regexOptions) } catch { - guard let suggestion = (error as? any LocalizedError)?.recoverySuggestion else { return error.localizedDescription } + guard let suggestion = (error as any LocalizedError).recoverySuggestion else { return error.localizedDescription } return "[" + error.localizedDescription + "] " + suggestion } @@ -548,22 +551,10 @@ extension MultipleReplaceViewController: NSTableViewDataSource { } - /// Starts dragging. - func tableView(_ tableView: NSTableView, writeRowsWith rowIndexes: IndexSet, to pboard: NSPasteboard) -> Bool { + /// Sets items per row to drag. + func tableView(_ tableView: NSTableView, pasteboardWriterForRow row: Int) -> (any NSPasteboardWriting)? { - // register dragged type - tableView.registerForDraggedTypes([.rows]) - pboard.declareTypes([.rows], owner: self) - - // select rows to drag - tableView.selectRowIndexes(rowIndexes, byExtendingSelection: false) - - // store row index info to pasteboard - guard let rows = try? NSKeyedArchiver.archivedData(withRootObject: rowIndexes, requiringSecureCoding: true) else { return false } - - pboard.setData(rows, forType: .rows) - - return true + NSPasteboardItem(pasteboardPropertyList: row, ofType: .row) } @@ -581,22 +572,18 @@ extension MultipleReplaceViewController: NSTableViewDataSource { } - /// Checks the acceptability of dragged items and inserts them to table. + /// Inserts dragged items to table. func tableView(_ tableView: NSTableView, acceptDrop info: any NSDraggingInfo, row: Int, dropOperation: NSTableView.DropOperation) -> Bool { // accept only self drag-and-drop guard info.draggingSource as? NSTableView == tableView else { return false } - // obtain original rows from paste board - guard - let data = info.draggingPasteboard.data(forType: .rows), - let sourceRows = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSIndexSet.self, from: data) as IndexSet? - else { return false } + // obtain original rows from pasteboard + guard let sourceRows = info.draggingPasteboard.rows else { return false } let destinationRow = row - sourceRows.count(in: 0...row) // real insertion point after removing items to move let destinationRows = IndexSet(destinationRow..<(destinationRow + sourceRows.count)) - // move self.moveReplacements(from: sourceRows, to: destinationRows) return true @@ -608,10 +595,7 @@ extension MultipleReplaceViewController: NSTableViewDataSource { switch operation { case .delete: // ended at the Trash - guard - let data = session.draggingPasteboard.data(forType: .rows), - let rows = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSIndexSet.self, from: data) as IndexSet? - else { return } + guard let rows = session.draggingPasteboard.rows else { return } self.removeReplacements(at: rows) @@ -620,3 +604,14 @@ extension MultipleReplaceViewController: NSTableViewDataSource { } } } + + +private extension NSPasteboard { + + var rows: IndexSet? { + + self.pasteboardItems? + .compactMap { $0.propertyList(forType: .row) as? Int } + .reduce(into: IndexSet()) { $0.insert($1) } + } +} diff --git a/CotEditor/Sources/NSBezierPath.swift b/CotEditor/Sources/NSBezierPath.swift index 4672a805a..e2c3102db 100644 --- a/CotEditor/Sources/NSBezierPath.swift +++ b/CotEditor/Sources/NSBezierPath.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2018-2023 1024jp +// © 2018-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,48 +25,6 @@ import AppKit.NSBezierPath -public extension NSBezierPath { - - /// A back deployed version of the NSBezierPath creation from a CGPath. - /// - /// - Parameter cgPath: A CGPath to convert to NSBezierPath. - @backDeployed(before: macOS 14) - convenience init(cgPath: CGPath) { - - self.init() - - cgPath.applyWithBlock { pointer in - let element = pointer.pointee - - switch element.type { - case .moveToPoint: - self.move(to: element.points[0]) - - case .addLineToPoint: - self.line(to: element.points[0]) - - case .addQuadCurveToPoint: - let controlPoint1 = NSPoint(x: self.currentPoint.x + (2 / 3 * (element.points[0].x - self.currentPoint.x)), - y: self.currentPoint.y + (2 / 3 * (element.points[0].y - self.currentPoint.y))) - let controlPoint2 = NSPoint(x: element.points[1].x + (2 / 3 * (element.points[0].x - element.points[1].x)), - y: element.points[1].y + (2 / 3 * (element.points[0].y - element.points[1].y))) - self.curve(to: element.points[1], controlPoint1: controlPoint1, controlPoint2: controlPoint2) - - case .addCurveToPoint: - self.curve(to: element.points[2], controlPoint1: element.points[0], controlPoint2: element.points[1]) - - case .closeSubpath: - self.close() - - @unknown default: - assertionFailure() - } - } - } -} - - - // MARK: Rounded Corner struct RectCorner: OptionSet { diff --git a/CotEditor/Sources/NSColor+NamedColors.swift b/CotEditor/Sources/NSColor+NamedColors.swift index 16b63514b..37fb2ccdb 100644 --- a/CotEditor/Sources/NSColor+NamedColors.swift +++ b/CotEditor/Sources/NSColor+NamedColors.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -53,28 +53,3 @@ extension NSColor { .map { NSColor(calibratedHue: $0, saturation: self.saturationComponent, brightness: self.brightnessComponent, alpha: self.alphaComponent) } } } - - - -public extension NSColor { - - /// The back-deployed version of the `.systemFill`. - @backDeployed(before: macOS 14) - static var systemFill: NSColor { .labelColor.withAlphaComponent(0.50) } - - /// The back-deployed version of the `.secondarySystemFill`. - @backDeployed(before: macOS 14) - static var secondarySystemFill: NSColor { .labelColor.withAlphaComponent(0.15) } - - /// The back-deployed version of the `.tertiarySystemFill`. - @backDeployed(before: macOS 14) - static var tertiarySystemFill: NSColor { .labelColor.withAlphaComponent(0.10) } - - /// The back-deployed version of the `.quaternarySystemFill`. - @backDeployed(before: macOS 14) - static var quaternarySystemFill: NSColor { .labelColor.withAlphaComponent(0.05) } - - /// The back-deployed version of the `.quinarySystemFill`. - @backDeployed(before: macOS 14) - static var quinarySystemFill: NSColor { .labelColor.withAlphaComponent(0.03) } -} diff --git a/CotEditor/Sources/NSDocument+ErrorHandling.swift b/CotEditor/Sources/NSDocument.swift similarity index 77% rename from CotEditor/Sources/NSDocument+ErrorHandling.swift rename to CotEditor/Sources/NSDocument.swift index 4a5bd5d75..a52fb6fe5 100644 --- a/CotEditor/Sources/NSDocument+ErrorHandling.swift +++ b/CotEditor/Sources/NSDocument.swift @@ -1,5 +1,5 @@ // -// NSDocument+ErrorHandling.swift +// NSDocument.swift // // CotEditor // https://coteditor.com @@ -56,6 +56,32 @@ extension NSDocument.SaveOperationType { } +extension NSDocument { + + /// Reverts the receiver with the current document file without asking to the user in advance. + /// + /// - Parameter fileURL: The location from which the document contents are read, or `nil` to revert at the same location. + /// - Returns: `true` if succeeded. + @discardableResult final func revert(fileURL: URL? = nil) -> Bool { + + guard + let fileURL = fileURL ?? self.fileURL, + let fileType = self.fileType + else { return false } + + do { + try self.revert(toContentsOf: fileURL, ofType: fileType) + } catch { + self.presentErrorAsSheet(error) + return false + } + + return true + } +} + + +// MARK: Error Handling extension NSDocument { @@ -63,7 +89,7 @@ extension NSDocument { /// Presents an error alert as document modal sheet. - @MainActor final func presentErrorAsSheet(_ error: some Error, recoveryHandler: RecoveryHandler? = nil) { + final func presentErrorAsSheet(_ error: some Error, recoveryHandler: RecoveryHandler? = nil) { guard let window = self.windowForSheet else { let didRecover = self.presentError(error) diff --git a/CotEditor/Sources/NSDraggingInfo.swift b/CotEditor/Sources/NSDraggingInfo.swift index 70f0ab1ac..21dbd0bd3 100644 --- a/CotEditor/Sources/NSDraggingInfo.swift +++ b/CotEditor/Sources/NSDraggingInfo.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import AppKit import UniformTypeIdentifiers -extension NSDraggingInfo { +@MainActor extension NSDraggingInfo { /// Obtains NSFilePromiseReceiver type dragging items. /// diff --git a/CotEditor/Sources/NSLayoutManager+InvisibleDrawing.swift b/CotEditor/Sources/NSLayoutManager+InvisibleDrawing.swift index c8c2b709a..f67680d4c 100644 --- a/CotEditor/Sources/NSLayoutManager+InvisibleDrawing.swift +++ b/CotEditor/Sources/NSLayoutManager+InvisibleDrawing.swift @@ -25,6 +25,7 @@ import AppKit import Combine +import Defaults protocol InvisibleDrawing: NSLayoutManager { diff --git a/CotEditor/Sources/NSLayoutManager.swift b/CotEditor/Sources/NSLayoutManager.swift index e1731be93..fa41c6a5d 100644 --- a/CotEditor/Sources/NSLayoutManager.swift +++ b/CotEditor/Sources/NSLayoutManager.swift @@ -223,31 +223,6 @@ extension NSLayoutManager { } - /// Returns rects to draw insertion point for the given character index. - /// - /// - Note: The rects can be either in one or two when the cursor split at the boundary of the writing direction. - /// - /// - Parameter characterIndex: The character index. - /// - Returns: One-pixel-width rects to draw insertion point in the layout manager coordinate. - @available(macOS, deprecated: 14) - final func insertionPointRects(at characterIndex: Int) -> [NSRect] { - - guard - let primaryRect = self.insertionPointRect(at: characterIndex, alternate: false) - else { return [] } - - guard - UserDefaults.standard.useSplitCursor, - let alternateRect = self.insertionPointRect(at: characterIndex, alternate: true) - else { return [primaryRect] } - - return [NSRect(x: primaryRect.minX, y: primaryRect.minY, - width: primaryRect.width, height: primaryRect.height / 2), - NSRect(x: alternateRect.minX, y: alternateRect.minY + alternateRect.height / 2, - width: alternateRect.width, height: alternateRect.height / 2)] - } - - /// Returns a rect to draw insertion point for the given character index. /// /// - Parameters: @@ -298,14 +273,6 @@ extension NSLayoutManager { } -private extension UserDefaults { - - /// Whether the user enables the system-wide "Use split cursor" option in System Settings > Keyboard > Text Input > Input Source. - @available(macOS, deprecated: 14) - var useSplitCursor: Bool { self.bool(forKey: "NSUseSplitCursor") } -} - - // MARK: - Debug diff --git a/CotEditor/Sources/Color.swift b/CotEditor/Sources/NSMenu.swift similarity index 63% rename from CotEditor/Sources/Color.swift rename to CotEditor/Sources/NSMenu.swift index 94910a6a6..8ec62a09b 100644 --- a/CotEditor/Sources/Color.swift +++ b/CotEditor/Sources/NSMenu.swift @@ -1,14 +1,14 @@ // -// Color.swift +// NSMenu.swift // // CotEditor // https://coteditor.com // -// Created by 1024jp on 2022-12-13. +// Created by 1024jp on 2024-05-24. // // --------------------------------------------------------------------------- // -// © 2022-2024 1024jp +// © 2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,11 +23,25 @@ // limitations under the License. // -import SwiftUI -import AppKit.NSColor +import AppKit -extension Color { +extension NSMenu { - @available(macOS, deprecated: 14, message: "Use .primary instead.") - static let label = Color(nsColor: .labelColor) + /// Recursively updates all submenus. + func updateAll() { + + self.update() + for item in self.items { + item.submenu?.updateAll() + } + } +} + + +extension NSEvent.SpecialKey { + + var string: String { + + String(self.unicodeScalar) + } } diff --git a/CotEditor/Sources/NSString.swift b/CotEditor/Sources/NSString.swift index d1dad9e31..5622961a0 100644 --- a/CotEditor/Sources/NSString.swift +++ b/CotEditor/Sources/NSString.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,16 @@ import Foundation.NSString +extension String { + + /// Copied string to make sure the string is not a kind of NSMutableString. + var immutable: String { + + NSString(string: self) as String + } +} + + extension StringProtocol { /// Whole range in NSRange. @@ -186,7 +196,7 @@ extension NSString { return ranges } - var lineRanges = OrderedSet() + var lineRanges: [NSRange] = [] // get line ranges to process for range in ranges { @@ -198,7 +208,7 @@ extension NSString { } } - return lineRanges.array + return lineRanges.uniqued } diff --git a/CotEditor/Sources/NSTextStorage+TextView.swift b/CotEditor/Sources/NSTextStorage+TextView.swift index 8abd21a23..e6d94e1d0 100644 --- a/CotEditor/Sources/NSTextStorage+TextView.swift +++ b/CotEditor/Sources/NSTextStorage+TextView.swift @@ -59,15 +59,13 @@ extension NSTextStorage { /// /// - Parameters: /// - string: The content string to replace with. - final func replaceContent(with string: String) { - - assert(self.layoutManagers.isEmpty || Thread.isMainThread) + @MainActor final func replaceContent(with string: String) { guard string != self.string else { return } self.replaceCharacters(in: self.range, with: string) - guard !string.isEmpty, Thread.isMainThread else { return } + guard !string.isEmpty else { return } // otherwise, the insertion point moves to the end of the content for textView in self.layoutManagers.compactMap(\.firstTextView) { diff --git a/CotEditor/Sources/NSTextView+MultiCursor.swift b/CotEditor/Sources/NSTextView+MultiCursor.swift index ea3f0d6a4..3c99500fb 100644 --- a/CotEditor/Sources/NSTextView+MultiCursor.swift +++ b/CotEditor/Sources/NSTextView+MultiCursor.swift @@ -30,13 +30,7 @@ import AppKit var insertionLocations: [Int] { get set } var selectionOrigins: [Int] { get set } var isPerformingRectangularSelection: Bool { get } - - @available(macOS 14, *) var insertionIndicators: [NSTextInsertionIndicator] { get set } - - @available(macOS, deprecated: 14) - var insertionPointTimer: (any DispatchSourceTimer)? { get set } - var insertionPointOn: Bool { get set } } @@ -383,7 +377,6 @@ extension MultiCursorEditing { /// Updates insertion indicators. - @available(macOS 14, *) func updateInsertionIndicators() { assert(Thread.isMainThread) @@ -425,7 +418,7 @@ extension MultiCursorEditing { /// This method should be Invoked when changing the state whether the receiver is the key editor receiving text input in the system. func invalidateInsertionIndicatorDisplayMode() { - guard #available(macOS 14, *), !self.insertionIndicators.isEmpty else { return } + guard !self.insertionIndicators.isEmpty else { return } let shouldDraw = self.shouldDrawInsertionPoints for indicator in self.insertionIndicators { @@ -547,110 +540,3 @@ private extension NSLayoutManager { return rects.uniqued } } - - - -// MARK: - LegacyEditorTextView - -/// Workaround subclass to let NSTextView uses the new NSTextInsertionIndicator (FB12964810). -@available(macOS, deprecated: 14, message: "Just remove this subclass and also all the codes related to insertion point drawing.") -final class LegacyEditorTextView: EditorTextView { - - override func drawInsertionPoint(in rect: NSRect, color: NSColor, turnedOn flag: Bool) { - - super.drawInsertionPoint(in: rect, color: color, turnedOn: flag) - - // draw sub insertion rects - self.insertionLocations - .flatMap { self.insertionPointRects(at: $0) } - .forEach { super.drawInsertionPoint(in: $0, color: color, turnedOn: flag) } - } -} - - -@available(macOS, deprecated: 14) -extension MultiCursorEditing { - - /// Whether the receiver needs to draw insertion points by itself. - var needsDrawInsertionPoints: Bool { - - self.insertionPointTimer?.isCancelled == false - } - - - /// Enables or disables `insertionPointTimer` according to the selection state. - func updateInsertionPointTimer() { - - if #available(macOS 14, *) { return } - - if self.isPerformingRectangularSelection || (!self.insertionLocations.isEmpty && self.selectedRanges.allSatisfy({ !$0.rangeValue.isEmpty })) { - self.enableOwnInsertionPointTimer() - } else { - self.insertionPointTimer?.cancel() - } - } - - - /// Calculates rect for insertion point at `index`. - /// - /// - Parameter index: The character index where the insertion point will locate. - /// - Returns: Rect where insertion point filled. - func insertionPointRects(at index: Int) -> [NSRect] { - - guard let layoutManager = self.layoutManager else { assertionFailure(); return [] } - - let scale = self.scale - return layoutManager.insertionPointRects(at: index) - .map { $0.offset(by: self.textContainerOrigin) } - .map { rect in - NSRect(x: (rect.minX * scale).rounded(.down) / scale, - y: rect.minY, - width: 1 / scale, - height: rect.height) - } - } - - - /// Enables insertion point blink timer to draw insertion points forcibly. - private func enableOwnInsertionPointTimer() { - - guard self.insertionPointTimer?.isCancelled ?? true else { return } - - let period = UserDefaults.standard.textInsertionPointBlinkPeriod - - let timer = DispatchSource.makeTimerSource(queue: .main) - timer.schedule(deadline: .now()) - timer.setEventHandler { [unowned self] in - self.insertionPointOn.toggle() - let interval = self.insertionPointOn ? period.on : period.off - timer.schedule(deadline: .now() + .milliseconds(interval)) - self.setNeedsDisplay(self.visibleRect, avoidAdditionalLayout: true) - } - timer.resume() - - self.insertionPointTimer?.cancel() - self.insertionPointTimer = timer - } -} - - -@available(macOS, deprecated: 14) -private struct BlinkPeriod { - - var on: Int - var off: Int -} - - -@available(macOS, deprecated: 14) -private extension UserDefaults { - - var textInsertionPointBlinkPeriod: BlinkPeriod { - - let onPeriod = self.integer(forKey: "NSTextInsertionPointBlinkPeriodOn") - let offPeriod = self.integer(forKey: "NSTextInsertionPointBlinkPeriodOff") - - return BlinkPeriod(on: (onPeriod > 0) ? onPeriod : 500, - off: (offPeriod > 0) ? offPeriod : 500) - } -} diff --git a/CotEditor/Sources/NSTextView+MultipleReplace.swift b/CotEditor/Sources/NSTextView+MultipleReplace.swift index a8e7ef064..76994bae8 100644 --- a/CotEditor/Sources/NSTextView+MultipleReplace.swift +++ b/CotEditor/Sources/NSTextView+MultipleReplace.swift @@ -35,7 +35,7 @@ extension NSTextView { /// - inSelection: Whether find string only in selectedRanges. /// - Returns: A result message. /// - Throws: `CancellationError` - @MainActor final func highlight(_ definition: MultipleReplace, inSelection: Bool) async throws -> String { + final func highlight(_ definition: MultipleReplace, inSelection: Bool) async throws -> String { self.isEditable = false defer { self.isEditable = true } @@ -79,7 +79,7 @@ extension NSTextView { ? String(localized: "Not found", table: "TextFind") : String(localized: "\(progress.count) found", table: "TextFind") - self.requestAccessibilityAnnouncement(message) + AccessibilityNotification.Announcement(message).post() return message } @@ -92,7 +92,7 @@ extension NSTextView { /// - inSelection: Whether find string only in selectedRanges. /// - Returns: A result message. /// - Throws: `CancellationError` - @MainActor final func replaceAll(_ definition: MultipleReplace, inSelection: Bool) async throws -> String { + final func replaceAll(_ definition: MultipleReplace, inSelection: Bool) async throws -> String { self.isEditable = false defer { self.isEditable = true } @@ -127,7 +127,7 @@ extension NSTextView { ? String(localized: "Not replaced", table: "TextFind") : String(localized: "\(progress.count) replaced", table: "TextFind") - self.requestAccessibilityAnnouncement(message) + AccessibilityNotification.Announcement(message).post() return message } diff --git a/CotEditor/Sources/NSTextView+RegexParse.swift b/CotEditor/Sources/NSTextView+RegexParse.swift index aa40309df..4254917cd 100644 --- a/CotEditor/Sources/NSTextView+RegexParse.swift +++ b/CotEditor/Sources/NSTextView+RegexParse.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2018-2023 1024jp +// © 2018-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ extension NSTextView { /// - enabled: If true, parse and highlight, otherwise just remove the current highlight. /// - Returns: Whether the content is not invalid. @discardableResult - @MainActor final func highlightAsRegularExpressionPattern(mode: RegularExpressionParseMode, enabled: Bool = true) -> Bool { + final func highlightAsRegularExpressionPattern(mode: RegularExpressionParseMode, enabled: Bool = true) -> Bool { guard let layoutManager = self.textLayoutManager @@ -71,7 +71,7 @@ extension NSTextView { /// - mode: Parse mode of regular expression. /// - enabled: If true, parse and highlight, otherwise just remove the current highlight. /// - Returns: Whether the content is not invalid. - @MainActor private func highlightAsRegularExpressionPatternWithLegacyTextKit(mode: RegularExpressionParseMode, enabled: Bool = true) -> Bool { + private func highlightAsRegularExpressionPatternWithLegacyTextKit(mode: RegularExpressionParseMode, enabled: Bool = true) -> Bool { guard let layoutManager = self.layoutManager else { assertionFailure(); return false } diff --git a/CotEditor/Sources/NSTextView+TextReplacement.swift b/CotEditor/Sources/NSTextView+TextReplacement.swift index d1c9553be..d71e9b18a 100644 --- a/CotEditor/Sources/NSTextView+TextReplacement.swift +++ b/CotEditor/Sources/NSTextView+TextReplacement.swift @@ -29,6 +29,14 @@ extension NSTextView { // MARK: Public Methods + /// Replaces content according to EditingContext. + @discardableResult + final func edit(with context: EditingContext, actionName: String? = nil) -> Bool { + + self.replace(with: context.strings, ranges: context.ranges, selectedRanges: context.selectedRanges, actionName: actionName) + } + + /// Performs simple text replacement. @discardableResult final func replace(with string: String, range: NSRange, selectedRange: NSRange?, actionName: String? = nil) -> Bool { @@ -127,31 +135,6 @@ extension NSTextView { } - /// Trims all trailing whitespace with/without keeping editing point. - final func trimTrailingWhitespace(ignoresEmptyLines: Bool, keepingEditingPoint: Bool = false) { - - assert(Thread.isMainThread) - - let whitespaceRanges = self.string.rangesOfTrailingWhitespace(ignoresEmptyLines: ignoresEmptyLines) - - guard !whitespaceRanges.isEmpty else { return } - - let editingRanges = (self.rangesForUserTextChange ?? self.selectedRanges).map(\.rangeValue) - - let trimmingRanges: [NSRange] = keepingEditingPoint - ? whitespaceRanges.filter { range in editingRanges.allSatisfy { !$0.touches(range) } } - : whitespaceRanges - - guard !trimmingRanges.isEmpty else { return } - - let replacementStrings = [String](repeating: "", count: trimmingRanges.count) - let selectedRanges = editingRanges.map { $0.removed(ranges: trimmingRanges) } - - self.replace(with: replacementStrings, ranges: trimmingRanges, selectedRanges: selectedRanges, - actionName: String(localized: "Trim Trailing Whitespace", table: "MainMenu")) - } - - // MARK: Actions /// Inputs a backslash (\\) to the insertion points. @@ -184,15 +167,3 @@ extension String { } } } - - -extension String { - - func rangesOfTrailingWhitespace(ignoresEmptyLines: Bool) -> [NSRange] { - - let pattern = ignoresEmptyLines ? "(? Bool { - guard self.isViewLoaded, let window = self.view.window else { return true } + guard let window = self.viewIfLoaded?.window else { return true } return window.makeFirstResponder(nil) } diff --git a/CotEditor/Sources/NavigationBar.swift b/CotEditor/Sources/NavigationBar.swift new file mode 100644 index 000000000..51109b8ea --- /dev/null +++ b/CotEditor/Sources/NavigationBar.swift @@ -0,0 +1,193 @@ +// +// NavigationBar.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-02-04. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import SwiftUI + +struct NavigationBar: View { + + @State var outlineNavigator: OutlineNavigator + @State var splitState: SplitState + + + var body: some View { + + HStack(alignment: .center, spacing: 0) { + Button { + NSApp.sendAction(#selector(DocumentViewController.closeSplitTextView), to: nil, from: self.outlineNavigator.textView) + } label: { + Label(String(localized: "Close Split Editor", table: "Document", comment: "accessibility label for button"), systemImage: "xmark") + .frame(width: 18) + .frame(maxHeight: .infinity, alignment: .center) + } + .labelStyle(.iconOnly) + .help(String(localized: "Close split editor", table: "Document", comment: "tooltip for button")) + .symbolEffect(.disappear, isActive: !self.splitState.canClose) + + Divider() + .padding(.vertical, 4) + .padding(.horizontal, 3) + .opacity(self.splitState.canClose ? 1 : 0) + + OutlineNavigationView(navigator: $outlineNavigator) + + Spacer() + + Button { + NSApp.sendAction(#selector(DocumentViewController.openSplitTextView), to: nil, from: self.outlineNavigator.textView) + } label: { + Label(String(localized: "Split Editor", table: "Document", comment: "accessibility label for button"), image: .splitAdd) + .frame(width: 18) + .frame(maxHeight: .infinity, alignment: .center) + } + .rotationEffect(.degrees(self.splitState.isVertical ? -90 : 0)) + .labelStyle(.iconOnly) + .help(String(localized: "Split editor", table: "Document", comment: "tooltip for button")) + .contextMenu { + Button { + NSApp.sendAction(#selector(DocumentViewController.toggleSplitOrientation), to: nil, from: nil) + } label: { + if self.splitState.isVertical { + Text("Stack Editors Horizontally", tableName: "MainMenu") + } else { + Text("Stack Editors Vertically", tableName: "MainMenu") + } + } + } + } + .buttonStyle(.borderless) + .controlSize(.small) + .padding(.horizontal, 2) + .background(.windowBackground) + .frame(height: 20) + .accessibilityElement(children: .contain) + .accessibilityLabel(String(localized: "Navigation Bar", table: "Document", comment: "accessibility label")) + } +} + + +private struct OutlineNavigationView: View { + + @Binding var navigator: OutlineNavigator + + @State private var isLongExtraction = false + @State private var extractionDelayTask: Task? + + + var body: some View { + + HStack { + if let items = self.navigator.items { + if !items.isEmpty { + HStack(spacing: 0) { + if self.navigator.isVerticalOrientation { + self.nextButton(systemImage: "chevron.left") + self.previousButton(systemImage: "chevron.right") + } else { + self.previousButton(systemImage: "chevron.up") + self.nextButton(systemImage: "chevron.down") + } + } + + // Use AppKit-based picker (2024-05, macOS 14): + // - To trim whitespaces of button display. + // - To open programmatically. + OutlinePicker(items: items, selection: $navigator.selection, isPresented: $navigator.isOutlinePickerPresented) { + self.navigator.textView?.select(range: $0.range) + } + .accessibilityLabel(String(localized: "Outline Menu", table: "Document", comment: "accessibility label")) + } + } else if self.isLongExtraction { + Text("Extracting Outline…", tableName: "Document") + .foregroundStyle(.secondary) + } + } + .onDisappear { + self.extractionDelayTask?.cancel() + } + .onChange(of: self.navigator.items, initial: true) { (_, newValue) in + // show message only when parse takes more than 1 second. + self.extractionDelayTask?.cancel() + if newValue == nil { + self.extractionDelayTask = Task { + try await Task.sleep(for: .seconds(1)) + self.isLongExtraction = true + } + } else { + self.extractionDelayTask = nil + self.isLongExtraction = false + } + } + } + + + // MARK: Private Methods + + @ViewBuilder private func previousButton(systemImage: String) -> some View { + + Button { + self.navigator.selectPreviousItem() + } label: { + Label(String(localized: "Previous Outline Item", table: "Document", comment: "accessibility label for button"), systemImage: systemImage) + .frame(width: 18) + .frame(maxHeight: .infinity, alignment: .center) + } + .fontWeight(.medium) + .labelStyle(.iconOnly) + .disabled(!self.navigator.canSelectPreviousItem) + .help(String(localized: "Jump to previous outline item", table: "Document", comment: "tooltip for button")) + + } + + + @ViewBuilder private func nextButton(systemImage: String) -> some View { + + Button { + self.navigator.selectNextItem() + } label: { + Label(String(localized: "Next Outline Item", table: "Document", comment: "accessibility label for button"), systemImage: systemImage) + .frame(width: 18) + .frame(maxHeight: .infinity, alignment: .center) + } + .fontWeight(.medium) + .labelStyle(.iconOnly) + .disabled(!self.navigator.canSelectNextItem) + .help(String(localized: "Jump to next outline item", table: "Document", comment: "tooltip for button")) + } +} + + + +// MARK: - Preview + +#Preview { + let navigator = OutlineNavigator() + navigator.items = [ + OutlineItem(title: " Heading 1", range: .notFound), + OutlineItem(title: "Heading 2", range: .notFound), + ] + + return NavigationBar(outlineNavigator: navigator, splitState: SplitState(canClose: true)) + .frame(width: 300) +} diff --git a/CotEditor/Sources/NavigationBarController.swift b/CotEditor/Sources/NavigationBarController.swift deleted file mode 100644 index 5b75f77a2..000000000 --- a/CotEditor/Sources/NavigationBarController.swift +++ /dev/null @@ -1,298 +0,0 @@ -// -// NavigationBarController.swift -// -// CotEditor -// https://coteditor.com -// -// Created by nakamuxu on 2005-08-22. -// -// --------------------------------------------------------------------------- -// -// © 2004-2007 nakamuxu -// © 2014-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit -import Combine - -final class NavigationBarController: NSViewController { - - // MARK: Public Properties - - weak var textView: NSTextView? - - var outlineItems: [OutlineItem]? { - - didSet { - if self.isViewShown { - self.updateOutlineMenu() - } - } - } - - - // MARK: Private Properties - - private var viewObservers: Set = [] - - @objc private dynamic var showsCloseButton = false - @objc private dynamic var showsOutlineMenu = false - @objc private dynamic var isParsingOutline = false - - @IBOutlet private weak var leftButton: NSButton? - @IBOutlet private weak var rightButton: NSButton? - @IBOutlet private weak var outlineMenu: NSPopUpButton? - - @IBOutlet private weak var openSplitButton: NSButton? - @IBOutlet private var editorSplitMenu: NSMenu? - - - - // MARK: View Controller Methods - - override func viewDidLoad() { - - super.viewDidLoad() - - // set accessibility - self.view.setAccessibilityElement(true) - self.view.setAccessibilityRole(.group) - self.view.setAccessibilityLabel(String(localized: "Navigation Bar", table: "Document", comment: "accessibility label")) - - self.outlineMenu?.setAccessibilityLabel(String(localized: "Outline", table: "Document", comment: "accessibility label")) - } - - - override func viewWillAppear() { - - super.viewWillAppear() - - guard - let splitViewController = self.splitViewController, - let textView = self.textView - else { return assertionFailure() } - - self.viewObservers = [ - splitViewController.splitView.publisher(for: \.isVertical) - .map { NSImage(resource: $0 ? .splitAddVertical : .splitAdd) } - .assign(to: \.image, on: self.openSplitButton!), - splitViewController.$canCloseSplitItem - .sink { [weak self] in self?.showsCloseButton = $0 }, - - textView.publisher(for: \.layoutOrientation, options: .initial) - .sink { [weak self] in self?.updateTextOrientation(to: $0) }, - - NotificationCenter.default.publisher(for: NSTextView.didChangeSelectionNotification, object: textView) - .map { $0.object as! NSTextView } - .filter { !$0.hasMarkedText() } - // avoid updating outline item selection before finishing outline parse - // -> Otherwise, a wrong item can be selected because of using the outdated outline ranges. - // You can ignore text selection change at this time point as the outline selection will be updated when the parse finished. - .filter { $0.textStorage?.editedMask.contains(.editedCharacters) == false } - .debounce(for: .seconds(0.05), scheduler: RunLoop.main) - .sink { [weak self] _ in self?.invalidateOutlineMenuSelection() } - ] - - self.updateOutlineMenu() - } - - - override func viewDidDisappear() { - - super.viewDidDisappear() - - self.viewObservers.removeAll() - } - - - - // MARK: Public Methods - - /// Can select the previous item in outline menu? - var canSelectPrevItem: Bool { - - guard let textView = self.textView else { return false } - - return self.outlineItems?.previousItem(for: textView.selectedRange) != nil - } - - - /// Can select the next item in outline menu? - var canSelectNextItem: Bool { - - guard let textView = self.textView else { return false } - - return self.outlineItems?.nextItem(for: textView.selectedRange) != nil - } - - - /// Shows the menu items of the outline menu. - func openOutlineMenu() { - - guard let popUpButton = self.outlineMenu else { return } - - popUpButton.menu?.popUp(positioning: nil, at: .zero, in: popUpButton) - } - - - - // MARK: Action Messages - - /// Selects outline item from the popup menu. - @IBAction func selectOutlineMenuItem(_ sender: NSMenuItem) { - - guard - let textView = self.textView, - let range = sender.representedObject as? NSRange - else { return assertionFailure() } - - textView.select(range: range) - } - - - - // MARK: Private Methods - - /// The paragraph style for outline menu item - private lazy var menuItemParagraphStyle: NSParagraphStyle = { - - let paragraphStyle = NSParagraphStyle.default.mutable - paragraphStyle.tabStops = [] - paragraphStyle.defaultTabInterval = 2.0 * self.outlineMenu!.menu!.font.width(of: " ") - paragraphStyle.lineBreakMode = .byTruncatingMiddle - paragraphStyle.tighteningFactorForTruncation = 0 // don't tighten - - return paragraphStyle - }() - - - /// The split view controller managing editor split. - private var splitViewController: SplitViewController? { - - guard let parent = self.parent else { return nil } - - return sequence(first: parent, next: \.parent) - .first { $0 is SplitViewController } as? SplitViewController - } - - - /// The button to move to the previous outline item. - private var prevButton: NSButton? { - - (self.textView?.layoutOrientation == .vertical) ? self.rightButton : self.leftButton - } - - - /// The button to move to the next outline item. - private var nextButton: NSButton? { - - (self.textView?.layoutOrientation == .vertical) ? self.leftButton : self.rightButton - } - - - /// Builds outline menu using `outlineItems`. - private func updateOutlineMenu() { - - self.isParsingOutline = (self.outlineItems == nil) - self.showsOutlineMenu = (self.outlineItems?.isEmpty == false) - - guard let outlineItems = self.outlineItems else { return } - guard let outlineMenu = self.outlineMenu?.menu else { return assertionFailure() } - - outlineMenu.items = outlineItems - .flatMap { outlineItem in - switch outlineItem.title { - case .separator: - // dummy item to avoid merging sequential separators into a single separator - let dummyItem = NSMenuItem() - dummyItem.view = NSView() - dummyItem.setAccessibilityElement(false) - - return [.separator(), dummyItem] - - default: - let menuItem = NSMenuItem() - let title = outlineItem.attributedTitle(for: outlineMenu.font, paragraphStyle: self.menuItemParagraphStyle) - menuItem.attributedTitle = NSAttributedString(title) - menuItem.representedObject = outlineItem.range - - return [menuItem] - } - } - - self.invalidateOutlineMenuSelection() - } - - - /// Selects the proper item in outline menu based on the current selection in the text view. - private func invalidateOutlineMenuSelection() { - - guard - self.showsOutlineMenu, - let location = self.textView?.selectedRange.location, - let popUp = self.outlineMenu, popUp.isEnabled - else { return } - - let selectedItem = popUp.itemArray.last { menuItem in - guard - menuItem.isEnabled, - let itemRange = menuItem.representedObject as? NSRange - else { return false } - - return itemRange.location <= location - } ?? popUp.itemArray.first - - popUp.select(selectedItem) - - self.prevButton?.isEnabled = self.canSelectPrevItem - self.nextButton?.isEnabled = self.canSelectNextItem - } - - - /// Updates the direction of the menu item arrows. - /// - /// - Parameter orientation: The text orientation in the text view. - private func updateTextOrientation(to orientation: NSLayoutManager.TextLayoutOrientation) { - - guard - let prevButton = self.prevButton, - let nextButton = self.nextButton - else { return assertionFailure() } - - let prevSymbol: NSImage.Name = switch orientation { - case .horizontal: "chevron.up" - case .vertical: "chevron.right" - @unknown default: fatalError() - } - prevButton.image = NSImage(systemSymbolName: prevSymbol, - accessibilityDescription: String(localized: "Previous", table: "Document", comment: "button label"))! - prevButton.toolTip = String(localized: "Jump to previous outline item", table: "Document", comment: "tooltip for button") - prevButton.action = #selector(EditorViewController.selectPrevItemOfOutlineMenu) - prevButton.target = self.parent - prevButton.isEnabled = self.canSelectPrevItem - - let nextSymbol: NSImage.Name = switch orientation { - case .horizontal: "chevron.down" - case .vertical: "chevron.left" - @unknown default: fatalError() - } - nextButton.image = NSImage(systemSymbolName: nextSymbol, - accessibilityDescription: String(localized: "Next", table: "Document", comment: "button label"))! - nextButton.toolTip = String(localized: "Jump to next outline item", table: "Document", comment: "tooltip for button") - nextButton.action = #selector(EditorViewController.selectNextItemOfOutlineMenu) - nextButton.target = self.parent - nextButton.isEnabled = self.canSelectNextItem - } -} diff --git a/CotEditor/Sources/Observation.swift b/CotEditor/Sources/Observation.swift new file mode 100644 index 000000000..e4d205556 --- /dev/null +++ b/CotEditor/Sources/Observation.swift @@ -0,0 +1,45 @@ +// +// Observation.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-02. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Observation + +/// Tracks access to properties continuously. +/// +/// - Parameters: +/// - initial: If `true`, `onChange` closure will be evaluated immediately before the actual observation. +/// - apply: A closure that contains properties to track. +/// - onChange: The closure invoked when the value of a property changes. +/// - Returns: The value that the apply closure returns if it has a return value; otherwise, there is no return value. +func withContinuousObservationTracking(initial: Bool = false, _ apply: @escaping (@Sendable () -> T), onChange: @escaping (@Sendable () -> Void)) { + + if initial { + onChange() + } + + _ = withObservationTracking(apply, onChange: { + onChange() + withContinuousObservationTracking(apply, onChange: onChange) + }) +} diff --git a/CotEditor/Sources/OpacitySlider.swift b/CotEditor/Sources/OpacitySlider.swift index fbaddd64c..114ba8f1d 100644 --- a/CotEditor/Sources/OpacitySlider.swift +++ b/CotEditor/Sources/OpacitySlider.swift @@ -122,7 +122,6 @@ private struct OpacitySample: View { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 200, height: 50)) { VStack { diff --git a/CotEditor/Sources/OpenPanelAccessory.swift b/CotEditor/Sources/OpenPanelAccessory.swift index d283393cd..4a7ef3c06 100644 --- a/CotEditor/Sources/OpenPanelAccessory.swift +++ b/CotEditor/Sources/OpenPanelAccessory.swift @@ -24,17 +24,19 @@ // import SwiftUI +import Observation import AppKit.NSOpenPanel +import FileEncoding -final class OpenOptions: ObservableObject { +@Observable final class OpenOptions { - @Published var encoding: String.Encoding? + var encoding: String.Encoding? } struct OpenPanelAccessory: View { - @ObservedObject var options: OpenOptions + @State var options: OpenOptions weak var openPanel: NSOpenPanel? let fileEncodings: [FileEncoding?] @@ -64,7 +66,7 @@ struct OpenPanelAccessory: View { } Toggle(String(localized: "Show invisible files", table: "OpenPanelAccessory", comment: "toggle button label"), isOn: $showsHiddenFiles) - .onChange(of: self.showsHiddenFiles) { newValue in + .onChange(of: self.showsHiddenFiles) { (_, newValue) in guard let openPanel = self.openPanel else { return } openPanel.showsHiddenFiles = newValue diff --git a/CotEditor/Sources/OptionalMenu.swift b/CotEditor/Sources/OptionalMenu.swift index 7c1a6980c..6e0a75ca3 100644 --- a/CotEditor/Sources/OptionalMenu.swift +++ b/CotEditor/Sources/OptionalMenu.swift @@ -81,7 +81,7 @@ final class OptionalMenu: NSMenu, NSMenuDelegate { /// Checks the state of the modifier key press and update the item visibility. /// /// - Parameter forcibly: Whether forcing to update the item visibility. - @objc private func validateKeyEvent(forcibly: Bool = false) { + private func validateKeyEvent(forcibly: Bool = false) { let shows = NSEvent.modifierFlags.contains(.option) diff --git a/CotEditor/Sources/OrderedSet.swift b/CotEditor/Sources/OrderedSet.swift deleted file mode 100644 index c4d37e54e..000000000 --- a/CotEditor/Sources/OrderedSet.swift +++ /dev/null @@ -1,151 +0,0 @@ -// -// OrderedSet.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2016-03-21. -// -// --------------------------------------------------------------------------- -// -// © 2017-2022 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -struct OrderedSet: RandomAccessCollection { - - typealias Index = Array.Index - - private var elements: [Element] = [] - - - - // MARK: Lifecycle - - init() { } - - - init(_ elements: some Sequence) { - - self.append(contentsOf: elements) - } - - - - // MARK: Collection Methods - - /// Returns the element at the specified position. - subscript(_ index: Index) -> Element { - - self.elements[index] - } - - - var startIndex: Index { - - self.elements.startIndex - } - - - var endIndex: Index { - - self.elements.endIndex - } - - - func index(after index: Index) -> Index { - - self.elements.index(after: index) - } - - - - // MARK: Methods - - var array: [Element] { - - self.elements - } - - - var set: Set { - - Set(self.elements) - } - - - /// Returns a new set with the elements that are common to both this set and the given sequence. - func intersection(_ other: some Sequence) -> Self { - - var set = OrderedSet() - set.elements = self.elements.filter { other.contains($0) } - - return set - } - - - - // MARK: Mutating Methods - - /// Inserts the given element in the set if it is not already present. - mutating func append(_ element: Element) { - - guard !self.elements.contains(element) else { return } - - self.elements.append(element) - } - - - /// Inserts the given elements in the set only which it is not already present. - mutating func append(contentsOf elements: some Sequence) { - - for element in elements { - self.append(element) - } - } - - - /// Inserts the given element at the desired position. - mutating func insert(_ element: Element, at index: Index) { - - guard !self.elements.contains(element) else { return } - - self.elements.insert(element, at: index) - } - - - /// Removes the elements of the set that aren’t also in the given sequence. - mutating func formIntersection(_ other: some Sequence) { - - self.elements.removeAll { !other.contains($0) } - } - - - /// Removes the the element at the position from the set. - @discardableResult - mutating func remove(at index: Index) -> Element { - - self.elements.remove(at: index) - } - - - /// Removes the specified element from the set. - @discardableResult - mutating func remove(_ element: Element) -> Element? { - - guard let index = self.firstIndex(of: element) else { return nil } - - return self.remove(at: index) - } -} diff --git a/CotEditor/Sources/OutlineInspectorView.swift b/CotEditor/Sources/OutlineInspectorView.swift index 92163441a..9e4968ce7 100644 --- a/CotEditor/Sources/OutlineInspectorView.swift +++ b/CotEditor/Sources/OutlineInspectorView.swift @@ -24,13 +24,15 @@ // import SwiftUI +import Observation import Combine +import Defaults final class OutlineInspectorViewController: NSHostingController, DocumentOwner { // MARK: Public Properties - var document: Document { + var document: Document? { didSet { if self.isViewShown { @@ -48,7 +50,7 @@ final class OutlineInspectorViewController: NSHostingController var fontSize: Double = 0 var body: some View { - if self.item.isSeparator { - if #available(macOS 14, *) { - Divider().selectionDisabled() - } else { - Divider() - } + if self.item.value.isSeparator { + Divider().selectionDisabled() + } else { - Text(self.item.attributedTitle(.init() - .backgroundColor(.findHighlightColor) - .foregroundColor(.black.withAlphaComponent(0.9)), // for legibility in Dark Mode - fontSize: self.fontSize)) + Text(self.item.attributedString + .replacingAttributes(AttributeContainer.inlinePresentationIntent(.emphasized), + with: AttributeContainer + .backgroundColor(.findHighlightColor) + .foregroundColor(.black.withAlphaComponent(0.9))) // for legibility in Dark Mode + .mergingAttributes(self.item.value.attributes(fontSize: fontSize), mergePolicy: .keepCurrent) + ) } } } @@ -215,7 +216,7 @@ private extension OutlineInspectorView.Model { guard !self.isOwnSelectionChange, - let item = self.items.first(where: { $0.id == id }), + let item = self.items[id: id], let textView = self.document?.textView, textView.string.length >= item.range.upperBound else { return } @@ -255,6 +256,7 @@ private extension OutlineInspectorView.Model { self.documentObserver = nil self.syntaxObserver = nil self.selectionObserver = nil + self.items.removeAll() } } @@ -271,7 +273,10 @@ private extension OutlineInspectorView.Model { self.isOwnSelectionChange = true self.selection = item.id - self.isOwnSelectionChange = false + // adjust the timing to restore flag + Task { + self.isOwnSelectionChange = false + } } } @@ -279,7 +284,6 @@ private extension OutlineInspectorView.Model { // MARK: - Preview -@available(macOS 14, *) #Preview(traits: .fixedLayout(width: 240, height: 300)) { let model = OutlineInspectorView.Model() model.items = [ diff --git a/CotEditor/Sources/OutlineItem+AttributedString.swift b/CotEditor/Sources/OutlineItem+AttributedString.swift index 9b634955b..bc100b455 100644 --- a/CotEditor/Sources/OutlineItem+AttributedString.swift +++ b/CotEditor/Sources/OutlineItem+AttributedString.swift @@ -27,8 +27,7 @@ import Foundation import SwiftUI import AppKit.NSFont -extension NSFont: @unchecked Sendable { } -extension NSParagraphStyle: @unchecked Sendable { } +extension NSFont: @retroactive @unchecked Sendable { } extension OutlineItem { @@ -36,11 +35,10 @@ extension OutlineItem { /// /// - Parameters: /// - baseFont: The base font of change. - /// - paragraphStyle: The paragraph style to apply. /// - Returns: An AttributedString. - func attributedTitle(for baseFont: NSFont, paragraphStyle: NSParagraphStyle) -> AttributedString { + func attributes(baseFont: NSFont) -> [NSAttributedString.Key: Any] { - var attributes = AttributeContainer().paragraphStyle(paragraphStyle) + var attributes: [NSAttributedString.Key: Any] = [:] var traits: NSFontDescriptor.SymbolicTraits = [] if self.style.contains(.bold) { @@ -50,24 +48,24 @@ extension OutlineItem { traits.insert(.italic) } if self.style.contains(.underline) { - attributes.underlineStyle = .single + attributes[.underlineStyle] = NSUnderlineStyle.single.rawValue } - attributes.font = traits.isEmpty - ? baseFont - : NSFont(descriptor: baseFont.fontDescriptor.withSymbolicTraits(traits), size: baseFont.pointSize) + attributes[.font] = traits.isEmpty + ? baseFont + : NSFont(descriptor: baseFont.fontDescriptor.withSymbolicTraits(traits), size: baseFont.pointSize) - return AttributedString(self.title, attributes: attributes) + return attributes } /// Returns styled title applying the filter match highlight for a view in SwiftUI. /// - /// - Parameter attributes: The attributes for the matched parts of filtering. + /// - Parameter fontSize: The size of the font. /// - Returns: An AttributedString. - func attributedTitle(_ attributes: AttributeContainer? = nil, fontSize: Double = 0) -> AttributedString { + func attributes(fontSize: Double = 0) -> AttributeContainer { - var attrTitle = AttributedString(self.title) + var attributes = AttributeContainer() var font: Font = .system(size: fontSize) if self.style.contains(.bold) { @@ -77,19 +75,11 @@ extension OutlineItem { font = font.italic() } if self.style.contains(.underline) { - attrTitle.underlineStyle = .single + attributes.underlineStyle = .single } - attrTitle.font = font + attributes.font = font - guard let ranges = self.filteredRanges, let attributes else { return attrTitle } - - for range in ranges { - guard let attrRange = Range(range, in: attrTitle) else { continue } - - attrTitle[attrRange].mergeAttributes(attributes) - } - - return attrTitle + return attributes } } diff --git a/CotEditor/Sources/OutlineItem.swift b/CotEditor/Sources/OutlineItem.swift index 2679e9e6f..bf91d84f3 100644 --- a/CotEditor/Sources/OutlineItem.swift +++ b/CotEditor/Sources/OutlineItem.swift @@ -42,7 +42,6 @@ struct OutlineItem: Equatable, Identifiable { var title: String var range: NSRange var style: Style = [] - fileprivate(set) var filteredRanges: [Range]? var isSeparator: Bool { self.title == .separator } } @@ -91,26 +90,6 @@ extension BidirectionalCollection { } - /// Filters matched outline items abbreviatedly. - /// - /// - Parameter searchString: The string to search. - /// - Returns: Matched items, or all if the searchString is empty. - func filterItems(with searchString: String) -> [OutlineItem] { - - guard !searchString.isEmpty else { return Array(self) } - - return self.compactMap { item in - item.title.abbreviatedMatch(with: searchString).flatMap { (item: item, result: $0) } - } - .filter { $0.result.remaining.isEmpty } - .map { - var item = $0.item - item.filteredRanges = $0.result.ranges - return item - } - } - - /// Returns the index of element for the given range. /// /// - Parameter range: The character range to refer. diff --git a/CotEditor/Sources/OutlineNavigator.swift b/CotEditor/Sources/OutlineNavigator.swift new file mode 100644 index 000000000..b7a901c81 --- /dev/null +++ b/CotEditor/Sources/OutlineNavigator.swift @@ -0,0 +1,122 @@ +// +// OutlineNavigator.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-04. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import AppKit +import Observation +import Combine + +@Observable @MainActor final class OutlineNavigator { + + // MARK: Public Properties + + weak var textView: NSTextView? { didSet { self.observeTextView() } } + + var items: [OutlineItem]? + var selection: OutlineItem.ID? + var isOutlinePickerPresented = false + + private(set) var isVerticalOrientation: Bool = false + + + // MARK: Private Properties + + private var selectedRange: NSRange = .notFound + private var viewObservers: Set = [] + + + // MARK: Public Methods + + /// Can select the previous item in outline menu? + var canSelectPreviousItem: Bool { + + self.items?.previousItem(for: self.selectedRange) != nil + } + + + /// Can select the next item in outline menu? + var canSelectNextItem: Bool { + + self.items?.nextItem(for: self.selectedRange) != nil + } + + + /// Selects the previous outline item in editor. + func selectPreviousItem() { + + guard let item = self.items?.previousItem(for: self.selectedRange) else { return } + + self.textView?.select(range: item.range) + } + + + /// Selects the next outline item in editor. + func selectNextItem() { + + guard let item = self.items?.nextItem(for: self.selectedRange) else { return } + + self.textView?.select(range: item.range) + } + + + // MARK: Private Methods + + /// Observers text view update. + private func observeTextView() { + + guard let textView = self.textView else { return assertionFailure() } + + self.selectedRange = textView.selectedRange + self.viewObservers = [ + textView.publisher(for: \.layoutOrientation, options: .initial) + .sink { [weak self] in self?.isVerticalOrientation = $0 == .vertical }, + + NotificationCenter.default.publisher(for: NSTextView.didChangeSelectionNotification, object: textView) + .map { $0.object as! NSTextView } + .filter { !$0.hasMarkedText() } + // avoid updating outline item selection before finishing outline parse + // -> Otherwise, a wrong item can be selected because of using the outdated outline ranges. + // You can ignore text selection change at this time point as the outline selection will be updated when the parse finished. + .filter { $0.textStorage?.editedMask.contains(.editedCharacters) == false } + .debounce(for: .seconds(0.05), scheduler: RunLoop.main) + .sink { [weak self] in self?.select(range: $0.selectedRange) } + ] + } + + + /// Updates selection range related properties. + /// + /// - Parameter range: The new text selection range. + private func select(range: NSRange) { + + self.selectedRange = range + self.selection = self.items?.last { item in + if item.isSeparator { + false + } else { + item.range.location <= range.location + } + }?.id + } +} diff --git a/CotEditor/Sources/OutlinePicker.swift b/CotEditor/Sources/OutlinePicker.swift new file mode 100644 index 000000000..c2a021e02 --- /dev/null +++ b/CotEditor/Sources/OutlinePicker.swift @@ -0,0 +1,137 @@ +// +// OutlinePicker.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2020-08-16. +// +// --------------------------------------------------------------------------- +// +// © 2020-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import AppKit +import SwiftUI + +struct OutlinePicker: NSViewRepresentable { + + typealias NSViewType = NSPopUpButton + + var items: [OutlineItem] + @Binding var selection: OutlineItem.ID? + @Binding var isPresented: Bool + var onSelect: (OutlineItem) -> Void + + + func makeNSView(context: Context) -> NSPopUpButton { + + let button = NSPopUpButton() + button.cell = OutlinePopUpButtonCell() + button.controlSize = .small + button.isBordered = false + + return button + } + + + func updateNSView(_ nsView: NSPopUpButton, context: Context) { + + let font = (nsView.font ?? .systemFont(ofSize: 0)).withSize(NSFont.systemFontSize(for: nsView.controlSize)) + nsView.menu?.items = self.items.map { item in + if item.isSeparator { + return .separator() + } else { + let menuItem = NSMenuItem() + menuItem.target = context.coordinator + menuItem.action = #selector(Coordinator.itemSelected) + menuItem.representedObject = item + menuItem.attributedTitle = NSAttributedString(string: item.title, attributes: item.attributes(baseFont: font)) + return menuItem + } + } + + if let index = self.items.firstIndex(where: { $0.id == self.selection }) { + nsView.selectItem(at: index) + } + + if self.isPresented { + nsView.menu?.popUp(positioning: nil, at: .zero, in: nsView) + self.isPresented = false + } + } + + + func makeCoordinator() -> Coordinator { + + Coordinator(selection: $selection, onSelect: self.onSelect) + } + + + func sizeThatFits(_ proposal: ProposedViewSize, nsView: NSPopUpButton, context: Context) -> CGSize? { + + guard let menuItemTitle = nsView.selectedItem?.attributedTitle else { return proposal.replacingUnspecifiedDimensions() } + + // trim indent width + var size = nsView.intrinsicContentSize + size.width -= menuItemTitle.size().width - nsView.attributedTitle.size().width + size.width += 4 // for aesthetic margin + + return size + } + + + final class Coordinator: NSObject { + + @Binding var selection: OutlineItem.ID? + var onSelect: (OutlineItem) -> Void + + + init(selection: Binding, onSelect: @escaping (OutlineItem) -> Void) { + + self._selection = selection + self.onSelect = onSelect + } + + + @objc func itemSelected(_ sender: NSMenuItem) { + + let item = sender.representedObject as! OutlineItem + + self.selection = item.id + self.onSelect(item) + } + } +} + + +private final class OutlinePopUpButtonCell: NSPopUpButtonCell { + + override var attributedTitle: NSAttributedString { + + get { + let title = super.attributedTitle + let indentRange = (title.string as NSString).range(of: "^\\s+", options: .regularExpression) + + return indentRange.isEmpty + ? title + : title.attributedSubstring(from: NSRange(indentRange.upperBound.. { extension Pair: Equatable where T: Equatable { } extension Pair: Hashable where T: Hashable { } extension Pair: Sendable where T: Sendable { } - - - -// MARK: BracePair - -typealias BracePair = Pair - -extension Pair where T == Character { - - static let braces: [BracePair] = [BracePair("(", ")"), - BracePair("{", "}"), - BracePair("[", "]")] - static let ltgt = BracePair("<", ">") - static let doubleQuotes = BracePair("\"", "\"") - - - enum PairIndex { - - case begin(String.Index) - case end(String.Index) - case odd - } -} - - - -extension StringProtocol { - - /// Finds the mate of a brace pair. - /// - /// - Parameters: - /// - index: The character index of the brace character to find the mate. - /// - candidates: Brace pairs to find. - /// - range: The range of characters to find in. - /// - pairToIgnore: The brace pair in which brace characters should be ignored. - /// - Returns: The character index of the matched pair. - func indexOfBracePair(at index: Index, candidates: [BracePair], in range: Range? = nil, ignoring pairToIgnore: BracePair? = nil) -> BracePair.PairIndex? { - - guard !self.isCharacterEscaped(at: index) else { return nil } - - let character = self[index] - - guard let pair = candidates.first(where: { $0.begin == character || $0.end == character }) else { return nil } - - switch character { - case pair.begin: - guard let endIndex = self.indexOfBracePair(beginIndex: index, pair: pair, until: range?.upperBound, ignoring: pairToIgnore) else { return .odd } - return .end(endIndex) - - case pair.end: - guard let beginIndex = self.indexOfBracePair(endIndex: index, pair: pair, until: range?.lowerBound, ignoring: pairToIgnore) else { return .odd } - return .begin(beginIndex) - - default: preconditionFailure() - } - } - - - /// Finds character index of matched opening brace before a given index. - /// - /// This method ignores escaped characters. - /// - /// - Parameters: - /// - endIndex: The character index of the closing brace of the pair to find. - /// - pair: The brace pair to find. - /// - beginIndex: The lower boundary of the find range. - /// - pairToIgnore: The brace pair in which brace characters should be ignored. - /// - Returns: The character index of the matched opening brace, or `nil` if not found. - func indexOfBracePair(endIndex: Index, pair: BracePair, until beginIndex: Index? = nil, ignoring pairToIgnore: BracePair? = nil) -> Index? { - - assert(endIndex <= self.endIndex) - - let beginIndex = beginIndex ?? self.startIndex - - guard beginIndex < endIndex else { return nil } - - var index = endIndex - var nestDepth = 0 - var ignoredNestDepth = 0 - - while index > beginIndex { - index = self.index(before: index) - - switch self[index] { - case pair.begin where ignoredNestDepth == 0: - guard !self.isCharacterEscaped(at: index) else { continue } - if nestDepth == 0 { return index } // found - nestDepth -= 1 - - case pair.end where ignoredNestDepth == 0: - guard !self.isCharacterEscaped(at: index) else { continue } - nestDepth += 1 - - case pairToIgnore?.begin: - guard !self.isCharacterEscaped(at: index) else { continue } - ignoredNestDepth -= 1 - - case pairToIgnore?.end: - guard !self.isCharacterEscaped(at: index) else { continue } - ignoredNestDepth += 1 - - default: break - } - } - - return nil - } - - - /// Finds character index of matched closing brace after a given index. - /// - /// This method ignores escaped characters. - /// - /// - Parameters: - /// - beginIndex: The character index of the opening brace of the pair to find. - /// - pair: The brace pair to find. - /// - endIndex: The upper boundary of the find range. - /// - pairToIgnore: The brace pair in which brace characters should be ignored. - /// - Returns: The character index of the matched closing brace, or `nil` if not found. - func indexOfBracePair(beginIndex: Index, pair: BracePair, until endIndex: Index? = nil, ignoring pairToIgnore: BracePair? = nil) -> Index? { - - assert(beginIndex >= self.startIndex) - - // avoid (endIndex == self.startIndex) - guard !self.isEmpty, endIndex.flatMap({ $0 > self.startIndex }) != false else { return nil } - - let endIndex = self.index(before: endIndex ?? self.endIndex) - - guard beginIndex < endIndex else { return nil } - - var index = beginIndex - var nestDepth = 0 - var ignoredNestDepth = 0 - - while index < endIndex { - index = self.index(after: index) - - switch self[index] { - case pair.end where ignoredNestDepth == 0: - guard !self.isCharacterEscaped(at: index) else { continue } - if nestDepth == 0 { return index } // found - nestDepth -= 1 - - case pair.begin where ignoredNestDepth == 0: - guard !self.isCharacterEscaped(at: index) else { continue } - nestDepth += 1 - - case pairToIgnore?.end: - guard !self.isCharacterEscaped(at: index) else { continue } - ignoredNestDepth -= 1 - - case pairToIgnore?.begin: - guard !self.isCharacterEscaped(at: index) else { continue } - ignoredNestDepth += 1 - - default: break - } - } - - return nil - } -} diff --git a/CotEditor/Sources/PatternSortView.swift b/CotEditor/Sources/PatternSortView.swift index 6b8fcb01c..0eaee4b80 100644 --- a/CotEditor/Sources/PatternSortView.swift +++ b/CotEditor/Sources/PatternSortView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct PatternSortView: View { @@ -99,17 +100,17 @@ struct PatternSortView: View { .horizontalRadioGroupLayout() .labelsHidden() .fixedSize() - .onChange(of: self.sortKey) { _ in self.validate() } + .onChange(of: self.sortKey) { self.validate() } switch self.sortKey { case .entire: EmptyView() case .column: ColumnSortPatternView(pattern: $columnSortPattern) - .onChange(of: self.columnSortPattern) { _ in self.validate() } + .onChange(of: self.columnSortPattern) { self.validate() } case .regularExpression: RegularExpressionSortPatternView(pattern: $regularExpressionSortPattern, error: $error) - .onChange(of: self.regularExpressionSortPattern) { _ in self.validate() } + .onChange(of: self.regularExpressionSortPattern) { self.validate() } } } } @@ -136,7 +137,7 @@ struct PatternSortView: View { } HStack { - HelpButton(anchor: "howto_pattern_sort") + HelpLink(anchor: "howto_pattern_sort") Spacer() SubmitButtonGroup(String(localized: "Sort", table: "PatternSort", comment: "button label")) { self.submit() @@ -168,7 +169,7 @@ struct PatternSortView: View { /// Submits the current input. - @MainActor private func submit() { + private func submit() { guard self.parent?.commitEditing() == true diff --git a/CotEditor/Sources/PersistentOSAScript.swift b/CotEditor/Sources/PersistentOSAScript.swift index 2cc8d82a8..45068cc5a 100644 --- a/CotEditor/Sources/PersistentOSAScript.swift +++ b/CotEditor/Sources/PersistentOSAScript.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import Foundation import OSAKit +import Shortcut struct PersistentOSAScript: EventScript { diff --git a/CotEditor/Sources/PopoverHolderView.swift b/CotEditor/Sources/PopoverHolderView.swift index 233e3e7d5..d7bd3d1ea 100644 --- a/CotEditor/Sources/PopoverHolderView.swift +++ b/CotEditor/Sources/PopoverHolderView.swift @@ -51,11 +51,11 @@ private extension Edge { } -private struct PopoverHolderView: NSViewRepresentable { +private struct PopoverHolderView: NSViewRepresentable { @Binding var isPresented: Bool let arrowEdge: Edge - var content: () -> T + @ViewBuilder var content: () -> Content func makeNSView(context: Context) -> NSView { diff --git a/CotEditor/Sources/PrintPanelAccessoryController.swift b/CotEditor/Sources/PrintPanelAccessoryController.swift index b6bea991a..81792a9bb 100644 --- a/CotEditor/Sources/PrintPanelAccessoryController.swift +++ b/CotEditor/Sources/PrintPanelAccessoryController.swift @@ -24,6 +24,7 @@ // import AppKit +import Defaults extension NSPrintInfo.AttributeKey { diff --git a/CotEditor/Sources/PrintTextView.swift b/CotEditor/Sources/PrintTextView.swift index 336cc95ff..12a86833c 100644 --- a/CotEditor/Sources/PrintTextView.swift +++ b/CotEditor/Sources/PrintTextView.swift @@ -25,6 +25,7 @@ // import AppKit +import Defaults final class PrintTextView: NSTextView, Themable { diff --git a/CotEditor/Sources/ReplacementManager.swift b/CotEditor/Sources/ReplacementManager.swift index 01b359345..7c0d60f46 100644 --- a/CotEditor/Sources/ReplacementManager.swift +++ b/CotEditor/Sources/ReplacementManager.swift @@ -25,9 +25,10 @@ import Combine import Foundation +import Observation import UniformTypeIdentifiers -final class ReplacementManager: SettingFileManaging { +@Observable final class ReplacementManager: SettingFileManaging { typealias Setting = MultipleReplace @@ -45,7 +46,7 @@ final class ReplacementManager: SettingFileManaging { let fileType: UTType = .cotReplacement let reservedNames: [String] = [] - @Published var settingNames: [String] = [] + var settingNames: [String] = [] let bundledSettingNames: [String] = [] var cachedSettings: [String: Setting] = [:] diff --git a/CotEditor/Sources/SavePanelAccessory.swift b/CotEditor/Sources/SavePanelAccessory.swift index c2aa54d3a..f84941790 100644 --- a/CotEditor/Sources/SavePanelAccessory.swift +++ b/CotEditor/Sources/SavePanelAccessory.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,16 +24,17 @@ // import SwiftUI +import Observation -final class SaveOptions: ObservableObject { +@Observable final class SaveOptions { - @Published var isExecutable = false + var isExecutable = false } struct SavePanelAccessory: View { - @ObservedObject var options: SaveOptions + @State var options: SaveOptions // MARK: View diff --git a/CotEditor/Sources/Script.swift b/CotEditor/Sources/Script.swift index fa2222158..ebbb25e29 100644 --- a/CotEditor/Sources/Script.swift +++ b/CotEditor/Sources/Script.swift @@ -24,6 +24,7 @@ // import Foundation +import Shortcut protocol Script: Sendable { diff --git a/CotEditor/Sources/ScriptDescriptor.swift b/CotEditor/Sources/ScriptDescriptor.swift index d7aae7ef7..a9ca04f5b 100644 --- a/CotEditor/Sources/ScriptDescriptor.swift +++ b/CotEditor/Sources/ScriptDescriptor.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import Foundation import UniformTypeIdentifiers +import Shortcut enum ScriptingFileType: CaseIterable { diff --git a/CotEditor/Sources/ScriptManager.swift b/CotEditor/Sources/ScriptManager.swift index 9d61c900e..5dd6b880b 100644 --- a/CotEditor/Sources/ScriptManager.swift +++ b/CotEditor/Sources/ScriptManager.swift @@ -26,12 +26,13 @@ import AppKit import Combine +import Shortcut // NSObject-based NSAppleEventDescriptor must be used but not sendable // -> According to the documentation, NSAppleEventDescriptor is just a wrapper of AEDesc, // so seems safe to conform to Sendable. (macOS 12, Xcode 14.0) -extension NSAppleEventDescriptor: @unchecked Sendable { } -extension NSScriptObjectSpecifier: @unchecked Sendable { } +extension NSAppleEventDescriptor: @retroactive @unchecked Sendable { } +extension NSScriptObjectSpecifier: @retroactive @unchecked Sendable { } final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { @@ -47,7 +48,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { private var scriptsDirectoryURL: URL? private var currentContext: String? { didSet { Task { await self.applyShortcuts() } } } - @Atomic private var scriptHandlersTable: [ScriptingEventType: [any EventScript]] = [:] + @MainActor private var scriptHandlersTable: [ScriptingEventType: [any EventScript]] = [:] private var debounceTask: Task? private var syntaxObserver: AnyCancellable? @@ -60,9 +61,11 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { super.init() - self.syntaxObserver = (DocumentController.shared as! DocumentController).$currentSyntaxName - .removeDuplicates() - .sink { [unowned self] styleName in Task { @MainActor in self.currentContext = styleName } } + Task { @MainActor in + self.syntaxObserver = (DocumentController.shared as! DocumentController).$currentSyntaxName + .removeDuplicates() + .sink { [unowned self] styleName in Task { @MainActor in self.currentContext = styleName } } + } } @@ -91,7 +94,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { await self?.buildScriptMenu() } else { - for await _ in await NotificationCenter.default.notifications(named: NSApplication.didBecomeActiveNotification) { + for await _ in NotificationCenter.default.notifications(named: NSApplication.didBecomeActiveNotification) { try Task.checkCancellation() await self?.buildScriptMenu() return @@ -148,12 +151,9 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { /// - Parameters: /// - eventType: The event trigger to perform script. /// - documentSpecifier: The script object specifier of the target document. - func dispatch(event eventType: ScriptingEventType, document documentSpecifier: NSScriptObjectSpecifier) { + func dispatch(event eventType: ScriptingEventType, document documentSpecifier: NSScriptObjectSpecifier) async { - guard - let scripts = self.scriptHandlersTable[eventType], - !scripts.isEmpty - else { return } + guard let scripts = await self.scriptHandlersTable[eventType], !scripts.isEmpty else { return } // Create an Apple event caused by the given `Document`. let documentDescriptor = documentSpecifier.descriptor ?? NSAppleEventDescriptor(string: "BUG: document.objectSpecifier.descriptor was nil") @@ -164,9 +164,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { transactionID: AETransactionID(kAnyTransactionID)) event.setParam(documentDescriptor, forKeyword: keyDirectObject) - Task { - await self.dispatch(event, handlers: scripts) - } + await self.dispatch(event, handlers: scripts) } @@ -231,7 +229,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { @MainActor private func buildScriptMenu() async { self.debounceTask?.cancel() - self.$scriptHandlersTable.mutate { $0.removeAll() } + self.scriptHandlersTable.removeAll() guard let directoryURL = self.scriptsDirectoryURL else { return } @@ -241,9 +239,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { let eventScripts = scriptMenuItems.flatMap(\.scripts) .compactMap { $0 as? any EventScript } for type in ScriptingEventType.allCases { - self.$scriptHandlersTable.mutate { - $0[type] = eventScripts.filter { $0.eventTypes.contains(type) } - } + self.scriptHandlersTable[type] = eventScripts.filter { $0.eventTypes.contains(type) } } let menuItems = scriptMenuItems.map { $0.menuItem(action: #selector(launchScript), target: self) } @@ -305,7 +301,7 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { guard let urls = try? FileManager.default .contentsOfDirectory(at: directoryURL, - includingPropertiesForKeys: [.contentTypeKey, .isDirectoryKey, .isExecutableKey], + includingPropertiesForKeys: [.contentTypeKey, .isExecutableKey], options: [.skipsHiddenFiles]) else { return [] } @@ -316,21 +312,16 @@ final class ScriptManager: NSObject, NSFilePresenter, @unchecked Sendable { let name = url.deletingPathExtension().lastPathComponent .replacing(/^\d+\)/.asciiOnlyDigits(), with: "", maxReplacements: 1) // remove ordering prefix - if name == .separator { - return .separator - - } else if let descriptor = ScriptDescriptor(contentsOf: url, name: name), - let script = try? descriptor.makeScript() - { + return if name == .separator { + .separator + } else if let script = try? ScriptDescriptor(contentsOf: url, name: name)?.makeScript() { // -> Check script possibility before folder because a script can be a directory, e.g. .scptd. - return .script(script.name, script) - - } else if (try? url.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory == true { - let items = Self.scriptMenuItems(at: url) - return .folder(name, items) + .script(script.name, script) + } else if url.hasDirectoryPath { + .folder(name, Self.scriptMenuItems(at: url)) + } else { + nil } - - return nil } } diff --git a/CotEditor/Sources/SettingFileManaging.swift b/CotEditor/Sources/SettingFileManaging.swift index 5526d8cc2..21616b437 100644 --- a/CotEditor/Sources/SettingFileManaging.swift +++ b/CotEditor/Sources/SettingFileManaging.swift @@ -579,7 +579,7 @@ struct ImportDuplicationError: LocalizedError, RecoverableError { var name: String var type: UTType - var continuationHandler: (() throws -> Void) + var continuationHandler: (@Sendable () throws -> Void) var errorDescription: String? { diff --git a/CotEditor/Sources/SettingsPane.swift b/CotEditor/Sources/SettingsPane.swift index 40d04f0e5..d34b488c6 100644 --- a/CotEditor/Sources/SettingsPane.swift +++ b/CotEditor/Sources/SettingsPane.swift @@ -33,6 +33,7 @@ enum SettingsPane: String, CaseIterable { case format case snippets case keyBindings + case donation /// Localized label. @@ -71,6 +72,10 @@ enum SettingsPane: String, CaseIterable { String(localized: "SettingsPane.keyBindings.label", defaultValue: "Key Bindings", table: "Settings") + case .donation: + String(localized: "SettingsPane.donation.label", + defaultValue: "Donation", + table: "Settings") } } @@ -87,6 +92,7 @@ enum SettingsPane: String, CaseIterable { case .format: "doc.text" case .snippets: "note.text" case .keyBindings: "keyboard" + case .donation: "mug" } } } diff --git a/CotEditor/Sources/SettingsTabViewController.swift b/CotEditor/Sources/SettingsTabViewController.swift index 0ac5af873..20afd4999 100644 --- a/CotEditor/Sources/SettingsTabViewController.swift +++ b/CotEditor/Sources/SettingsTabViewController.swift @@ -24,6 +24,7 @@ // import AppKit +import Defaults final class SettingsTabViewController: NSTabViewController { diff --git a/CotEditor/Sources/SettingsWindowController.swift b/CotEditor/Sources/SettingsWindowController.swift index 27fb23cd6..ddf54a35c 100644 --- a/CotEditor/Sources/SettingsWindowController.swift +++ b/CotEditor/Sources/SettingsWindowController.swift @@ -28,6 +28,9 @@ import SwiftUI final class SettingsWindowController: NSWindowController { + static let shared = SettingsWindowController() + + // MARK: Lifecycle convenience init() { @@ -77,7 +80,7 @@ private extension SettingsPane { } - private var view: any View { + @MainActor private var view: any View { switch self { case .general: GeneralSettingsView() @@ -88,6 +91,7 @@ private extension SettingsPane { case .format: FormatSettingsView() case .snippets: SnippetsSettingsView() case .keyBindings: KeyBindingsSettingsView() + case .donation: DonationSettingsView() } } } diff --git a/CotEditor/Sources/Shortcut+Error.swift b/CotEditor/Sources/Shortcut+Error.swift index 2bdafe87c..c5f0e6d9e 100644 --- a/CotEditor/Sources/Shortcut+Error.swift +++ b/CotEditor/Sources/Shortcut+Error.swift @@ -25,6 +25,7 @@ import AppKit import Foundation +import Shortcut extension Shortcut { @@ -66,7 +67,7 @@ extension Shortcut { /// Validates whether the shortcut is available for user customization. /// /// - Throws: `Shortcut.CustomizationError` - func checkCustomizationAvailability() throws { + @MainActor func checkCustomizationAvailability() throws { // Tab or Backtab if self.keyEquivalent == "\u{9}" || self.keyEquivalent == "\u{19}" { diff --git a/CotEditor/Sources/ShortcutField.swift b/CotEditor/Sources/ShortcutField.swift index cfb4acb8d..b515dca3a 100644 --- a/CotEditor/Sources/ShortcutField.swift +++ b/CotEditor/Sources/ShortcutField.swift @@ -9,7 +9,7 @@ // --------------------------------------------------------------------------- // // © 2004-2007 nakamuxu -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,99 @@ // limitations under the License. // +import SwiftUI import AppKit import Combine +import Shortcut -final class ShortcutField: NSTextField, NSTextViewDelegate { +struct ShortcutField: NSViewRepresentable { + + typealias NSViewType = NSTextField + + @Binding var value: Shortcut? + @Binding var error: (any Error)? + + + func makeNSView(context: Context) -> NSTextField { + + let nsView = ShortcutTextField() + nsView.cell?.sendsActionOnEndEditing = true + nsView.delegate = context.coordinator + nsView.formatter = ShortcutFormatter() + nsView.isEditable = true + nsView.isBordered = false + nsView.drawsBackground = false + + // fix the alignment to right regardless the UI layout direction + nsView.alignment = .right + nsView.baseWritingDirection = .leftToRight + + return nsView + } + + + func updateNSView(_ nsView: NSTextField, context: Context) { + + nsView.objectValue = self.value + } + + + func makeCoordinator() -> Coordinator { + + Coordinator(shortcut: $value, error: $error) + } + + + @MainActor final class Coordinator: NSObject, NSTextFieldDelegate { + + @Binding private var shortcut: Shortcut? + @Binding private var error: (any Error)? + + + init(shortcut: Binding, error: Binding<(any Error)?>) { + + self._shortcut = shortcut + self._error = error + } + + + func controlTextDidEndEditing(_ obj: Notification) { + + guard let sender = obj.object as? NSTextField else { return assertionFailure() } + + let shortcut = sender.objectValue as? Shortcut + + self.error = nil + + // not edited + guard shortcut != self.shortcut else { return } + + if let shortcut { + do { + try shortcut.checkCustomizationAvailability() + + } catch { + self.error = error + sender.objectValue = self.shortcut // reset text field + NSSound.beep() + + // make text field edit mode again + // -> Wrap with Task to delay a bit (2024-05, macOS 14). + Task { + _ = sender.becomeFirstResponder() + } + return + } + } + + // successfully update data + self.shortcut = shortcut + } + } +} + + +final class ShortcutTextField: NSTextField, NSTextViewDelegate { // MARK: Private Properties @@ -96,7 +185,10 @@ final class ShortcutField: NSTextField, NSTextViewDelegate { } // end monitoring key down event - self.removeKeyMonitor() + if let monitor = self.keyDownMonitor { + NSEvent.removeMonitor(monitor) + self.keyDownMonitor = nil + } self.windowObserver = nil super.textDidEndEditing(notification) @@ -111,16 +203,4 @@ final class ShortcutField: NSTextField, NSTextViewDelegate { // disable contextual menu for field editor nil } - - - // MARK: Private Methods - - /// Stops and removes the key down monitoring. - private func removeKeyMonitor() { - - if let monitor = self.keyDownMonitor { - NSEvent.removeMonitor(monitor) - self.keyDownMonitor = nil - } - } } diff --git a/CotEditor/Sources/ShortcutView.swift b/CotEditor/Sources/ShortcutView.swift index 44a66161f..ce60fa42d 100644 --- a/CotEditor/Sources/ShortcutView.swift +++ b/CotEditor/Sources/ShortcutView.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // import SwiftUI +import Shortcut struct ShortcutView: View { @@ -64,16 +65,6 @@ struct ShortcutView: View { // MARK: - Preview -private extension Shortcut { - - init(_ specialKey: NSEvent.SpecialKey, modifiers: NSEvent.ModifierFlags) { - - self.keyEquivalent = String(specialKey.unicodeScalar) - self.modifiers = modifiers - } -} - - #Preview { VStack(alignment: .trailing, spacing: 6) { ShortcutView(Shortcut("s", modifiers: [.command, .shift])!) diff --git a/CotEditor/Sources/Snippet.swift b/CotEditor/Sources/Snippet.swift index b5a666cca..a87388bc2 100644 --- a/CotEditor/Sources/Snippet.swift +++ b/CotEditor/Sources/Snippet.swift @@ -24,8 +24,9 @@ // import Foundation.NSString +import Shortcut -struct Snippet: Identifiable { +struct Snippet: Equatable, Identifiable { let id = UUID() diff --git a/CotEditor/Sources/SnippetManager.swift b/CotEditor/Sources/SnippetManager.swift index ffd1daa4b..1e4a522c5 100644 --- a/CotEditor/Sources/SnippetManager.swift +++ b/CotEditor/Sources/SnippetManager.swift @@ -27,6 +27,8 @@ import AppKit import Combine import Foundation +import Defaults +import Shortcut @MainActor @objc protocol SnippetInsertable: AnyObject { @@ -60,9 +62,11 @@ final class SnippetManager: @unchecked Sendable { self.migrateIfNeeded() - self.scopeObserver = (DocumentController.shared as! DocumentController).$currentSyntaxName - .removeDuplicates() - .sink { [unowned self] in self.scope = $0 } + Task { @MainActor in + self.scopeObserver = (DocumentController.shared as! DocumentController).$currentSyntaxName + .removeDuplicates() + .sink { [unowned self] in self.scope = $0 } + } } diff --git a/CotEditor/Sources/SnippetsSettingsView.swift b/CotEditor/Sources/SnippetsSettingsView.swift index 4435b2f68..5c1d86f23 100644 --- a/CotEditor/Sources/SnippetsSettingsView.swift +++ b/CotEditor/Sources/SnippetsSettingsView.swift @@ -24,68 +24,326 @@ // import SwiftUI +import Defaults struct SnippetsSettingsView: View { + private var insets = EdgeInsets(top: 4, leading: 10, bottom: 10, trailing: 10) + + var body: some View { VStack { TabView { - VStack(alignment: .leading) { - Text("Text to be inserted by a command in the menu or by keyboard shortcut:", tableName: "SnippetsSettings") - CommandView() - } - .padding(EdgeInsets(top: 4, leading: 10, bottom: 10, trailing: 10)) - .tabItem { Text("Command", tableName: "SnippetsSettings", comment: "tab label") } - - VStack(alignment: .leading) { - Text("Text to be inserted by dropping files to the editor:", tableName: "SnippetsSettings") - FileDropView() - } - .padding(EdgeInsets(top: 4, leading: 10, bottom: 10, trailing: 10)) - .tabItem { Text("File Drop", tableName: "SnippetsSettings", comment: "tab label") } - }.frame(height: 400) + CommandSnippetsView() + .padding(self.insets) + .tabItem { Text("Command", tableName: "SnippetsSettings", comment: "tab label") } + FileDropView() + .padding(self.insets) + .tabItem { Text("File Drop", tableName: "SnippetsSettings", comment: "tab label") } + } HStack { Spacer() - HelpButton(anchor: "settings_snippets") + HelpLink(anchor: "settings_snippets") } } .padding(.top, 10) .scenePadding([.horizontal, .bottom]) - .frame(width: 600) + .frame(width: 600, height: 450) } } -private struct CommandView: NSViewControllerRepresentable { +private struct CommandSnippetsView: View { - typealias NSViewControllerType = NSViewController + private typealias Item = Snippet - func makeNSViewController(context: Context) -> NSViewController { - - NSStoryboard(name: "SnippetsPane", bundle: nil).instantiateInitialController()! - } - - func updateNSViewController(_ nsViewController: NSViewController, context: Context) { + @State private var items: [Item] = [] + @State private var selection: Set = [] + + @State private var error: (any Error)? + @State private var format: String? + + + var body: some View { + VStack(alignment: .leading) { + Text("Text to be inserted by a command in the menu or by keyboard shortcut:", tableName: "SnippetsSettings") + + Table(of: Binding.self, selection: $selection) { + TableColumn(String(localized: "Syntax", table: "SnippetsSettings", comment: "table column header")) { item in + SyntaxPicker(selection: item.scope) + .buttonStyle(.borderless) + .help(String(localized: "Syntax in which this file drop setting is used.", table: "SnippetsSettings", comment: "tooltip")) + }.width(160) + + TableColumn(String(localized: "Name", table: "SnippetsSettings", comment: "table column header")) { item in + TextField(text: item.name, label: EmptyView.init) + } + + TableColumn(String(localized: "Key", table: "SnippetsSettings", comment: "table column header")) { item in + ShortcutField(value: item.shortcut, error: $error) + }.width(60) + } rows: { + ForEach($items) { item in + TableRow(item) + .itemProvider { [id = item.id] in id.itemProvider } + } + .onInsert(of: [.uuid]) { (index, providers) in + // `onInsert(of:perform:)` shows a plus badge which should be avoided + // on just moving items in the identical table, + // but `onMove()` is not provided yet for DynamicTableRowContent. + // (2024-05, macOS 14) + Task { + let indexes = try await providers + .asyncMap { try await $0.load(type: UUID.self) } + .compactMap { uuid in self.items.firstIndex(where: { $0.id == uuid }) } + + withAnimation { + self.items.move(fromOffsets: IndexSet(indexes), toOffset: index) + } + } + } + } + .onChange(of: self.selection, initial: true) { (_, newValue) in + self.format = if newValue.count == 1, let id = newValue.first { + self.items[id: id]?.format + } else { + nil + } + } + .tableStyle(.bordered) + .border(Color(nsColor: .gridColor)) + + HStack(alignment: .firstTextBaseline) { + AddRemoveButton($items, selection: $selection) { + SnippetManager.shared.createUntitledSetting() + } + Spacer() + if let error { + Text(error.localizedDescription) + .foregroundStyle(.red) + .controlSize(.small) + } + } + .padding(.bottom) + + InsertionFormatView(text: $format, count: self.selection.count, insertionVariables: Snippet.Variable.allCases, tokenizer: Snippet.Variable.tokenizer) + } + .onAppear { + self.items = SnippetManager.shared.snippets + if let item = self.items.first { + self.selection = [item.id] + } + } + .onChange(of: self.items) { (_, newValue) in + SnippetManager.shared.save(newValue) + } } } -private struct FileDropView: NSViewControllerRepresentable { +private struct FileDropView: View { - typealias NSViewControllerType = NSViewController + private typealias Item = FileDropItem - func makeNSViewController(context: Context) -> NSViewController { + @State private var items: [Item] = [] + @State private var selection: Set = [] + + @State private var format: String? + @State private var canRestore: Bool = false + + + var body: some View { - NSStoryboard(name: "SnippetsPane", bundle: nil).instantiateController(identifier: "FileDropView") + VStack(alignment: .leading) { + Text("Text to be inserted by dropping files to the editor:", tableName: "SnippetsSettings") + + Table(of: Binding.self, selection: $selection) { + TableColumn(String(localized: "Syntax", table: "SnippetsSettings", comment: "table column header")) { item in + SyntaxPicker(selection: item.scope) + .buttonStyle(.borderless) + .help(String(localized: "Syntax in which this file drop setting is used.", table: "SnippetsSettings", comment: "tooltip")) + }.width(160) + + TableColumn(String(localized: "Extensions", table: "SnippetsSettings", comment: "table column header")) { item in + TextField(value: item.extensions, format: .csv(omittingEmptyItems: true), prompt: Text("All", tableName: "SnippetsSettings"), label: EmptyView.init) + .help(String(localized: "File extensions of dropped file (comma separated).", table: "SnippetsSettings", comment: "tooltip")) + } + + TableColumn(String(localized: "Description", table: "SnippetsSettings", comment: "table column header")) { item in + TextField(text: item.description ?? "", label: EmptyView.init) + } + } rows: { + ForEach($items) { item in + TableRow(item) + .itemProvider { [id = item.id] in id.itemProvider } + } + .onInsert(of: [.uuid]) { (index, providers) in + Task { + let indexes = try await providers + .asyncMap { try await $0.load(type: UUID.self) } + .compactMap { uuid in self.items.firstIndex(where: { $0.id == uuid }) } + + withAnimation { + self.items.move(fromOffsets: IndexSet(indexes), toOffset: index) + } + } + } + } + .onChange(of: self.selection, initial: true) { (_, newValue) in + self.format = if newValue.count == 1, let id = newValue.first { + self.items[id: id]?.format + } else { + nil + } + } + .tableStyle(.bordered) + .border(Color(nsColor: .gridColor)) + + HStack(alignment: .firstTextBaseline) { + AddRemoveButton($items, selection: $selection, newItem: Item.init) + Spacer() + Button(String(localized: "Restore Defaults", table: "SnippetsSettings", comment: "button label"), action: self.restore) + .disabled(!self.canRestore) + } + .padding(.bottom) + + InsertionFormatView(text: $format, count: self.selection.count, insertionVariables: FileDropItem.Variable.allCases, tokenizer: FileDropItem.Variable.tokenizer) + } + .onAppear { + self.load() + } + .onChange(of: self.items) { (_, newValue) in + self.save(items: newValue) + } } - func updateNSViewController(_ nsViewController: NSViewController, context: Context) { + + /// Loads settings from UserDefaults. + private func load() { + let array = UserDefaults.standard[.fileDropArray] + + self.items = array.compactMap { FileDropItem(dictionary: $0) } + self.canRestore = array == UserDefaults.standard[initial: .fileDropArray] + if let item = self.items.first { + self.selection = [item.id] + } + } + + + /// Restores the settings to the default. + private func restore() { + + UserDefaults.standard.restore(key: .fileDropArray) + + self.load() + } + + + /// Writes back the settings to UserDefaults. + /// + /// - Parameter items: The items to save. + private func save(items: [Item]) { + + // sanitize + let sanitized = items + .filter { !$0.format.isEmpty } + .map(\.dictionary) + + // check if the new setting is different from the default + self.canRestore = sanitized != UserDefaults.standard[initial: .fileDropArray] + if self.canRestore { + UserDefaults.standard[.fileDropArray] = sanitized + } else { + UserDefaults.standard.restore(key: .fileDropArray) + } + } +} + + +private struct SyntaxPicker: View { + + @Binding var selection: String? + + + var body: some View { + + Picker(selection: $selection) { + Text("All", tableName: "SnippetsSettings") + .foregroundColor(Color(nsColor: .disabledControlTextColor)) + .tag(String?.none) + Divider() + ForEach(SyntaxManager.shared.settingNames, id: \.self) { + Text($0).tag(String?.some($0)) + } + } label: { + EmptyView() + } + } +} + + +private struct InsertionFormatView: View { + + @Binding var text: String? + var count: Int + var insertionVariables: [(any TokenRepresentable)?] + var tokenizer: Tokenizer + + @Namespace private var accessibility + + + var body: some View { + + VStack { + HStack { + Text("Insertion format:", tableName: "SnippetsSettings") + .accessibilityLabeledPair(role: .label, id: "insertionFormat", in: self.accessibility) + Spacer() + Menu(String(localized: "Insert Variable", table: "SnippetsSettings", comment: "button label")) { + ForEach(Array(self.insertionVariables.enumerated()), id: \.offset) { (_, variable) in + if let variable { + Button { + let menuItem = NSMenuItem() + menuItem.representedObject = variable.token + NSApp.sendAction(#selector(TokenTextView.insertVariable), to: nil, from: menuItem) + } label: { + Text(variable.token + "\n") + Text(variable.localizedDescription).foregroundColor(.secondary) + } + } else { + Divider() + } + } + } + .controlSize(.small) + .fixedSize() + } + + TokenTextEditor(text: $text, tokenizer: FileDropItem.Variable.tokenizer) + .accessibilityLabeledPair(role: .content, id: "insertionFormat", in: self.accessibility) + .frame(height: 100) + .overlay { + if let prompt { + Text(prompt).foregroundStyle(.placeholder) + } + } + } + .disabled(self.count != 1) + } + + + private var prompt: String? { + + switch self.count { + case 0: String(localized: "No item selected", table: "SnippetsSettings", comment: "placeholder") + case 1: nil + default: String(localized: "Multiple items selected", table: "SnippetsSettings", comment: "placeholder") + } } } diff --git a/CotEditor/Sources/SnippetsViewController.swift b/CotEditor/Sources/SnippetsViewController.swift deleted file mode 100644 index 0075242a7..000000000 --- a/CotEditor/Sources/SnippetsViewController.swift +++ /dev/null @@ -1,397 +0,0 @@ -// -// SnippetsViewController.swift -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2023-02-01. -// -// --------------------------------------------------------------------------- -// -// © 2023-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit - -/// Column identifiers for table view. -private extension NSUserInterfaceItemIdentifier { - - static let scope = NSUserInterfaceItemIdentifier("scope") - static let name = NSUserInterfaceItemIdentifier("name") - static let key = NSUserInterfaceItemIdentifier("key") -} - - -private extension NSPasteboard.PasteboardType { - - static let rows = NSPasteboard.PasteboardType("rows") -} - - -final class SnippetsViewController: NSViewController, NSTableViewDataSource, NSTableViewDelegate, NSTextViewDelegate { - - // MARK: Private Properties - - private var snippets: [Snippet] = [] - - @objc private dynamic var warningMessage: String? // for binding - - @IBOutlet private weak var tableView: NSTableView? - @IBOutlet private weak var addRemoveButton: NSSegmentedControl? - @IBOutlet private weak var formatTextView: TokenTextView? - @IBOutlet private weak var variableInsertionMenu: NSPopUpButton? - - - - // MARK: View Controller Methods - - override func viewDidLoad() { - - super.viewDidLoad() - - // setup variable menu - self.variableInsertionMenu!.menu!.items += Snippet.Variable.allCases - .map { $0.insertionMenuItem(target: self.formatTextView) } - - // set tokenizer for format text view - self.formatTextView!.tokenizer = Snippet.Variable.tokenizer - } - - - override func viewWillAppear() { - - super.viewWillAppear() - - self.snippets = SnippetManager.shared.snippets - self.tableView?.reloadData() - self.selectionDidChange() - self.warningMessage = nil - } - - - override func viewWillDisappear() { - - super.viewWillDisappear() - - self.endEditing() - self.saveSetting() - } - - - - // MARK: Table View Data Source - - func numberOfRows(in tableView: NSTableView) -> Int { - - self.snippets.count - } - - - func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any? { - - guard let identifier = tableColumn?.identifier else { return nil } - - let snippet = self.snippets[row] - - switch identifier { - case .scope: - return snippet.scope - case .name: - return snippet.name - case .key: - return snippet.shortcut - default: - preconditionFailure() - } - } - - - /// Starts dragging. - func tableView(_ tableView: NSTableView, writeRowsWith rowIndexes: IndexSet, to pboard: NSPasteboard) -> Bool { - - // register dragged type - tableView.registerForDraggedTypes([.rows]) - pboard.declareTypes([.rows], owner: self) - - // store row index info to pasteboard - guard let rows = try? NSKeyedArchiver.archivedData(withRootObject: rowIndexes, requiringSecureCoding: true) else { return false } - - pboard.setData(rows, forType: .rows) - - return true - } - - - /// Validates when dragged items come into tableView. - func tableView(_ tableView: NSTableView, validateDrop info: any NSDraggingInfo, proposedRow row: Int, proposedDropOperation dropOperation: NSTableView.DropOperation) -> NSDragOperation { - - // accept only self drag-and-drop - guard info.draggingSource as? NSTableView == tableView else { return [] } - - if dropOperation == .on { - tableView.setDropRow(row, dropOperation: .above) - } - - return .move - } - - - /// Checks acceptability of dragged items and insert them to table. - func tableView(_ tableView: NSTableView, acceptDrop info: any NSDraggingInfo, row: Int, dropOperation: NSTableView.DropOperation) -> Bool { - - // accept only self drag-and-drop - guard info.draggingSource as? NSTableView == tableView else { return false } - - // obtain original rows from paste board - guard - let data = info.draggingPasteboard.data(forType: .rows), - let sourceRows = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSIndexSet.self, from: data) as IndexSet? - else { return false } - - // move - self.snippets.move(fromOffsets: sourceRows, toOffset: row) - tableView.moveRows(at: sourceRows, to: row) - - self.saveSetting() - - return true - } - - - // MARK: Table View Delegate - - func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? { - - guard - let identifier = tableColumn?.identifier, - let cellView = tableView.makeView(withIdentifier: identifier, owner: self) as? NSTableCellView - else { return nil } - - let snippet = self.snippets[row] - - switch identifier { - case .scope: - guard let menu = cellView.subviews.first as? NSPopUpButton else { assertionFailure(); return nil } - - // reset attributed string for "All" item - // -> Otherwise, the title isn't localized. - let allItem = menu.itemArray.first! - allItem.attributedTitle = NSAttributedString(string: allItem.title, attributes: allItem.attributedTitle!.attributes(at: 0, effectiveRange: nil)) - - // add syntaxes - for settingName in SyntaxManager.shared.settingNames { - menu.addItem(withTitle: settingName) - menu.lastItem!.representedObject = settingName - } - - // select item - if let scope = snippet.scope { - menu.selectItem(withTitle: scope) - } else { - if let emptyItem = menu.itemArray.first(where: { !$0.isSeparatorItem && $0.title.isEmpty }) { - menu.menu?.removeItem(emptyItem) - } - menu.selectItem(at: 0) - } - - default: - break - } - - return cellView - } - - - /// Invoked when the selection in the table did change. - func tableViewSelectionDidChange(_ notification: Notification) { - - self.selectionDidChange() - } - - - // MARK: Text View Delegate (format text view) - - /// Invoked when the insertion text did update. - func textDidEndEditing(_ notification: Notification) { - - guard - let textView = notification.object as? NSTextView, - let tableView = self.tableView, - tableView.selectedRowIndexes.count == 1 - else { return } - - self.snippets[tableView.selectedRow].format = textView.string - self.saveSetting() - } - - - // MARK: Actions - - @IBAction func addRemove(_ sender: NSSegmentedControl) { - - self.endEditing() - - guard let rows = self.tableView?.selectedRowIndexes else { return } - - switch sender.selectedSegment { - case 0: // add - let snippet = SnippetManager.shared.createUntitledSetting() - let row = rows.last.flatMap { $0 + 1 } ?? self.snippets.endIndex - self.snippets.insert(snippet, at: row) - self.tableView?.insertRows(at: [row], withAnimation: .effectGap) - - case 1: // remove - guard !rows.isEmpty else { return } - self.snippets.remove(in: rows) - self.tableView?.removeRows(at: rows, withAnimation: [.slideUp, .effectFade]) - - default: - preconditionFailure() - } - - self.saveSetting() - } - - - @IBAction func didSelectSyntax(_ sender: NSPopUpButton) { - - guard let tableView = self.tableView else { return assertionFailure() } - - let row = tableView.row(for: sender) - let column = tableView.column(for: sender) - - guard row >= 0, column >= 0 else { return } - - self.snippets[row].scope = sender.selectedItem?.representedObject as? String - self.saveSetting() - tableView.reloadData(forRowIndexes: [row], columnIndexes: [column]) - } - - - @IBAction func didEditName(_ sender: NSTextField) { - - guard let tableView = self.tableView else { return assertionFailure() } - - let row = tableView.row(for: sender) - let column = tableView.column(for: sender) - - guard row >= 0, column >= 0 else { return } - - // successfully update data - self.snippets[row].name = sender.stringValue - self.saveSetting() - tableView.reloadData(forRowIndexes: [row], columnIndexes: [column]) - } - - - /// Validates and applies the new shortcut key input. - @IBAction func didEditShortcut(_ sender: ShortcutField) { - - guard let tableView = self.tableView else { return assertionFailure() } - - let row = tableView.row(for: sender) - let column = tableView.column(for: sender) - - let oldShortcut = self.snippets[row].shortcut - let shortcut = sender.objectValue as? Shortcut - - // reset once warning - self.warningMessage = nil - - // not edited - guard shortcut != oldShortcut else { return } - - if let shortcut { - do { - try shortcut.checkCustomizationAvailability() - - } catch { - self.warningMessage = error.localizedDescription - sender.objectValue = oldShortcut // reset text field - NSSound.beep() - - // make text field edit mode again - Task { - tableView.editColumn(column, row: row, with: nil, select: true) - } - return - } - } - - // successfully update data - self.snippets[row].shortcut = shortcut - self.saveSetting() - tableView.reloadData(forRowIndexes: [row], columnIndexes: [column]) - } - - - - // MARK: Private Methods - - /// Saves current setting. - private func saveSetting() { - - SnippetManager.shared.save(self.snippets) - } - - - /// Updates controls according to the state of selection in the table view. - private func selectionDidChange() { - - guard - let tableView = self.tableView, - let textView = self.formatTextView - else { return assertionFailure() } - - if tableView.selectedRowIndexes.count == 1 { - textView.isEditable = true - textView.textColor = .textColor - textView.string = self.snippets[tableView.selectedRow].format - } else { - textView.isEditable = false - textView.textColor = .disabledControlTextColor - textView.string = String(localized: "Select a snippet to edit.", table: "SnippetsSettings", comment: "placeholder for insertion format field") - } - - self.addRemoveButton?.setEnabled(!tableView.selectedRowIndexes.isEmpty, forSegment: 1) - } -} - - -private extension NSTableView { - - /// Moves the specified rows to the new row location using animation. - /// - /// - Parameters: - /// - oldIndexes: Initial row indexes. - /// - newIndex: Row index to insert all specified rows. - func moveRows(at oldIndexes: IndexSet, to newIndex: Int) { - - var oldOffset = 0 - var newOffset = 0 - - self.beginUpdates() - for oldIndex in oldIndexes { - if oldIndex < newIndex { - self.moveRow(at: oldIndex + oldOffset, to: newIndex - 1) - oldOffset -= 1 - } else { - self.moveRow(at: oldIndex, to: newIndex + newOffset) - newOffset += 1 - } - } - self.endUpdates() - } -} diff --git a/CotEditor/Sources/SplitViewController.swift b/CotEditor/Sources/SplitViewController.swift deleted file mode 100644 index eb896af42..000000000 --- a/CotEditor/Sources/SplitViewController.swift +++ /dev/null @@ -1,145 +0,0 @@ -// -// SplitViewController.swift -// -// CotEditor -// https://coteditor.com -// -// Created by nakamuxu on 2006-03-26. -// -// --------------------------------------------------------------------------- -// -// © 2004-2007 nakamuxu -// © 2014-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import AppKit -import Combine - -final class SplitViewController: NSSplitViewController { - - // MARK: Public Properties - - private(set) weak var focusedChild: EditorViewController? - - @Published private(set) var canCloseSplitItem = false - - - // MARK: Private Properties - - private var focusedEditorObserver: AnyCancellable? - - - - // MARK: Split View Controller Methods - - override func viewDidLoad() { - - super.viewDidLoad() - - self.splitView.isVertical = UserDefaults.standard[.splitViewVertical] - - // observe focus change - self.focusedEditorObserver = NotificationCenter.default.publisher(for: EditorTextView.didBecomeFirstResponderNotification) - .map { $0.object as! EditorTextView } - .compactMap { [weak self] textView in - self?.children.lazy - .compactMap { $0 as? EditorViewController } - .first { $0.textView == textView } - } - .sink { [weak self] in self?.focusedChild = $0 } - } - - - override func insertSplitViewItem(_ splitViewItem: NSSplitViewItem, at index: Int) { - - super.insertSplitViewItem(splitViewItem, at: index) - - self.canCloseSplitItem = self.splitViewItems.count > 1 - } - - - override func removeChild(at index: Int) { - - super.removeChild(at: index) - - self.canCloseSplitItem = self.splitViewItems.count > 1 - } - - - override func validateUserInterfaceItem(_ item: any NSValidatedUserInterfaceItem) -> Bool { - - switch item.action { - case #selector(toggleSplitOrientation): - (item as? NSMenuItem)?.title = self.splitView.isVertical - ? String(localized: "Stack Editors Horizontally", table: "MainMenu") - : String(localized: "Stack Editors Vertically", table: "MainMenu") - - case #selector(focusNextSplitTextView), #selector(focusPrevSplitTextView): - return self.splitViewItems.count > 1 - - default: break - } - - return super.validateUserInterfaceItem(item) - } - - - - // MARK: Action Messages - - /// Toggles divider orientation. - @IBAction func toggleSplitOrientation(_ sender: Any?) { - - self.splitView.isVertical.toggle() - - UserDefaults.standard[.splitViewVertical] = self.splitView.isVertical - } - - - /// Moves focus to the next text view. - @IBAction func focusNextSplitTextView(_ sender: Any?) { - - self.focusSplitTextView(onNext: true) - } - - - /// Moves focus to the previous text view. - @IBAction func focusPrevSplitTextView(_ sender: Any?) { - - self.focusSplitTextView(onNext: false) - } - - - - // MARK: Private Methods - - /// Moves focus to the next/previous text view. - /// - /// - Parameter onNext: Move to the next if `true`, otherwise previous. - private func focusSplitTextView(onNext: Bool) { - - let children = self.splitViewItems.compactMap { $0.viewController as? EditorViewController } - - guard children.count > 1 else { return } - guard let focusedChild = self.focusedChild, - let focusIndex = children.firstIndex(of: focusedChild), - let nextChild = onNext - ? children[safe: focusIndex + 1] ?? children.first - : children[safe: focusIndex - 1] ?? children.last - else { return assertionFailure() } - - self.view.window?.makeFirstResponder(nextChild.textView) - } -} diff --git a/CotEditor/Sources/StatusBar.swift b/CotEditor/Sources/StatusBar.swift index 008dc504d..f629cd736 100644 --- a/CotEditor/Sources/StatusBar.swift +++ b/CotEditor/Sources/StatusBar.swift @@ -24,7 +24,10 @@ // import SwiftUI +import Observation import Combine +import Defaults +import FileEncoding final class StatusBarController: NSHostingController { @@ -45,9 +48,9 @@ final class StatusBarController: NSHostingController { } - override func viewDidAppear() { + override func viewWillAppear() { - super.viewDidAppear() + super.viewWillAppear() self.model.onAppear() } @@ -64,9 +67,11 @@ final class StatusBarController: NSHostingController { private extension StatusBar.Model { - @MainActor func onAppear() { + func onAppear() { - self.observeDocument() + self.isActive = true + + self.invalidateObservation(document: self.document) // observe changes in defaults let editorDefaultKeys: [DefaultKey] = [ @@ -80,44 +85,41 @@ private extension StatusBar.Model { let publishers = editorDefaultKeys.map { UserDefaults.standard.publisher(for: $0) } self.defaultsObserver = Publishers.MergeMany(publishers) .map { _ in UserDefaults.standard.statusBarEditorInfo } - .sink { [weak self] in self?.document?.analyzer.statusBarRequirements = $0 } + .sink { [weak self] in self?.document?.counter.statusBarRequirements = $0 } } - @MainActor func onDisappear() { + func onDisappear() { + + self.isActive = false self.defaultsObserver = nil self.documentObservers.removeAll() - self.document?.analyzer.statusBarRequirements = [] + self.document?.counter.statusBarRequirements = [] } - @MainActor private func observeDocument() { + private func invalidateObservation(document: Document?) { - guard let document else { + self.document?.counter.statusBarRequirements = [] + self.countResult = document?.counter.result + + if let document, self.isActive { + document.counter.statusBarRequirements = UserDefaults.standard.statusBarEditorInfo + + self.documentObservers = [ + document.$fileEncoding + .receive(on: DispatchQueue.main) + .sink { [weak self] in self?.fileEncoding = $0 }, + document.$lineEnding + .receive(on: DispatchQueue.main) + .sink { [weak self] in self?.lineEnding = $0 }, + ] + } else { self.documentObservers.removeAll() - return + self.fileEncoding = nil + self.lineEnding = nil } - - document.analyzer.statusBarRequirements = UserDefaults.standard.statusBarEditorInfo - - self.documentObservers = [ - document.analyzer.$result - .removeDuplicates() - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.countResult = $0 }, - document.$fileAttributes - .map { $0?.size } - .removeDuplicates() - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.fileSize = $0 }, - document.$fileEncoding - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.fileEncoding = $0 }, - document.$lineEnding - .receive(on: DispatchQueue.main) - .sink { [weak self] in self?.lineEnding = $0 }, - ] } } @@ -143,16 +145,16 @@ private extension UserDefaults { struct StatusBar: View { - final class Model: ObservableObject { + @MainActor @Observable final class Model { - @MainActor var document: Document? { didSet { Task { @MainActor in self.observeDocument() } } } + private(set) var document: Document? - @Published var fileEncoding: FileEncoding = .utf8 - @Published var lineEnding: LineEnding = .lf + var countResult: EditorCounter.Result? - @Published fileprivate(set) var countResult: EditorCounter.Result = .init() - @Published fileprivate(set) var fileSize: Int64? + var fileEncoding: FileEncoding? + var lineEnding: LineEnding? + private var isActive: Bool = false private var defaultsObserver: AnyCancellable? private var documentObservers: Set = [] @@ -161,73 +163,93 @@ struct StatusBar: View { self.document = document } + + + func updateDocument(to document: Document?) { + + self.invalidateObservation(document: document) + self.document = document + } } - @ObservedObject var model: Model + @State var model: Model - @State private(set) var fileEncodings: [FileEncoding?] = [] + @AppStorage(.donationBadgeType) private var badgeType - @State private var isAcknowledgementPresented = false + @State private var encodingManager: EncodingManager = .shared + @State private var hasDonated: Bool = false var body: some View { HStack { - EditorCountView(result: self.model.countResult) + if self.hasDonated, self.badgeType != .invisible { + CoffeeBadge(type: self.badgeType) + .transition(.symbolEffect) + } + if let result = self.model.countResult { + EditorCountView(result: result) + } Spacer() - if let fileSize = self.model.fileSize { - Text(fileSize, format: .byteCount(style: .file, spellsOutZero: false)) - .monospacedDigit() - .help(String(localized: "File size", table: "Document", comment: "tooltip")) - } else { - Text(verbatim: "–") - .foregroundStyle(.tertiary) + if let document = self.model.document { + if let fileSize = document.fileAttributes?.size { + Text(fileSize, format: .byteCount(style: .file, spellsOutZero: false)) + .monospacedDigit() + .help(String(localized: "File size", table: "Document", comment: "tooltip")) + } else { + Text(verbatim: "–") + .foregroundStyle(.tertiary) + } } HStack(spacing: 2) { - Divider() - .padding(.vertical, 4) - - Picker(selection: $model.fileEncoding) { - if !self.fileEncodings.contains(self.model.fileEncoding) { - Text(self.model.fileEncoding.localizedName).tag(self.model.fileEncoding) - } - Section(String(localized: "Text Encoding", table: "Document", comment: "menu item header")) { - ForEach(Array(self.fileEncodings.enumerated()), id: \.offset) { (_, fileEncoding) in - if let fileEncoding { - Text(fileEncoding.localizedName).tag(fileEncoding) - } else { - Divider() + if let fileEncoding = self.model.fileEncoding { + Divider() + .padding(.vertical, 4) + + Picker(selection: $model.fileEncoding ?? .utf8) { + if !self.encodingManager.fileEncodings.contains(fileEncoding) { + Text(fileEncoding.localizedName).tag(fileEncoding) + } + Section(String(localized: "Text Encoding", table: "Document", comment: "menu item header")) { + ForEach(Array(self.encodingManager.fileEncodings.enumerated()), id: \.offset) { (_, fileEncoding) in + if let fileEncoding { + Text(fileEncoding.localizedName).tag(fileEncoding) + } else { + Divider() + } } } + } label: { + EmptyView() } - } label: { - EmptyView() + .onChange(of: fileEncoding) { (_, newValue) in + self.model.document?.askChangingEncoding(to: newValue) + } + .help(String(localized: "Text Encoding", table: "Document")) + .accessibilityLabel(String(localized: "Text Encoding", table: "Document")) } - .onChange(of: self.model.fileEncoding) { newValue in - self.model.document?.askChangingEncoding(to: newValue) - } - .help(String(localized: "Text Encoding", table: "Document")) - .accessibilityLabel(String(localized: "Text Encoding", table: "Document")) - Divider() - .padding(.vertical, 4) - - LineEndingPicker(String(localized: "Line Endings", table: "Document", comment: "menu item header"), - selection: $model.lineEnding) - .onChange(of: self.model.lineEnding) { newValue in - self.model.document?.changeLineEnding(to: newValue) + if let lineEnding = self.model.lineEnding { + Divider() + .padding(.vertical, 4) + + LineEndingPicker(String(localized: "Line Endings", table: "Document", comment: "menu item header"), + selection: $model.lineEnding ?? .lf) + .onChange(of: lineEnding) { (_, newValue) in + self.model.document?.changeLineEnding(to: newValue) + } + .help(String(localized: "Line Endings", table: "Document")) + .accessibilityLabel(String(localized: "Line Endings", table: "Document", comment: "menu item header")) + .frame(width: 48) } - .help(String(localized: "Line Endings", table: "Document")) - .accessibilityLabel(String(localized: "Line Endings", table: "Document", comment: "menu item header")) - .frame(width: 48) } } - .onReceive(EncodingManager.shared.$fileEncodings.receive(on: RunLoop.main)) { encodings in - self.fileEncodings = encodings + .subscriptionStatusTask(for: Donation.groupID) { taskState in + self.hasDonated = taskState.value?.map(\.state).contains(.subscribed) == true } .accessibilityElement(children: .contain) .accessibilityLabel(String(localized: "Status Bar", table: "Document", comment: "accessibility label")) @@ -235,7 +257,7 @@ struct StatusBar: View { .controlSize(.small) .padding(.leading, 10) .frame(height: 21) - .background(.thinMaterial) // .windowBackground on macOS 14 + .background(.windowBackground) } } @@ -308,9 +330,8 @@ private extension AttributedString { /// - Returns: An attributed string. init(_ label: String, value: String?) { - self = Self(label, attributes: .init().foregroundColor(.secondary)) - + Self(value ?? "–", attributes: .init() - .foregroundColor((value == nil) ? NSColor.disabledControlTextColor : .labelColor)) + self = Self(label, attributes: AttributeContainer.foregroundColor(.secondary)) + + Self(value ?? "–", attributes: AttributeContainer.foregroundColor((value == nil) ? .disabledControlTextColor : .labelColor)) } } @@ -390,12 +411,43 @@ private struct LineEndingPicker: NSViewRepresentable { } +private struct CoffeeBadge: View { + + var type: BadgeType + + @State private var isMessagePresented = false + + + var body: some View { + + Button { + self.isMessagePresented.toggle() + } label: { + Label { + Text(self.type.label) + } icon: { + Image(systemName: self.type.symbolName) + } + + } + .fontWeight(.semibold) + .labelStyle(.iconOnly) + .popover(isPresented: $isMessagePresented) { + Text("Thank you for your kind support!", tableName: "Document", comment: "message for users who made a donation") + .padding(.vertical, 8) + .padding(.horizontal) + } + } +} + // MARK: - Preview #Preview { let model = StatusBar.Model() - model.countResult.characters = .init(entire: 1024, selected: 64) + let result = EditorCounter.Result() + result.characters = .init(entire: 1024, selected: 64) + model.countResult = result - return StatusBar(model: model) + return StatusBar(model: StatusBar.Model()) } diff --git a/CotEditor/Sources/StepperNumberField.swift b/CotEditor/Sources/StepperNumberField.swift index e3392965a..82002d9dc 100644 --- a/CotEditor/Sources/StepperNumberField.swift +++ b/CotEditor/Sources/StepperNumberField.swift @@ -57,10 +57,10 @@ struct StepperNumberField: View { var body: some View { HStack(spacing: 4) { - TextField(text: $value.string(in: self.bounds, defaultValue: self.defaultValue), prompt: self.prompt, label: EmptyView.init) - .monospacedDigit() - .environment(\.layoutDirection, .rightToLeft) - .frame(width: self.fieldWidth) + TextField(value: $value, format: .ranged(self.bounds), prompt: self.prompt, label: EmptyView.init) + .monospacedDigit() + .environment(\.layoutDirection, .rightToLeft) + .frame(width: self.fieldWidth) Stepper(value: $value, in: self.bounds, step: self.step, label: EmptyView.init) } @@ -94,25 +94,11 @@ struct StepperNumberField: View { -@available(macOS, deprecated: 14, message: "Simply bind with `format: .ranged(self.bounds)`.") -private extension Binding where Value == Int { - - /// Workarounds the issue on macOS 13 that Stepper cannot share its bound value with another controllers. - func string(in bounds: ClosedRange, defaultValue: Value? = nil) -> Binding { - - Binding( - get: { self.wrappedValue.formatted(.number) }, - set: { self.wrappedValue = ((try? Value($0, format: .number)) ?? defaultValue ?? 0).clamped(to: bounds) } - ) - } -} - - - // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var value = 4 + @Previewable @State var value = 4 return StepperNumberField(value: $value, in: 0...10) } diff --git a/CotEditor/Sources/String+Commenting.swift b/CotEditor/Sources/String+Commenting.swift new file mode 100644 index 000000000..946cf8cee --- /dev/null +++ b/CotEditor/Sources/String+Commenting.swift @@ -0,0 +1,211 @@ +// +// String+Commenting.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-06-16. +// +// --------------------------------------------------------------------------- +// +// © 2014-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +extension String { + + /// Comments out the selections by appending comment delimiters. + /// + /// - Parameters: + /// - types: The type of commenting-out. When, `.both`, inline-style takes priority over block-style. + /// - fromLineHead: When `true`, the receiver comments out from the beginning of the line. + func commentOut(types: CommentTypes, delimiters: Syntax.Comment, fromLineHead: Bool, in selectedRanges: [NSRange]) -> EditingContext? { + + guard !delimiters.isEmpty else { return nil } + + let items: [NSRange.InsertionItem] = { + let targetRanges = selectedRanges + .map { fromLineHead ? self.lineContentsRange(for: $0) : $0 } + .uniqued + + if types.contains(.inline), let delimiter = delimiters.inline { + return self.inlineCommentOut(delimiter: delimiter, ranges: targetRanges) + } + if types.contains(.block), let delimiters = delimiters.block { + return self.blockCommentOut(delimiters: delimiters, ranges: targetRanges) + } + return [] + }() + + guard !items.isEmpty else { return nil } + + let newStrings = items.map(\.string) + let replacementRanges = items.map { NSRange(location: $0.location, length: 0) } + let newSelectedRanges = selectedRanges.map { $0.inserted(items: items) } + + return EditingContext(strings: newStrings, ranges: replacementRanges, selectedRanges: newSelectedRanges) + } + + + /// Uncomments the selections by removing comment delimiters. + func uncomment(delimiters: Syntax.Comment, in selectedRanges: [NSRange]) -> EditingContext? { + + guard !delimiters.isEmpty else { return nil } + + let deletionRanges: [NSRange] = { + if let delimiters = delimiters.block { + let targetRanges = selectedRanges.map { $0.isEmpty ? self.lineContentsRange(for: $0) : $0 }.uniqued + if let ranges = self.rangesOfBlockDelimiters(delimiters, ranges: targetRanges) { + return ranges + } + } + if let delimiter = delimiters.inline { + let targetRanges = selectedRanges.map { self.lineContentsRange(for: $0) }.uniqued + if let ranges = self.rangesOfInlineDelimiter(delimiter, ranges: targetRanges) { + return ranges + } + } + return [] + }() + + guard !deletionRanges.isEmpty else { return nil } + + let newStrings = [String](repeating: "", count: deletionRanges.count) + let newSelectedRanges = selectedRanges.map { $0.removed(ranges: deletionRanges) } + + return EditingContext(strings: newStrings, ranges: deletionRanges, selectedRanges: newSelectedRanges) + } + + + /// Returns whether the selected ranges can be uncommented. + /// + /// - Parameter partly: When `true`, the method returns `true` when a part of selections is commented-out, + /// otherwise only when the entire selections can be commented out. + /// - Returns: `true` when selection can be uncommented. + func canUncomment(partly: Bool, delimiters: Syntax.Comment, in selectedRanges: [NSRange]) -> Bool { + + guard !delimiters.isEmpty else { return false } + + let targetRanges = selectedRanges + .map(self.lineContentsRange(for:)) + .filter({ !$0.isEmpty }) + .uniqued + + guard !targetRanges.isEmpty else { return false } + + if let delimiters = delimiters.block, + let ranges = self.rangesOfBlockDelimiters(delimiters, ranges: targetRanges) + { + return partly ? true : (ranges.count == (2 * targetRanges.count)) + } + + if let delimiter = delimiters.inline, + let ranges = self.rangesOfInlineDelimiter(delimiter, ranges: targetRanges) + { + let lineRanges = targetRanges.flatMap { self.lineContentsRanges(for: $0) }.uniqued + return partly ? true : (ranges.count == lineRanges.count) + } + + return false + } +} + + +extension String { + + /// Returns the editing information to comment out the given `ranges` by appending inline-style comment delimiters. + /// + /// - Parameters: + /// - delimiter: The inline comment delimiter to insert. + /// - ranges: The ranges where to comment out. + /// - Returns: Items that contain editing information to insert comment delimiters. + func inlineCommentOut(delimiter: String, ranges: [NSRange]) -> [NSRange.InsertionItem] { + + let regex = try! NSRegularExpression(pattern: "^", options: [.anchorsMatchLines]) + + return ranges.flatMap { regex.matches(in: self, range: $0) } + .map(\.range.location) + .uniqued + .map { NSRange.InsertionItem(string: delimiter, location: $0, forward: true) } + } + + + /// Returns the editing information to comment out the given `ranges` by appending block-style comment delimiters. + /// + /// - Parameters: + /// - delimiters: The pair of block comment delimiters to insert. + /// - ranges: The ranges where to comment out. + /// - Returns: Items that contain editing information to insert comment delimiters. + func blockCommentOut(delimiters: Pair, ranges: [NSRange]) -> [NSRange.InsertionItem] { + + ranges.flatMap { + [NSRange.InsertionItem(string: delimiters.begin, location: $0.lowerBound, forward: true), + NSRange.InsertionItem(string: delimiters.end, location: $0.upperBound, forward: false)] + } + } + + + /// Finds inline-style delimiters in `ranges`. + /// + /// - Parameters: + /// - delimiter: The inline delimiter to find. + /// - ranges: The ranges where to find. + /// - Returns: Ranges where delimiters are, or `nil` when no delimiters was found. + func rangesOfInlineDelimiter(_ delimiter: String, ranges: [NSRange]) -> [NSRange]? { + + let ranges = ranges.filter { !$0.isEmpty } + + guard !ranges.isEmpty, !self.isEmpty else { return [] } + + let delimiterPattern = NSRegularExpression.escapedPattern(for: delimiter) + let pattern = "^[ \t]*(\(delimiterPattern))" + let regex = try! NSRegularExpression(pattern: pattern, options: [.anchorsMatchLines]) + + let delimiterRanges = ranges + .flatMap { regex.matches(in: self, range: $0) } + .map { $0.range(at: 1) } + .uniqued + + return delimiterRanges.isEmpty ? nil : delimiterRanges + } + + + /// Finds block-style delimiters in `ranges`. + /// + /// - Note: This method matches a block only when one of the given `ranges` fits exactly. + /// + /// - Parameters: + /// - delimiters: The pair of block delimiters to find. + /// - ranges: The ranges where to find. + /// - Returns: Ranges where delimiters are, or `nil` when no delimiters was found. + func rangesOfBlockDelimiters(_ delimiters: Pair, ranges: [NSRange]) -> [NSRange]? { + + let ranges = ranges.filter { !$0.isEmpty } + + guard !ranges.isEmpty, !self.isEmpty else { return [] } + + let beginPattern = NSRegularExpression.escapedPattern(for: delimiters.begin) + let endPattern = NSRegularExpression.escapedPattern(for: delimiters.end) + let pattern = "\\A[ \t]*(\(beginPattern)).*?(\(endPattern))[ \t]*\\Z" + let regex = try! NSRegularExpression(pattern: pattern, options: [.dotMatchesLineSeparators]) + + let delimiterRanges = ranges + .flatMap { regex.matches(in: self, range: $0) } + .flatMap { [$0.range(at: 1), $0.range(at: 2)] } + + return delimiterRanges.isEmpty ? nil : delimiterRanges + } +} diff --git a/CotEditor/Sources/String+Constants.swift b/CotEditor/Sources/String+Constants.swift index 65278525e..63ae0e98b 100644 --- a/CotEditor/Sources/String+Constants.swift +++ b/CotEditor/Sources/String+Constants.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2022 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,8 +25,6 @@ extension String { - static let thinSpace = "\u{2009}" - /// Constant string representing a separator. static let separator = "-" } diff --git a/CotEditor/Sources/String+Counting.swift b/CotEditor/Sources/String+Counting.swift index 0b4b4d574..2725b88b3 100644 --- a/CotEditor/Sources/String+Counting.swift +++ b/CotEditor/Sources/String+Counting.swift @@ -24,6 +24,7 @@ // import Foundation +import UnicodeNormalization extension StringProtocol { @@ -176,9 +177,7 @@ extension String { struct CharacterCountOptions { - enum CharacterUnit: String, CaseIterable, DefaultInitializable { - - static let defaultValue: Self = .graphemeCluster + enum CharacterUnit: String, Sendable, CaseIterable { case graphemeCluster case unicodeScalar diff --git a/CotEditor/Sources/String+Escaping.swift b/CotEditor/Sources/String+Escaping.swift new file mode 100644 index 000000000..c8829c611 --- /dev/null +++ b/CotEditor/Sources/String+Escaping.swift @@ -0,0 +1,78 @@ +// +// String+Escaping.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-06-16. +// +// --------------------------------------------------------------------------- +// +// © 2016-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +extension String { + + /// Unescaped version of the string by unescaping the characters with backslashes. + var unescaped: String { + + // -> According to the Swift documentation, these are the all combinations with backslash. + // cf. https://docs.swift.org/swift-book/LanguageGuide/StringsAndCharacters.html#ID295 + let entities = [ + #"0"#: "\0", // null character + #"t"#: "\t", // horizontal tab + #"n"#: "\n", // line feed + #"r"#: "\r", // carriage return + #"""#: "\"", // double quotation mark + #"'"#: "\'", // single quotation mark + #"\"#: "\\", // backslash + ] + + return self.replacing(/\\([0tnr"'\\])/) { entities[String($0.1)]! } + } +} + + +private let maxEscapesCheckLength = 8 + +extension StringProtocol { + + /// Checks if character at the index is escaped with backslash. + /// + /// - Parameter index: The index of the character to check. + /// - Returns: `true` when the character at the given index is escaped. + func isCharacterEscaped(at index: Index) -> Bool { + + let escapes = self[.. Bool { + + let escape = 0x005C + let index = UTF16View.Index(utf16Offset: location, in: self) + let escapes = self.utf16[.. { + + /// Creates a unique name from the receiver's elements by adding the suffix and also a number if needed. + /// + /// - Parameters: + /// - proposedName: The name candidate. + /// - suffix: The name suffix to be appended before the number. + /// - Returns: An unique name. + func createAvailableName(for proposedName: String, suffix: String? = nil) -> String { + + let spaceSuffix = suffix.flatMap { " " + $0 } ?? "" + + let (rootName, baseCount): (String, Int?) = { + let suffixPattern = NSRegularExpression.escapedPattern(for: spaceSuffix) + let regex = try! NSRegularExpression(pattern: suffixPattern + "(?: ([0-9]+))?$") + + guard let result = regex.firstMatch(in: proposedName, range: proposedName.nsRange) else { return (proposedName, nil) } + + let root = (proposedName as NSString).substring(to: result.range.location) + let numberRange = result.range(at: 1) + + guard !numberRange.isNotFound else { return (root, nil) } + + let number = Int((proposedName as NSString).substring(with: numberRange)) + + return (root, number) + }() + + let baseName = rootName + spaceSuffix + + guard baseCount != nil || self.contains(baseName) else { return baseName } + + return ((baseCount ?? 2)...).lazy + .map { baseName + " " + String($0) } + .first { !self.contains($0) }! + } +} diff --git a/CotEditor/Sources/String+FullwidthTransform.swift b/CotEditor/Sources/String+FullwidthTransform.swift index 6fdbfe938..37abce5d8 100644 --- a/CotEditor/Sources/String+FullwidthTransform.swift +++ b/CotEditor/Sources/String+FullwidthTransform.swift @@ -25,8 +25,6 @@ extension StringProtocol { - // MARK: Public Properties - /// Transforms half-width roman characters to full-width forms, or vice versa. /// /// - Parameter reverse: `True` to transform from full-width to half-width. diff --git a/CotEditor/Sources/String+Indentation.swift b/CotEditor/Sources/String+Indentation.swift index 41f34209a..e821dd96e 100644 --- a/CotEditor/Sources/String+Indentation.swift +++ b/CotEditor/Sources/String+Indentation.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2023 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -39,6 +39,115 @@ private enum DetectionLines { } +extension String { + + /// Increases indent level in. + func indent(style: IndentStyle, indentWidth: Int, in selectedRanges: [NSRange]) -> EditingContext { + + assert(indentWidth > 0) + + // get indent target + let string = self as NSString + + // create indent string to prepend + let indent = switch style { + case .tab: "\t" + case .space: String(repeating: " ", count: indentWidth) + } + let indentLength = indent.length + + // create shifted string + let lineRanges = string.lineRanges(for: selectedRanges, includingLastEmptyLine: true) + let newLines = lineRanges.map { indent + string.substring(with: $0) } + + // calculate new selection range + let newSelectedRanges = selectedRanges.map { selectedRange -> NSRange in + let shift = lineRanges.countPrefix { $0.location <= selectedRange.location } + let lineCount = lineRanges.count { selectedRange.intersects($0) } + let lengthDiff = max(lineCount - 1, 0) * indentLength + + return NSRange(location: selectedRange.location + shift * indentLength, + length: selectedRange.length + lengthDiff) + } + + return EditingContext(strings: newLines, ranges: lineRanges, selectedRanges: newSelectedRanges) + } + + + /// Decreases indent level. + func outdent(style: IndentStyle, indentWidth: Int, in selectedRanges: [NSRange]) -> EditingContext? { + + assert(indentWidth > 0) + + // get indent target + let string = self as NSString + + // find ranges to remove + let lineRanges = string.lineRanges(for: selectedRanges) + let lines = lineRanges.map { string.substring(with: $0) } + let dropCounts = lines.map { line -> Int in + switch line.first { + case "\t": 1 + case " ": line.prefix(indentWidth).countPrefix { $0 == " " } + default: 0 + } + } + + // cancel if nothing to shift + guard dropCounts.contains(where: { $0 > 0 }) else { return nil } + + // create shifted string + let newLines = zip(lines, dropCounts).map { String($0.dropFirst($1)) } + + // calculate new selection range + let droppedRanges: [NSRange] = zip(lineRanges, dropCounts) + .filter { $1 > 0 } + .map { NSRange(location: $0.location, length: $1) } + let newSelectedRanges = selectedRanges.map { selectedRange -> NSRange in + let offset = droppedRanges + .prefix { $0.location < selectedRange.location } + .map { (selectedRange.intersection($0) ?? $0).length } + .reduce(0, +) + let lengthDiff = droppedRanges + .compactMap { selectedRange.intersection($0)?.length } + .reduce(0, +) + + return NSRange(location: selectedRange.location - offset, + length: selectedRange.length - lengthDiff) + } + + return EditingContext(strings: newLines, ranges: lineRanges, selectedRanges: newSelectedRanges) + } + + + /// Standardizes indentation of given ranges. + func convertIndentation(to style: IndentStyle, indentWidth: Int, in selectedRanges: [NSRange]) -> EditingContext? { + + guard !self.isEmpty else { return nil } + + let string = self as NSString + + // process whole document if no text selected + let ranges = selectedRanges.contains(where: { !$0.isEmpty }) ? [string.range] : selectedRanges + + var replacementRanges: [NSRange] = [] + var replacementStrings: [String] = [] + + for range in ranges { + let selectedString = string.substring(with: range) + let convertedString = selectedString.standardizingIndent(to: style, tabWidth: indentWidth) + + guard convertedString != selectedString else { continue } // no need to convert + + replacementRanges.append(range) + replacementStrings.append(convertedString) + } + + return EditingContext(strings: replacementStrings, ranges: replacementRanges) + } +} + + extension String { // MARK: Public Methods diff --git a/CotEditor/Sources/String+LineProcessing.swift b/CotEditor/Sources/String+LineProcessing.swift new file mode 100644 index 000000000..fdb08267e --- /dev/null +++ b/CotEditor/Sources/String+LineProcessing.swift @@ -0,0 +1,334 @@ +// +// String+LineProcessing.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-06-16. +// +// --------------------------------------------------------------------------- +// +// © 2014-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +extension String { + + /// Moves selected line up. + func moveLineUp(in ranges: [NSRange]) -> EditingContext? { + + // get line ranges to process + let lineRanges = (self as NSString).lineRanges(for: ranges, includingLastEmptyLine: true) + + // cannot perform Move Line Up if one of the selections is already in the first line + guard !lineRanges.isEmpty, lineRanges.first!.lowerBound != 0 else { return nil } + + var string = self as NSString + var replacementRange = NSRange() + var selectedRanges: [NSRange] = [] + + // swap lines + for lineRange in lineRanges { + let upperLineRange = string.lineRange(at: lineRange.location - 1) + var lineString = string.substring(with: lineRange) + var upperLineString = string.substring(with: upperLineRange) + + // last line + if lineString.last?.isNewline != true, let lineEnding = upperLineString.popLast() { + lineString.append(lineEnding) + } + + // swap + let editRange = lineRange.union(upperLineRange) + string = string.replacingCharacters(in: editRange, with: lineString + upperLineString) as NSString + replacementRange.formUnion(editRange) + + // move selected ranges in the line to move + for selectedRange in ranges { + if let intersectionRange = selectedRange.intersection(editRange) { + selectedRanges.append(intersectionRange.shifted(by: -upperLineRange.length)) + + } else if editRange.touches(selectedRange.location) { + selectedRanges.append(selectedRange.shifted(by: -upperLineRange.length)) + } + } + } + selectedRanges = selectedRanges.uniqued.sorted(\.location) + + let replacementString = string.substring(with: replacementRange) + + return EditingContext(strings: [replacementString], ranges: [replacementRange], selectedRanges: selectedRanges) + } + + + /// Moves selected line down. + func moveLineDown(in ranges: [NSRange]) -> EditingContext? { + + // get line ranges to process + let lineRanges = (self as NSString).lineRanges(for: ranges) + + // cannot perform Move Line Down if one of the selections is already in the last line + guard !lineRanges.isEmpty, (lineRanges.last!.upperBound != self.length || self.last?.isNewline == true) else { return nil } + + var string = self as NSString + var replacementRange = NSRange() + var selectedRanges: [NSRange] = [] + + // swap lines + for lineRange in lineRanges.reversed() { + let lowerLineRange = string.lineRange(at: lineRange.upperBound) + var lineString = string.substring(with: lineRange) + var lowerLineString = string.substring(with: lowerLineRange) + + // last line + if lowerLineString.last?.isNewline != true, let lineEnding = lineString.popLast() { + lowerLineString.append(lineEnding) + } + + // swap + let editRange = lineRange.union(lowerLineRange) + string = string.replacingCharacters(in: editRange, with: lowerLineString + lineString) as NSString + replacementRange.formUnion(editRange) + + // move selected ranges in the line to move + for selectedRange in ranges { + if let intersectionRange = selectedRange.intersection(editRange) { + let offset = (lineString.last?.isNewline == true) + ? lowerLineRange.length + : lowerLineRange.length + lowerLineString.last!.utf16.count + selectedRanges.append(intersectionRange.shifted(by: offset)) + + } else if editRange.touches(selectedRange.location) { + selectedRanges.append(selectedRange.shifted(by: lowerLineRange.length)) + } + } + } + selectedRanges = selectedRanges.uniqued.sorted(\.location) + + let replacementString = string.substring(with: replacementRange) + + return EditingContext(strings: [replacementString], ranges: [replacementRange], selectedRanges: selectedRanges) + } + + + /// Deletes duplicate lines in selection. + func deleteDuplicateLine(in ranges: [NSRange]) -> EditingContext? { + + let string = self as NSString + let lineContentRanges = ranges + .map { string.lineRange(for: $0) } + .flatMap { self.lineContentsRanges(for: $0) } + .uniqued + .sorted(\.location) + + var replacementRanges: [NSRange] = [] + var uniqueLines: [String] = [] + for lineContentRange in lineContentRanges { + let line = string.substring(with: lineContentRange) + + if uniqueLines.contains(line) { + replacementRanges.append(string.lineRange(for: lineContentRange)) + } else { + uniqueLines.append(line) + } + } + + guard !replacementRanges.isEmpty else { return nil } + + let replacementStrings = [String](repeating: "", count: replacementRanges.count) + + return EditingContext(strings: replacementStrings, ranges: replacementRanges) + } + + + /// Duplicates selected lines below. + func duplicateLine(in ranges: [NSRange], lineEnding: Character) -> EditingContext? { + + let string = self as NSString + var replacementStrings: [String] = [] + var replacementRanges: [NSRange] = [] + var selectedRanges: [NSRange] = [] + + // group the ranges sharing the same lines + let rangeGroups: [[NSRange]] = ranges.sorted(\.location) + .reduce(into: []) { (groups, range) in + if let last = groups.last?.last, + string.lineRange(for: last).intersects(string.lineRange(for: range)) + { + groups[groups.endIndex - 1].append(range) + } else { + groups.append([range]) + } + } + + var offset = 0 + for group in rangeGroups { + let unionRange = group.reduce(into: group[0]) { $0.formUnion($1) } + let lineRange = string.lineRange(for: unionRange) + let replacementRange = NSRange(location: lineRange.location, length: 0) + var lineString = string.substring(with: lineRange) + + // add line break if it's the last line + if lineString.last?.isNewline != true { + lineString.append(lineEnding) + } + + replacementStrings.append(lineString) + replacementRanges.append(replacementRange) + + offset += lineString.length + for range in group { + selectedRanges.append(range.shifted(by: offset)) + } + } + + return EditingContext(strings: replacementStrings, ranges: replacementRanges, selectedRanges: selectedRanges) + } + + + /// Removes selected lines. + func deleteLine(in ranges: [NSRange]) -> EditingContext? { + + guard !ranges.isEmpty else { return nil } + + let lineRanges = (self as NSString).lineRanges(for: ranges) + let replacementStrings = [String](repeating: "", count: lineRanges.count) + + var selectedRanges: [NSRange] = [] + var offset = 0 + for range in lineRanges { + selectedRanges.append(NSRange(location: range.location + offset, length: 0)) + offset -= range.length + } + selectedRanges = selectedRanges.uniqued.sorted(\.location) + + return EditingContext(strings: replacementStrings, ranges: lineRanges, selectedRanges: selectedRanges) + } + + + /// Joins lines in the ranges by replacing continuous whitespaces with a space. + func joinLines(in ranges: [NSRange]) -> EditingContext { + + let replacementStrings = ranges + .map { (self as NSString).substring(with: $0) } + .map { $0.replacing(/\s*\R\s*/, with: " ") } + var selectedRanges: [NSRange] = [] + var offset = 0 + for (range, replacementString) in zip(ranges, replacementStrings) { + selectedRanges.append(NSRange(location: range.location + offset, length: replacementString.length)) + offset += replacementString.length - range.length + } + + return EditingContext(strings: replacementStrings, ranges: ranges, selectedRanges: selectedRanges) + } + + + /// Joins each of lines containing the given ranges with the subsequent line by replacing continuous whitespaces with a space. + func joinLines(after ranges: [NSRange]) -> EditingContext { + + let lineRanges = (self as NSString).lineRanges(for: ranges) + let replacementRanges = lineRanges + .map { (self as NSString).range(of: #"\s*\R\s*"#, options: .regularExpression, range: NSRange($0.lowerBound.. EditingContext? { + + self.sortLines(in: range) { $0.sorted(options: [.localized, .caseInsensitive]) } + } + + + /// Reverses selected lines. + func reverseLines(in range: NSRange) -> EditingContext? { + + self.sortLines(in: range) { $0.reversed() } + } + + + /// Shuffles selected lines. + func shuffleLines(in range: NSRange) -> EditingContext? { + + self.sortLines(in: range) { $0.shuffled() } + } + + + // MARK: Private Methods + + /// Sorts lines in the range using the given predicate. + /// + /// - Parameters: + /// - range: The range where sort lines. + /// - predicate: The way to sort lines. + /// - Returns: The editing info. + private func sortLines(in range: NSRange, predicate: ([String]) -> [String]) -> EditingContext? { + + let string = self as NSString + let lineEndingRange = string.range(of: "\\R", options: .regularExpression, range: range) + + // do nothing with single line + guard !lineEndingRange.isNotFound else { return nil } + + let lineEnding = string.substring(with: lineEndingRange) + let lineRange = string.lineContentsRange(for: range) + let lines = string + .substring(with: lineRange) + .components(separatedBy: .newlines) + let newString = predicate(lines) + .joined(separator: lineEnding) + + return EditingContext(strings: [newString], ranges: [lineRange], selectedRanges: [lineRange]) + } +} + + +extension String { + + /// Trims all trailing whitespace with/without keeping editing point. + func trimTrailingWhitespace(ignoringEmptyLines: Bool, keepingEditingPoint: Bool = false, in editingRanges: [NSRange]) -> EditingContext? { + + let whitespaceRanges = self.rangesOfTrailingWhitespace(ignoringEmptyLines: ignoringEmptyLines) + + guard !whitespaceRanges.isEmpty else { return nil } + + let trimmingRanges: [NSRange] = keepingEditingPoint + ? whitespaceRanges.filter { range in editingRanges.allSatisfy { !$0.touches(range) } } + : whitespaceRanges + + guard !trimmingRanges.isEmpty else { return nil } + + let replacementStrings = [String](repeating: "", count: trimmingRanges.count) + let selectedRanges = editingRanges.map { $0.removed(ranges: trimmingRanges) } + + return EditingContext(strings: replacementStrings, ranges: trimmingRanges, selectedRanges: selectedRanges) + } + + + func rangesOfTrailingWhitespace(ignoringEmptyLines: Bool) -> [NSRange] { + + let pattern = ignoringEmptyLines ? "(? According to the Swift documentation, these are the all combinations with backslash. - // cf. https://docs.swift.org/swift-book/LanguageGuide/StringsAndCharacters.html#ID295 - let entities = [ - #"0"#: "\0", // null character - #"t"#: "\t", // horizontal tab - #"n"#: "\n", // line feed - #"r"#: "\r", // carriage return - #"""#: "\"", // double quotation mark - #"'"#: "\'", // single quotation mark - #"\"#: "\\", // backslash - ] - - return self.replacing(/\\([0tnr"'\\])/) { entities[String($0.1)]! } - } - - /// The first appeared line ending character. var firstLineEnding: Character? { @@ -134,18 +106,6 @@ extension StringProtocol { return contentsEnd } - - - /// Checks if character at the index is escaped with backslash. - /// - /// - Parameter index: The index of the character to check. - /// - Returns: `true` when the character at the given index is escaped. - func isCharacterEscaped(at index: Index) -> Bool { - - let escapes = self[.. Bool { - - let escape = 0x005C - let index = UTF16View.Index(utf16Offset: location, in: self) - let escapes = self.utf16[..: Identifiable, Sendable { + + enum State { + + case noFilter + case filtered([Range]) + } + + var value: Value + var state: State + var string: String + + var id: Value.ID { self.value.id } + + + /// Attributed string of which matched parts are styled as `.inlinePresentationIntent = .stronglyEmphasized`. + var attributedString: AttributedString { + + var attributedString = AttributedString(self.string) + + switch self.state { + case .noFilter: + return attributedString + + case .filtered(let ranges): + for range in ranges { + guard let attrRange = Range(range, in: attributedString) else { continue } + + attributedString[attrRange].inlinePresentationIntent = .stronglyEmphasized + } + + return attributedString + } + } +} + + +extension Identifiable where Self: Sendable { + + /// Filters with given string. + /// + /// - Parameters: + /// - filter: The search string. + /// - keyPath: The key path to value to filter. + /// - Returns: A FilteredItem when matched or not filtered, otherwise `nil`. + func filter(_ filter: String, keyPath: KeyPath) -> FilteredItem? { + + if filter.isEmpty { + FilteredItem(value: self, state: .noFilter, string: self[keyPath: keyPath]) + } else if let ranges = self[keyPath: keyPath].abbreviatedMatchedRanges(with: filter) { + FilteredItem(value: self, state: .filtered(ranges), string: self[keyPath: keyPath]) + } else { + nil + } + } +} + + extension String { struct AbbreviatedMatchResult { @@ -39,18 +99,7 @@ extension String { /// - Returns: The matched character ranges and score, or `nil` if not matched. func abbreviatedMatch(with searchString: String) -> AbbreviatedMatchResult? { - guard !searchString.isEmpty, !self.isEmpty else { return nil } - - var ranges: [Range] = [] - for character in searchString { - let index = ranges.last?.upperBound ?? self.startIndex - - guard let range = self.range(of: String(character), options: .caseInsensitive, range: index.. [Range]? { + + guard !searchString.isEmpty, !self.isEmpty else { return nil } + + var ranges: [Range] = [] + for character in searchString { + let index = ranges.last?.upperBound ?? self.startIndex + + guard let range = self.range(of: String(character), options: .caseInsensitive, range: index.. Void private let cancelAction: () -> Void - @State private var buttonWidth: CGFloat? - // MARK: View @@ -52,22 +50,80 @@ struct SubmitButtonGroup: View { var body: some View { - HStack { + EqualWidthHStack { Button(role: .cancel, action: self.cancelAction) { Text(String(localized: "Cancel")) - .background(SizeGetter(key: MaxSizeKey.self)) - .frame(width: self.buttonWidth) - }.keyboardShortcut(.cancelAction) - .environment(\.isEnabled, true) // Cancel button is always active + .frame(maxWidth: .infinity) + } + .keyboardShortcut(.cancelAction) + .environment(\.isEnabled, true) // Cancel button is always active Button(action: self.submitAction) { Text(self.submitLabel) - .background(SizeGetter(key: MaxSizeKey.self)) - .frame(width: self.buttonWidth) - }.keyboardShortcut(.defaultAction) + .frame(maxWidth: .infinity) + } + .keyboardShortcut(.defaultAction) + } + } +} + + +/// cf. [Compose custom layouts with SwiftUI](https://developer.apple.com/wwdc22/10056) +private struct EqualWidthHStack: Layout { + + func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize { + + guard !subviews.isEmpty else { return .zero } + + let maxSize = self.maxSize(subviews: subviews) + let spacing = self.spacing(subviews: subviews) + let totalSpacing = spacing.reduce(0) { $0 + $1 } + + return CGSize(width: maxSize.width * CGFloat(subviews.count) + totalSpacing, + height: maxSize.height) + } + + + func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) { + + guard !subviews.isEmpty else { return } + + let maxSize = self.maxSize(subviews: subviews) + let spacing = self.spacing(subviews: subviews) + + let placementProposal = ProposedViewSize(width: maxSize.width, height: maxSize.height) + var x = bounds.minX + maxSize.width / 2 + + for index in subviews.indices { + subviews[index] + .place(at: CGPoint(x: x, y: bounds.midY), + anchor: .center, + proposal: placementProposal) + + x += maxSize.width + spacing[index] + } + } + + + private func maxSize(subviews: Subviews) -> CGSize { + + let subviewSizes = subviews.map { $0.sizeThatFits(.unspecified) } + let maxSize: CGSize = subviewSizes.reduce(.zero) { currentMax, subviewSize in + CGSize(width: max(currentMax.width, subviewSize.width), + height: max(currentMax.height, subviewSize.height)) + } + + return maxSize + } + + private func spacing(subviews: Subviews) -> [CGFloat] { + subviews.indices.map { index in + + guard index < subviews.count - 1 else { return 0 } + + return subviews[index].spacing + .distance(to: subviews[index + 1].spacing, along: .horizontal) } - .onPreferenceChange(MaxSizeKey.self) { self.buttonWidth = $0.width } - .fixedSize() } } @@ -76,5 +132,9 @@ struct SubmitButtonGroup: View { // MARK: - Preview #Preview { - SubmitButtonGroup(action: {}, cancelAction: {}) + VStack { + SubmitButtonGroup(action: {}, cancelAction: {}) + } + .padding() + .frame(width: 200) } diff --git a/CotEditor/Sources/Syntax.swift b/CotEditor/Sources/Syntax.swift index abd8c0a6a..c4712b0d2 100644 --- a/CotEditor/Sources/Syntax.swift +++ b/CotEditor/Sources/Syntax.swift @@ -100,6 +100,11 @@ struct Syntax: Equatable { if let begin = self.blockBegin, let end = self.blockEnd { Pair(begin, end) } else { nil } } + + var isEmpty: Bool { + + self.block == nil && self.inline == nil + } } diff --git a/CotEditor/Sources/SyntaxCommentEditView.swift b/CotEditor/Sources/SyntaxCommentEditView.swift index 661934850..e5ecc91fd 100644 --- a/CotEditor/Sources/SyntaxCommentEditView.swift +++ b/CotEditor/Sources/SyntaxCommentEditView.swift @@ -82,9 +82,10 @@ private struct CommentDelimitersEditView: View { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var comment = SyntaxObject.Comment() - @State var highlights: [SyntaxObject.Highlight] = [] + @Previewable @State var comment = SyntaxObject.Comment() + @Previewable @State var highlights: [SyntaxObject.Highlight] = [] return SyntaxCommentEditView(comment: $comment, highlights: $highlights) .padding() diff --git a/CotEditor/Sources/SyntaxCompletionEditView.swift b/CotEditor/Sources/SyntaxCompletionEditView.swift index 9ef6d9015..a228eed59 100644 --- a/CotEditor/Sources/SyntaxCompletionEditView.swift +++ b/CotEditor/Sources/SyntaxCompletionEditView.swift @@ -33,6 +33,7 @@ struct SyntaxCompletionEditView: View { @Binding var items: [Item] @State private var selection: Set = [] + @State private var sortOrder: [KeyPathComparator] = [] @FocusState private var focusedField: Item.ID? @@ -46,21 +47,25 @@ struct SyntaxCompletionEditView: View { // create a table with wrapped values and then find the editable item again in each column // to avoid taking time when leaving a pane with a large number of items. (2024-02-25 macOS 14) - Table(self.items, selection: $selection) { - TableColumn(String(localized: "Completion", table: "SyntaxEditor", comment: "table column header")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + Table(self.items, selection: $selection, sortOrder: $sortOrder) { + TableColumn(String(localized: "Completion", table: "SyntaxEditor", comment: "table column header"), value: \.string) { wrappedItem in + if let item = $items[id: wrappedItem.id] { TextField(text: item.string, label: EmptyView.init) .focused($focusedField, equals: item.id) + } } } + .onChange(of: self.sortOrder) { (_, newValue) in + self.items.sort(using: newValue) + } .tableStyle(.bordered) .border(Color(nsColor: .gridColor)) HStack { - AddRemoveButton($items, selection: $selection, focus: $focusedField) + AddRemoveButton($items, selection: $selection, focus: $focusedField, newItem: Item.init) Spacer() - HelpButton(anchor: "syntax_highlight_settings") + HelpLink(anchor: "syntax_highlight_settings") } } } @@ -70,8 +75,9 @@ struct SyntaxCompletionEditView: View { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var items: [SyntaxObject.KeyString] = [.init(string: "abc")] + @Previewable @State var items: [SyntaxObject.KeyString] = [.init(string: "abc")] return SyntaxCompletionEditView(items: $items) .padding() diff --git a/CotEditor/Sources/SyntaxEditView.swift b/CotEditor/Sources/SyntaxEditView.swift index 6850368f1..e5972cdf1 100644 --- a/CotEditor/Sources/SyntaxEditView.swift +++ b/CotEditor/Sources/SyntaxEditView.swift @@ -56,7 +56,7 @@ struct SyntaxEditView: View { } - @StateObject var syntax: SyntaxObject + @State var syntax: SyntaxObject var originalName: String? var isBundled: Bool = false let saveAction: SaveAction @@ -64,7 +64,7 @@ struct SyntaxEditView: View { weak var parent: NSHostingController? - @MainActor private static var viewSize = CGSize(width: 680, height: 525) + private static var viewSize = CGSize(width: 680, height: 525) @State private var name: String = "" @State private var message: String? @@ -79,7 +79,7 @@ struct SyntaxEditView: View { init(syntax: Syntax? = nil, originalName: String? = nil, isBundled: Bool = false, saveAction: @escaping SaveAction) { - self._syntax = StateObject(wrappedValue: SyntaxObject(value: syntax)) + self._syntax = State(wrappedValue: SyntaxObject(value: syntax)) self.originalName = originalName self.isBundled = isBundled self.saveAction = saveAction @@ -111,14 +111,12 @@ struct SyntaxEditView: View { VStack(spacing: 16) { HStack(alignment: .firstTextBaseline) { if self.columnVisibility == .detailOnly { - Button { + Button(String(localized: "Show Sidebar", table: "SyntaxEditor"), systemImage: "sidebar.leading") { withAnimation { self.columnVisibility = .all } - } label: { - Image(systemName: "sidebar.leading") - .accessibilityLabel(String(localized: "Show Sidebar", table: "SyntaxEditor")) } + .labelStyle(.iconOnly) .buttonStyle(.borderless) } @@ -131,7 +129,7 @@ struct SyntaxEditView: View { .focused($isNameFieldFocused) .fontWeight(.medium) .frame(minWidth: 80, maxWidth: 160) - .onChange(of: self.name) { newValue in + .onChange(of: self.name) { (_, newValue) in self.validate(name: newValue) } } @@ -175,13 +173,15 @@ struct SyntaxEditView: View { .onAppear { self.name = self.originalName ?? "" } - .onChange(of: self.pane) { _ in + .onChange(of: self.pane) { self.errors = self.syntax.validate() } .alert(error: $error) .background { // store last view size GeometryReader { geometry in - Color.clear.onChange(of: geometry.size) { Self.viewSize = $0 } + Color.clear.onChange(of: geometry.size) { (_, newValue) in + Self.viewSize = newValue + } } } .frame(idealWidth: Self.viewSize.width, minHeight: 525, idealHeight: Self.viewSize.height) @@ -228,7 +228,7 @@ struct SyntaxEditView: View { // MARK: Private Methods /// Submits the syntax if it is valid. - @MainActor private func submit() { + private func submit() { // syntax name validation self.name = self.name.trimmingCharacters(in: .whitespacesAndNewlines) @@ -257,7 +257,7 @@ struct SyntaxEditView: View { /// Restores the current settings in editor to the user default. - @MainActor private func restore() { + private func restore() { guard self.isBundled, diff --git a/CotEditor/Sources/SyntaxFileMappingEditView.swift b/CotEditor/Sources/SyntaxFileMappingEditView.swift index 5ae62dfc1..4aae89017 100644 --- a/CotEditor/Sources/SyntaxFileMappingEditView.swift +++ b/CotEditor/Sources/SyntaxFileMappingEditView.swift @@ -64,7 +64,7 @@ struct SyntaxFileMappingEditView: View { Spacer() HStack { Spacer() - HelpButton(anchor: "syntax_file_mapping") + HelpLink(anchor: "syntax_file_mapping") } } } @@ -78,7 +78,7 @@ struct SyntaxFileMappingEditView: View { @Binding var items: [Item] - let label: () -> (Label) + let label: () -> Label @State private var selection: Set = [] @FocusState private var focusedField: Item.ID? @@ -108,10 +108,11 @@ struct SyntaxFileMappingEditView: View { } } } - .listStyle(.bordered(alternatesRowBackgrounds: true)) + .listStyle(.bordered) + .alternatingRowBackgrounds() .border(Color(nsColor: .gridColor)) - AddRemoveButton($items, selection: $selection, focus: $focusedField) + AddRemoveButton($items, selection: $selection, focus: $focusedField, newItem: Item.init) }.accessibilityElement(children: .contain) } } @@ -121,10 +122,11 @@ struct SyntaxFileMappingEditView: View { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var extensions: [SyntaxObject.KeyString] = [.init(string: "abc")] - @State var filenames: [SyntaxObject.KeyString] = [] - @State var interpreters: [SyntaxObject.KeyString] = [] + @Previewable @State var extensions: [SyntaxObject.KeyString] = [.init(string: "abc")] + @Previewable @State var filenames: [SyntaxObject.KeyString] = [] + @Previewable @State var interpreters: [SyntaxObject.KeyString] = [] return SyntaxFileMappingEditView(extensions: $extensions, filenames: $filenames, diff --git a/CotEditor/Sources/SyntaxHighlightEditView.swift b/CotEditor/Sources/SyntaxHighlightEditView.swift index 472293a94..c22d4d17e 100644 --- a/CotEditor/Sources/SyntaxHighlightEditView.swift +++ b/CotEditor/Sources/SyntaxHighlightEditView.swift @@ -34,6 +34,7 @@ struct SyntaxHighlightEditView: View { var helpAnchor: String = "syntax_highlight_settings" @State private var selection: Set = [] + @State private var sortOrder: [KeyPathComparator] = [] @FocusState private var focusedField: Item.ID? @@ -44,39 +45,41 @@ struct SyntaxHighlightEditView: View { VStack(alignment: .leading) { // create a table with wrapped values and then find the editable item again in each column // to avoid taking time when leaving a pane with a large number of items. (2024-02-25 macOS 14) - Table(self.items, selection: $selection) { - TableColumn(String(localized: "RE", table: "SyntaxEditor", comment: "table column header (RE for Regular Expression)")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + Table(self.items, selection: $selection, sortOrder: $sortOrder) { + TableColumn(String(localized: "RE", table: "SyntaxEditor", comment: "table column header (RE for Regular Expression)"), value: \.isRegularExpression) { wrappedItem in + if let item = $items[id: wrappedItem.id] { Toggle(isOn: item.isRegularExpression, label: EmptyView.init) .help(String(localized: "Regular Expression", table: "SyntaxEditor", comment: "tooltip for RE checkbox")) - .onChange(of: item.isRegularExpression.wrappedValue) { newValue in + .onChange(of: item.isRegularExpression.wrappedValue) { (_, newValue) in guard self.selection.contains(item.id) else { return } $items .filter(with: self.selection) .filter { $0.id != item.id } .forEach { $0.isRegularExpression.wrappedValue = newValue } } - .frame(maxWidth: .infinity, alignment: .center) } - }.width(20) + } + .width(24) + .alignment(.center) - TableColumn(String(localized: "IC", table: "SyntaxEditor", comment: "table column header (IC for Ignore Case)")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + TableColumn(String(localized: "IC", table: "SyntaxEditor", comment: "table column header (IC for Ignore Case)"), value: \.ignoreCase) { wrappedItem in + if let item = $items[id: wrappedItem.id] { Toggle(isOn: item.ignoreCase, label: EmptyView.init) .help(String(localized: "Ignore Case", table: "SyntaxEditor", comment: "tooltip for IC checkbox")) - .onChange(of: item.ignoreCase.wrappedValue) { newValue in + .onChange(of: item.ignoreCase.wrappedValue) { (_, newValue) in guard self.selection.contains(item.id) else { return } $items .filter(with: self.selection) .filter { $0.id != item.id } .forEach { $0.ignoreCase.wrappedValue = newValue } } - .frame(maxWidth: .infinity, alignment: .center) } - }.width(20) + } + .width(24) + .alignment(.center) - TableColumn(String(localized: "Begin String", table: "SyntaxEditor", comment: "table column header")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + TableColumn(String(localized: "Begin String", table: "SyntaxEditor", comment: "table column header"), value: \.begin) { wrappedItem in + if let item = $items[id: wrappedItem.id] { RegexTextField(text: item.begin, showsError: true, showsInvisible: true) .regexHighlighted(item.isRegularExpression.wrappedValue) .style(.table) @@ -84,27 +87,30 @@ struct SyntaxHighlightEditView: View { } } - TableColumn(String(localized: "End String", table: "SyntaxEditor", comment: "table column header")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + TableColumn(String(localized: "End String", table: "SyntaxEditor", comment: "table column header"), sortUsing: KeyPathComparator(\.end)) { wrappedItem in + if let item = $items[id: wrappedItem.id] { RegexTextField(text: item.end ?? "", showsError: true, showsInvisible: true) .regexHighlighted(item.isRegularExpression.wrappedValue) .style(.table) } } - TableColumn(String(localized: "Description", table: "SyntaxEditor", comment: "table column header")) { wrappedItem in - if let item = $items.first(where: { $0.id == wrappedItem.id }) { + TableColumn(String(localized: "Description", table: "SyntaxEditor", comment: "table column header"), sortUsing: KeyPathComparator(\.description)) { wrappedItem in + if let item = $items[id: wrappedItem.id] { TextField(text: item.description ?? "", label: EmptyView.init) } } } + .onChange(of: self.sortOrder) { (_, newValue) in + self.items.sort(using: newValue) + } .tableStyle(.bordered) .border(Color(nsColor: .gridColor)) HStack { - AddRemoveButton($items, selection: $selection, focus: $focusedField) + AddRemoveButton($items, selection: $selection, focus: $focusedField, newItem: Item.init) Spacer() - HelpButton(anchor: self.helpAnchor) + HelpLink(anchor: self.helpAnchor) } } } @@ -114,8 +120,9 @@ struct SyntaxHighlightEditView: View { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var items: [SyntaxObject.Highlight] = [ + @Previewable @State var items: [SyntaxObject.Highlight] = [ .init(begin: "(inu)", end: "(dog)"), .init(begin: "[Cc]at", end: "$0", isRegularExpression: true, description: "note"), .init(begin: "[]", isRegularExpression: true, ignoreCase: true), diff --git a/CotEditor/Sources/SyntaxListViewController.swift b/CotEditor/Sources/SyntaxListViewController.swift index b1bc811d3..b24e14b78 100644 --- a/CotEditor/Sources/SyntaxListViewController.swift +++ b/CotEditor/Sources/SyntaxListViewController.swift @@ -29,6 +29,7 @@ import AudioToolbox import Combine import SwiftUI import UniformTypeIdentifiers +import Defaults final class SyntaxListViewController: NSViewController, NSMenuItemValidation, NSTableViewDelegate, NSTableViewDataSource, NSFilePromiseProviderDelegate { diff --git a/CotEditor/Sources/SyntaxManager.swift b/CotEditor/Sources/SyntaxManager.swift index 095c40434..862913c5e 100644 --- a/CotEditor/Sources/SyntaxManager.swift +++ b/CotEditor/Sources/SyntaxManager.swift @@ -29,6 +29,7 @@ import Combine import AppKit.NSMenuItem import UniformTypeIdentifiers import Yams +import Defaults import SyntaxMap @MainActor @objc protocol SyntaxChanging: AnyObject { diff --git a/CotEditor/Sources/SyntaxMappingConflictView.swift b/CotEditor/Sources/SyntaxMappingConflictView.swift index 891f51647..54d7f31a8 100644 --- a/CotEditor/Sources/SyntaxMappingConflictView.swift +++ b/CotEditor/Sources/SyntaxMappingConflictView.swift @@ -83,7 +83,7 @@ struct SyntaxMappingConflictView: View { } HStack { - HelpButton(anchor: "syntax_file_mapping") + HelpLink(anchor: "syntax_file_mapping") Spacer() Button("OK") { self.parent?.dismiss(nil) @@ -124,11 +124,11 @@ private struct ConflictTable: View { TableColumn(String(localized: "Used syntax", table: "SyntaxMappingConflict", comment: "table column header"), value: \.primarySyntax) { Text($0.primarySyntax).fontWeight(.semibold) } - TableColumn(String(localized: "Duplicated syntaxes", table: "SyntaxMappingConflict", comment: "table column header")) { + TableColumn(String(localized: "Duplicated syntaxes", table: "SyntaxMappingConflict", comment: "table column header"), sortUsing: KeyPathComparator(\.duplicatedSyntaxes.first)) { Text($0.duplicatedSyntaxes, format: .list(type: .and, width: .narrow)) } } - .onChange(of: self.sortOrder) { newValue in + .onChange(of: self.sortOrder) { (_, newValue) in self.conflicts.sort(using: newValue) } .tableStyle(.bordered) diff --git a/CotEditor/Sources/SyntaxMetadataEditView.swift b/CotEditor/Sources/SyntaxMetadataEditView.swift index 84a39c083..03cc0cd39 100644 --- a/CotEditor/Sources/SyntaxMetadataEditView.swift +++ b/CotEditor/Sources/SyntaxMetadataEditView.swift @@ -47,6 +47,7 @@ struct SyntaxMetadataEditView: View { .foregroundStyle(.secondary) .padding(.trailing, 4) } + .textContentType(.URL) } TextField(String(localized: "Author:", table: "SyntaxEditor", comment: "label"), text: $metadata.author ?? "") @@ -59,7 +60,7 @@ struct SyntaxMetadataEditView: View { Spacer() HStack { Spacer() - HelpButton(anchor: "syntax_metadata_settings") + HelpLink(anchor: "syntax_metadata_settings") } } } diff --git a/CotEditor/Sources/SyntaxObject+Validation.swift b/CotEditor/Sources/SyntaxObject+Validation.swift index 4d06e040f..62a24f2ed 100644 --- a/CotEditor/Sources/SyntaxObject+Validation.swift +++ b/CotEditor/Sources/SyntaxObject+Validation.swift @@ -39,7 +39,7 @@ extension SyntaxObject { var code: Code - var type: PartialKeyPath + nonisolated(unsafe) var type: PartialKeyPath var string: String diff --git a/CotEditor/Sources/SyntaxObject.swift b/CotEditor/Sources/SyntaxObject.swift index 8dcb86eda..f2ae8c49b 100644 --- a/CotEditor/Sources/SyntaxObject.swift +++ b/CotEditor/Sources/SyntaxObject.swift @@ -24,69 +24,39 @@ // import Foundation +import Observation -final class SyntaxObject: ObservableObject { +@Observable final class SyntaxObject { + typealias Highlight = SyntaxObjectHighlight + typealias Outline = SyntaxObjectOutline + typealias KeyString = SyntaxObjectKeyString typealias Comment = Syntax.Comment typealias Metadata = Syntax.Metadata - struct Highlight: Identifiable, EmptyInitializable { - - let id = UUID() - - var begin: String = "" - var end: String? - var isRegularExpression: Bool = false - var ignoreCase: Bool = false - var description: String? - } + var kind: Syntax.Kind = .general + var keywords: [Highlight] = [] + var commands: [Highlight] = [] + var types: [Highlight] = [] + var attributes: [Highlight] = [] + var variables: [Highlight] = [] + var values: [Highlight] = [] + var numbers: [Highlight] = [] + var strings: [Highlight] = [] + var characters: [Highlight] = [] + var comments: [Highlight] = [] - struct Outline: Identifiable, EmptyInitializable { - - let id = UUID() - - var pattern: String = "" - var template: String = "" - var ignoreCase: Bool = false - var bold: Bool = false - var italic: Bool = false - var underline: Bool = false - var description: String? - } + var commentDelimiters: Comment = Comment() + var outlines: [Outline] = [] + var completions: [KeyString] = [] + var filenames: [KeyString] = [] + var extensions: [KeyString] = [] + var interpreters: [KeyString] = [] - struct KeyString: Identifiable, EmptyInitializable { - - let id = UUID() - - var string: String = "" - } - - - @Published var kind: Syntax.Kind = .general - - @Published var keywords: [Highlight] = [] - @Published var commands: [Highlight] = [] - @Published var types: [Highlight] = [] - @Published var attributes: [Highlight] = [] - @Published var variables: [Highlight] = [] - @Published var values: [Highlight] = [] - @Published var numbers: [Highlight] = [] - @Published var strings: [Highlight] = [] - @Published var characters: [Highlight] = [] - @Published var comments: [Highlight] = [] - - @Published var commentDelimiters: Comment = Comment() - @Published var outlines: [Outline] = [] - @Published var completions: [KeyString] = [] - - @Published var filenames: [KeyString] = [] - @Published var extensions: [KeyString] = [] - @Published var interpreters: [KeyString] = [] - - @Published var metadata: Metadata = Metadata() + var metadata: Metadata = Metadata() static func highlightKeyPath(for type: SyntaxType) -> WritableKeyPath { @@ -107,6 +77,40 @@ final class SyntaxObject: ObservableObject { } +struct SyntaxObjectHighlight: Identifiable { + + let id = UUID() + + var begin: String = "" + var end: String? + var isRegularExpression: Bool = false + var ignoreCase: Bool = false + var description: String? +} + + +struct SyntaxObjectOutline: Identifiable { + + let id = UUID() + + var pattern: String = "" + var template: String = "" + var ignoreCase: Bool = false + var bold: Bool = false + var italic: Bool = false + var underline: Bool = false + var description: String? +} + + +struct SyntaxObjectKeyString: Identifiable { + + let id = UUID() + + var string: String = "" +} + + // MARK: Definition Conversion @@ -178,7 +182,7 @@ extension SyntaxObject { } -extension SyntaxObject.Highlight { +extension SyntaxObjectHighlight { typealias Value = Syntax.Highlight @@ -203,7 +207,7 @@ extension SyntaxObject.Highlight { } -extension SyntaxObject.Outline { +extension SyntaxObjectOutline { typealias Value = Syntax.Outline @@ -232,7 +236,7 @@ extension SyntaxObject.Outline { } -extension SyntaxObject.KeyString { +extension SyntaxObjectKeyString { typealias Value = String @@ -249,7 +253,7 @@ extension SyntaxObject.KeyString { } -extension SyntaxObject.Highlight: Equatable { +extension SyntaxObjectHighlight: Equatable { static func == (lhs: Self, rhs: Self) -> Bool { diff --git a/CotEditor/Sources/SyntaxOutlineEditView.swift b/CotEditor/Sources/SyntaxOutlineEditView.swift index 1bb0f8db7..767d9d1d5 100644 --- a/CotEditor/Sources/SyntaxOutlineEditView.swift +++ b/CotEditor/Sources/SyntaxOutlineEditView.swift @@ -47,8 +47,9 @@ struct SyntaxOutlineEditView: View { TableColumn(String(localized: "IC", table: "SyntaxEditor", comment: "table column header (IC for Ignore Case)")) { item in Toggle(isOn: item.ignoreCase, label: EmptyView.init) .help(String(localized: "Ignore Case", table: "SyntaxEditor", comment: "tooltip for IC checkbox")) - .frame(maxWidth: .infinity, alignment: .center) - }.width(20) + } + .width(24) + .alignment(.center) TableColumn(String(localized: "Regular Expression Pattern", table: "SyntaxEditor", comment: "table column header")) { item in RegexTextField(text: item.pattern, showsError: true, showsInvisible: true) @@ -63,15 +64,13 @@ struct SyntaxOutlineEditView: View { .tableStyle(.bordered) .border(Color(nsColor: .gridColor)) - AddRemoveButton($items, selection: $selection, focus: $focusedField) + AddRemoveButton($items, selection: $selection, focus: $focusedField, newItem: Item.init) .padding(.bottom, 8) if self.selection.count > 1 { PatternView(outline: .constant(.init()), error: .multipleSelection) .disabled(true) - } else if let selection = self.selection.first, - let outline = $items.first(where: { $0.id == selection }) - { + } else if let outline = $items[id: self.selection.first] { PatternView(outline: outline) } else { PatternView(outline: .constant(.init()), error: .noSelection) @@ -80,7 +79,7 @@ struct SyntaxOutlineEditView: View { HStack { Spacer() - HelpButton(anchor: "syntax_outline_settings") + HelpLink(anchor: "syntax_outline_settings") } } } @@ -102,7 +101,7 @@ struct SyntaxOutlineEditView: View { .accessibilityLabeledPair(role: .label, id: "titlePattern", in: self.accessibility) Text("(Blank matches the whole string.)", tableName: "SyntaxEditor", comment: "label") .controlSize(.small) - .foregroundColor(.secondary) + .foregroundStyle(.secondary) } RegexTextField(text: $outline.template, mode: .replacement(unescapes: false), prompt: self.prompt) @@ -148,8 +147,9 @@ enum SelectionError: Error { // MARK: - Preview +@available(macOS 15, *) #Preview { - @State var items: [SyntaxObject.Outline] = [ + @Previewable @State var items: [SyntaxObject.Outline] = [ .init(pattern: "abc"), .init(pattern: "def", ignoreCase: true, italic: true), ] diff --git a/CotEditor/Sources/SyntaxParser.swift b/CotEditor/Sources/SyntaxParser.swift index bee79d5ef..b74ec7064 100644 --- a/CotEditor/Sources/SyntaxParser.swift +++ b/CotEditor/Sources/SyntaxParser.swift @@ -28,6 +28,7 @@ import Combine import Foundation import AppKit.NSTextStorage import OSLog +import Defaults extension NSAttributedString.Key { diff --git a/CotEditor/Sources/TextFinder.swift b/CotEditor/Sources/TextFinder.swift index a0cc8260d..a07d5b6ea 100644 --- a/CotEditor/Sources/TextFinder.swift +++ b/CotEditor/Sources/TextFinder.swift @@ -127,13 +127,15 @@ struct TextFindAllResult { case highlight = 103 case unhighlight = 104 case showMultipleReplaceInterface = 105 + case multipleReplace = 106 } // MARK: Public Properties - static let didFindNotification = Notification.Name("didFindNotification") - static let didFindAllNotification = Notification.Name("didFindAllNotification") + nonisolated static let didFindNotification = Notification.Name("didFindNotification") + nonisolated static let didFindAllNotification = Notification.Name("didFindAllNotification") + weak var client: NSTextView! @@ -190,7 +192,8 @@ struct TextFindAllResult { case .replaceAll, .replace, - .replaceAndFind: + .replaceAndFind, + .multipleReplace: self.client.isEditable case .highlight, @@ -211,7 +214,7 @@ struct TextFindAllResult { /// Performs the specified text finding action. /// /// - Parameter action: The text finding action. - func performAction(_ action: Action) { + func performAction(_ action: Action, representedItem: Any? = nil) { guard self.validateAction(action) else { return } @@ -262,6 +265,10 @@ struct TextFindAllResult { case .showMultipleReplaceInterface: MultipleReplacePanelController.shared.showWindow(nil) + + case .multipleReplace: + guard let name = representedItem as? String else { return assertionFailure() } + self.multiReplaceAll(name: name) } } @@ -363,6 +370,19 @@ struct TextFindAllResult { } + /// Performs multiple replacement with a specific replacement definition. + /// + /// - Parameter name: The name of the multiple replacement definition. + private func multiReplaceAll(name: String) { + + guard let definition = try? ReplacementManager.shared.setting(name: name) else { return assertionFailure() } + + Task { + try await self.client.replaceAll(definition, inSelection: TextFinderSettings.shared.inSelection) + } + } + + /// Sets the selected string to find field. private func setSearchString() { @@ -469,7 +489,7 @@ struct TextFindAllResult { if result.wrapped { client.enclosingScrollView?.superview?.showHUD(symbol: .wrap(flipped: !forward)) - client.requestAccessibilityAnnouncement(String(localized: "Search wrapped.", table: "TextFind", comment: "Announced when the search restarted from the beginning.")) + AccessibilityNotification.Announcement(String(localized: "Search wrapped.", table: "TextFind", comment: "Announced when the search restarted from the beginning.")).post() } } else if !isIncremental { client.enclosingScrollView?.superview?.showHUD(symbol: forward ? .reachBottom : .reachTop) @@ -650,7 +670,7 @@ struct TextFindAllResult { self.findResult = result NotificationCenter.default.post(name: TextFinder.didFindNotification, object: self) - self.client?.requestAccessibilityAnnouncement(result.message) + AccessibilityNotification.Announcement(result.message).post() } } diff --git a/CotEditor/Sources/TextFinderSettings.swift b/CotEditor/Sources/TextFinderSettings.swift index c1314170a..db570bf4e 100644 --- a/CotEditor/Sources/TextFinderSettings.swift +++ b/CotEditor/Sources/TextFinderSettings.swift @@ -25,6 +25,7 @@ import AppKit import Combine +import Defaults final class TextFinderSettings: NSObject { diff --git a/CotEditor/Sources/TextSelection.swift b/CotEditor/Sources/TextSelection.swift index 5134c4484..d6261baec 100644 --- a/CotEditor/Sources/TextSelection.swift +++ b/CotEditor/Sources/TextSelection.swift @@ -9,7 +9,7 @@ // --------------------------------------------------------------------------- // // © 2004-2007 nakamuxu -// © 2014-2023 1024jp +// © 2014-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ // import AppKit +import UnicodeNormalization private enum OSACaseType: FourCharCode { @@ -142,9 +143,14 @@ private enum OSAUnicodeNormalizationType: FourCharCode { @objc var range: [Int]? { get { - guard let range = self.textView?.selectedRange else { return nil } + guard + let textView = self.textView, + let string = self.textView?.string, + let range = Range(textView.selectedRange, in: string) + else { return nil } - return [range.location, range.length] + return [string.distance(from: string.startIndex, to: range.lowerBound), + string.distance(from: range.lowerBound, to: range.upperBound)] } set { diff --git a/CotEditor/Sources/Theme.swift b/CotEditor/Sources/Theme.swift index 1b3962c73..06efa5243 100644 --- a/CotEditor/Sources/Theme.swift +++ b/CotEditor/Sources/Theme.swift @@ -148,11 +148,7 @@ struct Theme: Equatable { /// Insertion point color to use. var effectiveInsertionPointColor: NSColor { - if #available(macOS 14, *) { - self.insertionPoint.usesSystemSetting ? .textInsertionPointColor : self.insertionPoint.color - } else { - self.insertionPoint.color - } + self.insertionPoint.usesSystemSetting ? .textInsertionPointColor : self.insertionPoint.color } @@ -192,18 +188,6 @@ struct Theme: Equatable { return NSColor(calibratedWhite: color.lightnessComponent, alpha: 1.0) } } - - - /// Returns the color for line highlight by considering the background opacity. - /// - /// - Parameter flag: `true` if the editor background to draw the highlight is opaque. - /// - Returns: A color. - func lineHighlightColor(forOpaqueBackground flag: Bool = true) -> NSColor { - - let color = self.lineHighlight.color - - return (flag || color.alphaComponent < 1) ? color : color.withAlphaComponent(0.7 * color.alphaComponent) - } } diff --git a/CotEditor/Sources/ThemeViewController.swift b/CotEditor/Sources/ThemeListViewController.swift similarity index 85% rename from CotEditor/Sources/ThemeViewController.swift rename to CotEditor/Sources/ThemeListViewController.swift index 5151049d0..e0e4ac1a4 100644 --- a/CotEditor/Sources/ThemeViewController.swift +++ b/CotEditor/Sources/ThemeListViewController.swift @@ -1,5 +1,5 @@ // -// ThemeViewController.swift +// ThemeListViewController.swift // // CotEditor // https://coteditor.com @@ -30,25 +30,40 @@ import Combine import SwiftUI import UniformTypeIdentifiers -final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTableViewDelegate, NSTableViewDataSource, NSFilePromiseProviderDelegate, NSTextFieldDelegate { +final class ThemeListViewController: NSViewController, NSMenuItemValidation, NSTableViewDelegate, NSTableViewDataSource, NSFilePromiseProviderDelegate, NSTextFieldDelegate { // MARK: Private Properties + @Binding private var selection: String + private var settingNames: [String] = [] @objc private dynamic var isBundled = false // bound to remove button - private var observers: Set = [] + private var observer: AnyCancellable? private lazy var filePromiseQueue = OperationQueue() @IBOutlet private weak var tableView: NSTableView? @IBOutlet private var actionButton: NSButton? @IBOutlet private var contextMenu: NSMenu? - @IBOutlet private var themeViewContainer: NSBox? // MARK: View Controller Methods + init?(coder: NSCoder, selection: Binding) { + + self._selection = selection + + super.init(coder: coder) + } + + + required init?(coder: NSCoder) { + + fatalError("init(coder:) has not been implemented") + } + + override func viewDidLoad() { super.viewDidLoad() @@ -57,8 +72,6 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable let receiverTypes = NSFilePromiseReceiver.readableDraggedTypes.map { NSPasteboard.PasteboardType($0) } self.tableView?.registerForDraggedTypes([.fileURL] + receiverTypes) self.tableView?.setDraggingSourceOperationMask(.copy, forLocal: false) - - self.settingNames = ThemeManager.shared.settingNames } @@ -66,27 +79,10 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable super.viewWillAppear() - self.observers = [ - ThemeManager.shared.$settingNames - .receive(on: RunLoop.main) - .sink { [weak self] _ in self?.updateList() }, - ThemeManager.shared.didUpdateSetting - .compactMap(\.new) - .receive(on: RunLoop.main) - .filter { [weak self] in $0 == self?.selectedSettingName } - .sink { [weak self] name in - guard let theme = try? ThemeManager.shared.setting(name: name) else { return } - - self?.setTheme(theme, name: name) - }, - UserDefaults.standard.publisher(for: .documentAppearance) - .sink { [weak self] _ in - let settingName = ThemeManager.shared.userDefaultSettingName - let row = self?.settingNames.firstIndex(of: settingName) ?? 0 - - self?.tableView?.selectRowIndexes([row], byExtendingSelection: false) - }, - ] + self.observer = ThemeManager.shared.$settingNames + .receive(on: RunLoop.main) + .sink { [weak self] _ in self?.updateList() } + self.tableView?.scrollToBeginningOfDocument(nil) } @@ -95,7 +91,16 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable super.viewDidDisappear() - self.observers.removeAll() + self.observer = nil + } + + + // MARK: Public Methods + + func select(settingName: String) { + + let row = self.settingNames.firstIndex(of: settingName) ?? 0 + self.tableView?.selectRowIndexes([row], byExtendingSelection: false) } @@ -277,7 +282,7 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable func tableViewSelectionDidChange(_ notification: Notification) { - self.setTheme(name: self.selectedSettingName) + self.selection = self.selectedSettingName } @@ -317,9 +322,7 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable return false } - if UserDefaults.standard[.theme] == oldName { - UserDefaults.standard[.theme] = newName - } + self.selection = newName return true } @@ -506,54 +509,6 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable } - /// Sets the given theme to the editor. - /// - /// - Parameter name: The theme name. - private func setTheme(name: String) { - - let theme: Theme - do { - theme = try ThemeManager.shared.setting(name: name) - } catch { - return self.presentErrorAsSheet(error) - } - - // update default theme setting - let isDarkTheme = ThemeManager.shared.isDark(name: name) - let usesDarkAppearance = ThemeManager.shared.usesDarkAppearance - UserDefaults.standard[.pinsThemeAppearance] = (isDarkTheme != usesDarkAppearance) - UserDefaults.standard[.theme] = name - - self.setTheme(theme, name: name) - } - - - /// Sets the given theme to theme view. - /// - /// - Parameters: - /// - theme: The theme to set to the view. - /// - name: The name of the theme. - private func setTheme(_ theme: Theme, name: String) { - - let isBundled = ThemeManager.shared.state(of: name)?.isBundled == true - - let view = ThemeEditorView(theme: theme, isBundled: isBundled) { theme in - do { - try ThemeManager.shared.save(setting: theme, name: name) - } catch { - assertionFailure(error.localizedDescription) - } - } - let hostingView = NSHostingView(rootView: view) - - self.themeViewContainer?.contentView = hostingView - self.isBundled = isBundled - - NSAccessibility.post(element: hostingView, notification: .valueChanged) - - } - - /// Tries to delete the given theme. /// /// - Parameter name: The name of the theme to delete. @@ -620,18 +575,19 @@ final class ThemeViewController: NSViewController, NSMenuItemValidation, NSTable /// - Parameter selectingName: The item name to select. private func updateList(bySelecting selectingName: String? = nil) { - let settingName = selectingName ?? ThemeManager.shared.userDefaultSettingName - self.settingNames = ThemeManager.shared.settingNames guard let tableView = self.tableView else { return } + let settingName = selectingName ?? ThemeManager.shared.userDefaultSettingName + tableView.reloadData() let row = self.settingNames.firstIndex(of: settingName) ?? 0 tableView.selectRowIndexes([row], byExtendingSelection: false) - if selectingName != nil { + if let selectingName { + self.selection = selectingName tableView.scrollRowToVisible(row) } } diff --git a/CotEditor/Sources/ThemeManager.swift b/CotEditor/Sources/ThemeManager.swift index c12e5d711..17b5e24c3 100644 --- a/CotEditor/Sources/ThemeManager.swift +++ b/CotEditor/Sources/ThemeManager.swift @@ -27,6 +27,7 @@ import AppKit import Combine import Foundation import UniformTypeIdentifiers +import Defaults @MainActor @objc protocol ThemeChanging: AnyObject { @@ -78,6 +79,16 @@ final class ThemeManager: SettingFileManaging { // MARK: Public Methods + /// Returns whether given setting name is dark theme. + /// + /// - Parameter name: The setting name to test. + /// - Returns: A bool value. + static func isDark(name: String) -> Bool { + + name.hasSuffix("(Dark)") + } + + /// The default setting by taking the appearance state into consideration. var defaultSettingName: String { @@ -167,16 +178,6 @@ final class ThemeManager: SettingFileManaging { } - /// Returns whether given setting name is dark theme. - /// - /// - Parameter name: The setting name to test. - /// - Returns: A bool value. - func isDark(name: String) -> Bool { - - name.hasSuffix("(Dark)") - } - - /// Returns the setting name of dark/light version of given one if any exists. /// /// - Parameters: diff --git a/CotEditor/Sources/ThemeEditorView.swift b/CotEditor/Sources/ThemeView.swift similarity index 69% rename from CotEditor/Sources/ThemeEditorView.swift rename to CotEditor/Sources/ThemeView.swift index 147c34267..0cd48bb1a 100644 --- a/CotEditor/Sources/ThemeEditorView.swift +++ b/CotEditor/Sources/ThemeView.swift @@ -1,5 +1,5 @@ // -// ThemeEditorView.swift +// ThemeView.swift // // CotEditor // https://coteditor.com @@ -25,15 +25,113 @@ import SwiftUI import AppKit.NSColor +import Defaults -struct ThemeEditorView: View { +struct ThemeView: View { - @State var theme: Theme + @AppStorage(.theme) private var themeName + @AppStorage(.pinsThemeAppearance) private var pinsThemeAppearance + @AppStorage(.documentAppearance) private var documentAppearance + + @State private var theme: Theme = .init() + @State private var isBundled: Bool = false + + @State private var error: (any Error)? + + + var body: some View { + + HStack(spacing: 0) { + ThemeListView(selection: $themeName) + + Divider() + + ThemeEditorView(theme: $theme, isBundled: self.isBundled) + .frame(width: 360) + .onChange(of: self.theme) { (_, newValue) in + do { + try ThemeManager.shared.save(setting: newValue, name: self.themeName) + } catch { + self.error = error + } + } + } + .onChange(of: self.documentAppearance, initial: true) { + self.themeName = ThemeManager.shared.userDefaultSettingName + } + .onChange(of: self.themeName, initial: true) { (_, newValue) in + self.setTheme(name: newValue) + } + .onReceive(ThemeManager.shared.didUpdateSetting) { change in + Task { @MainActor in + guard + let name = change.new, + name == self.themeName, + let theme = try? ThemeManager.shared.setting(name: name) + else { return } + + self.theme = theme + } + } + .background() + .border(.separator) + .alert(error: $error) + } + + + /// Sets the given theme to the editor. + /// + /// - Parameter name: The theme name. + private func setTheme(name: String) { + + let theme: Theme + do { + theme = try ThemeManager.shared.setting(name: name) + } catch { + self.error = error + return + } + + // update default theme setting + let isDarkTheme = ThemeManager.isDark(name: name) + let usesDarkAppearance = ThemeManager.shared.usesDarkAppearance + self.pinsThemeAppearance = (isDarkTheme != usesDarkAppearance) + self.themeName = name + + self.isBundled = ThemeManager.shared.state(of: name)?.isBundled == true + self.theme = theme + } +} + + +private struct ThemeListView: NSViewControllerRepresentable { + + typealias NSViewControllerType = ThemeListViewController + + @Binding var selection: String + + + func makeNSViewController(context: Context) -> ThemeListViewController { + + NSStoryboard(name: "ThemeListView", bundle: nil).instantiateInitialController { coder in + ThemeListViewController(coder: coder, selection: $selection) + }! + } + + + func updateNSViewController(_ nsViewController: ThemeListViewController, context: Context) { + + nsViewController.select(settingName: self.selection) + } +} + + +private struct ThemeEditorView: View { + + @Binding var theme: Theme let isBundled: Bool - let onUpdate: (Theme) -> Void @State private var isMetadataPresenting = false - @State private var needsNotify = false // MARK: View @@ -47,21 +145,16 @@ struct ThemeEditorView: View { selection: $theme.text.binding, supportsOpacity: false) ColorPicker(String(localized: "Invisibles:", table: "ThemeEditor"), selection: $theme.invisibles.binding) - if #available(macOS 14, *) { - SystemColorPicker(String(localized: "Cursor:", table: "ThemeEditor"), - selection: $theme.insertionPoint, - systemColor: Color(nsColor: .textInsertionPointColor)) - } else { - ColorPicker(String(localized: "Cursor:", table: "ThemeEditor"), - selection: $theme.insertionPoint.binding) - } + SystemColorPicker(String(localized: "Cursor:", table: "ThemeEditor"), + selection: $theme.insertionPoint, + systemColor: Color(nsColor: .textInsertionPointColor)) }.accessibilityElement(children: .contain) VStack(alignment: .trailing, spacing: 3) { ColorPicker(String(localized: "Background:", table: "ThemeEditor"), selection: $theme.background.binding, supportsOpacity: false) ColorPicker(String(localized: "Current Line:", table: "ThemeEditor"), - selection: $theme.lineHighlight.binding, supportsOpacity: false) + selection: $theme.lineHighlight.binding) SystemColorPicker(String(localized: "Selection:", table: "ThemeEditor"), selection: $theme.selection, systemColor: Color(nsColor: .selectedTextBackgroundColor.forDarkMode(self.theme.isDarkTheme)), @@ -107,14 +200,11 @@ struct ThemeEditorView: View { HStack { Spacer() - Button { + Button(String(localized: "Show theme file information", table: "ThemeEditor"), systemImage: "info") { self.isMetadataPresenting.toggle() - } label: { - Image(systemName: "info") - .symbolVariant(.circle) } - .accessibilityLabel(String(localized: "Show theme file information", table: "ThemeEditor")) - .help(String(localized: "Show theme file information", table: "ThemeEditor", comment: "tooltip")) + .symbolVariant(.circle) + .labelStyle(.iconOnly) .popover(isPresented: self.$isMetadataPresenting, arrowEdge: .trailing) { ThemeMetadataView(metadata: $theme.metadata ?? .init(), isEditable: !self.isBundled) } @@ -123,20 +213,6 @@ struct ThemeEditorView: View { } .accessibilityElement(children: .contain) .accessibilityLabel(String(localized: "Theme Editor", table: "ThemeEditor")) - .onChange(of: self.theme) { newValue in - if self.isMetadataPresenting { - // postpone notification to avoid closing the popover - self.needsNotify = true - } else { - self.onUpdate(newValue) - } - } - .onChange(of: self.isMetadataPresenting) { newValue in - guard !newValue, self.needsNotify else { return } - - self.onUpdate(self.theme) - self.needsNotify = false - } .padding(.vertical, 10) .padding(.horizontal, 14) } @@ -199,6 +275,7 @@ private struct ThemeMetadataView: View { GridRow { self.itemView(String(localized: "URL:", table: "ThemeEditor"), text: $metadata.distributionURL ?? "") + .textContentType(.URL) LinkButton(url: self.metadata.distributionURL ?? "") .foregroundStyle(.secondary) } @@ -231,7 +308,6 @@ private struct ThemeMetadataView: View { .accessibilityLabeledPair(role: .content, id: title, in: self.accessibility) } else { Text(text.wrappedValue) - .foregroundColor(.label) .textSelection(.enabled) .accessibilityLabeledPair(role: .content, id: title, in: self.accessibility) } @@ -262,13 +338,20 @@ private extension Theme.SystemDefaultStyle { // MARK: - Preview -@available(macOS 14, *) -#Preview(traits: .fixedLayout(width: 360, height: 280)) { - ThemeEditorView(theme: try! ThemeManager.shared.setting(name: "Anura"), isBundled: false) { _ in } +#Preview(traits: .fixedLayout(width: 480, height: 280)) { + ThemeView() } +@available(macOS 15, *) +#Preview("ThemeEditorView", traits: .fixedLayout(width: 360, height: 280)) { + @Previewable @State var theme = try! ThemeManager.shared.setting(name: "Anura") + + return ThemeEditorView(theme: $theme, isBundled: false) +} + +@available(macOS 15, *) #Preview("Metadata (editable)") { - @State var metadata = Theme.Metadata( + @Previewable @State var metadata = Theme.Metadata( author: "Clarus", distributionURL: "https://coteditor.com" ) @@ -276,8 +359,9 @@ private extension Theme.SystemDefaultStyle { return ThemeMetadataView(metadata: $metadata, isEditable: true) } +@available(macOS 15, *) #Preview("Metadata (fixed)") { - @State var metadata = Theme.Metadata( + @Previewable @State var metadata = Theme.Metadata( author: "Claus" ) diff --git a/CotEditor/Sources/TokenTextView.swift b/CotEditor/Sources/TokenTextEditor.swift similarity index 76% rename from CotEditor/Sources/TokenTextView.swift rename to CotEditor/Sources/TokenTextEditor.swift index 21cbb2b6b..0dfdfe83c 100644 --- a/CotEditor/Sources/TokenTextView.swift +++ b/CotEditor/Sources/TokenTextEditor.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2023 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,8 +23,75 @@ // limitations under the License. // +import SwiftUI import AppKit +struct TokenTextEditor: NSViewRepresentable { + + typealias NSViewType = NSScrollView + + + @Binding var text: String? + var tokenizer: Tokenizer + + @Environment(\.isEnabled) private var isEnabled + + + func makeNSView(context: Context) -> NSScrollView { + + let textView = TokenTextView(usingTextLayoutManager: false) + textView.allowsUndo = true + textView.autoresizingMask = [.width, .height] + textView.textContainerInset = CGSize(width: 4, height: 6) + textView.isRichText = false + textView.font = .systemFont(ofSize: 0) + textView.delegate = context.coordinator + textView.tokenizer = self.tokenizer + + let nsView = NSScrollView() + nsView.documentView = textView + + return nsView + } + + + func updateNSView(_ nsView: NSScrollView, context: Context) { + + guard let textView = nsView.documentView as? TokenTextView else { return assertionFailure() } + + textView.string = self.text ?? "" + textView.isEditable = self.isEnabled + } + + + func makeCoordinator() -> Coordinator { + + Coordinator(text: $text) + } + + + + final class Coordinator: NSObject, NSTextViewDelegate { + + @Binding private var text: String? + + + init(text: Binding) { + + self._text = text + } + + + func textDidChange(_ notification: Notification) { + + guard let textView = notification.object as? NSTextView else { return assertionFailure() } + + self.text = textView.string + } + } +} + + private extension NSAttributedString.Key { static let token = NSAttributedString.Key("token") @@ -156,33 +223,6 @@ final class TokenTextView: NSTextView { -extension TokenRepresentable { - - /// Returns a menu item to insert variable to TokenTextView. - /// - /// - Parameter target: The action target. - /// - Returns: A menu item. - func insertionMenuItem(target: TokenTextView? = nil) -> NSMenuItem { - - let font = NSFont.menuFont(ofSize: NSFont.systemFontSize(for: .small)) - - let token = NSAttributedString(string: self.token, attributes: [.font: font]) - let description = NSAttributedString(string: self.localizedDescription, - attributes: [.font: font, - .foregroundColor: NSColor.secondaryLabelColor]) - - let item = NSMenuItem() - item.target = target - item.action = #selector(TokenTextView.insertVariable) - item.attributedTitle = [token, description].joined(separator: "\n") - item.representedObject = self.token - - return item - } -} - - - private extension NSColor { static let tokenTextColor = NSColor(name: nil) { appearance in diff --git a/CotEditor/Sources/URL.swift b/CotEditor/Sources/URL.swift index e25d29e69..fbc3ab830 100644 --- a/CotEditor/Sources/URL.swift +++ b/CotEditor/Sources/URL.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -34,30 +34,43 @@ extension URL { } - /// Returns relative-path string. + /// Returns relative-path components. + /// + /// - Note: The `baseURL` is assumed its `directoryHint` is properly set. /// /// - Parameter baseURL: The URL the relative path based on. - /// - Returns: A path string. - func path(relativeTo baseURL: URL?) -> String? { + /// - Returns: Path components. + func components(relativeTo baseURL: URL) -> [String] { assert(self.isFileURL) - assert(baseURL?.isFileURL != false) + assert(baseURL.isFileURL) - guard let baseURL else { return nil } - - if baseURL == self { - return self.lastPathComponent + if baseURL == self, !baseURL.hasDirectoryPath { + return [self.lastPathComponent] } - let pathComponents = self.pathComponents - let basePathComponents = baseURL.pathComponents + let filename = self.lastPathComponent + let pathComponents = self.pathComponents.dropLast() + let basePathComponents = baseURL.pathComponents.dropLast(baseURL.hasDirectoryPath ? 0 : 1) let sameCount = zip(basePathComponents, pathComponents).countPrefix { $0.0 == $0.1 } - let parentCount = basePathComponents.count - sameCount - 1 + let parentCount = basePathComponents.count - sameCount let parentComponents = [String](repeating: "..", count: parentCount) let diffComponents = pathComponents[sameCount...] - return (parentComponents + diffComponents).joined(separator: "/") + return parentComponents + diffComponents + [filename] + } + + + /// Returns relative-path string. + /// + /// - Note: The `baseURL` is assumed its `directoryHint` is properly set. + /// + /// - Parameter baseURL: The URL the relative path based on. + /// - Returns: A path string. + func path(relativeTo baseURL: URL) -> String { + + self.components(relativeTo: baseURL).joined(separator: "/") } } diff --git a/CotEditor/Sources/UTType.swift b/CotEditor/Sources/UTType.swift index e690c7b51..09c1740fc 100644 --- a/CotEditor/Sources/UTType.swift +++ b/CotEditor/Sources/UTType.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ // limitations under the License. // -import Foundation import UniformTypeIdentifiers extension UTType { @@ -32,6 +31,20 @@ extension UTType { self.tags[.filenameExtension] ?? [] } + + + /// Whether the type should be handled as plain-text in this app. + /// + /// - RTF also conforms to public.text, but it is OK in CotEditor. + /// - SVG conforms both .text and .image (except SVGZ). + /// - The parent of `.propertyList` is not text but `.data` (It can not be determined only from UTI whether the file is binary or XML). + /// - "ts" extension conflicts between MPEG-2 transport stream and TypeScript. + /// + /// - Note: This judge is valid only in CotEditor. + var isPlainText: Bool { + + self.conforms(to: .text) || self.conforms(to: .propertyList) || self == .mpeg2TransportStream + } } diff --git a/CotEditor/Sources/UUID+Transferable.swift b/CotEditor/Sources/UUID+Transferable.swift new file mode 100644 index 000000000..d2f210cf1 --- /dev/null +++ b/CotEditor/Sources/UUID+Transferable.swift @@ -0,0 +1,76 @@ +// +// UUID+Transferable.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-08. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import UniformTypeIdentifiers +import CoreTransferable + +extension UTType { + + nonisolated static let uuid = UTType(exportedAs: "com.coteditor.uuid") +} + + +extension UUID: @retroactive Transferable { + + public static var transferRepresentation: some TransferRepresentation { + + CodableRepresentation(for: UUID.self, contentType: .uuid) + } +} + + +extension UUID { + + var itemProvider: NSItemProvider { + + let provider = NSItemProvider() + provider.register(self) + return provider + } +} + + + +// MARK: Item Provider + +extension NSItemProvider: @retroactive @unchecked Sendable { } + +extension NSItemProvider { + + func load(type: T.Type) async throws -> T { + + try await withCheckedThrowingContinuation { continuation in + _ = self.loadTransferable(type: T.self) { result in + switch result { + case .success(let success): + continuation.resume(returning: success) + case .failure(let error): + continuation.resume(throwing: error) + } + } + } + } +} diff --git a/CotEditor/Sources/UnicodeInputView.swift b/CotEditor/Sources/UnicodeInputView.swift index 69c2e141e..8432d6946 100644 --- a/CotEditor/Sources/UnicodeInputView.swift +++ b/CotEditor/Sources/UnicodeInputView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct UnicodeInputView: View { @@ -70,7 +71,7 @@ struct UnicodeInputView: View { .monospacedDigit() + Text(scalar.name ?? "–") .font(.system(size: NSFont.smallSystemFontSize)) - .foregroundColor(.secondary) + .foregroundStyle(.secondary) } } } @@ -115,7 +116,7 @@ struct UnicodeInputView: View { /// Inputs Unicode character to the parent text view. - @MainActor private func submit() { + private func submit() { guard let character = self.character else { return NSSound.beep() } diff --git a/CotEditor/Sources/UnixScript.swift b/CotEditor/Sources/UnixScript.swift index 123366337..4ef61d01d 100644 --- a/CotEditor/Sources/UnixScript.swift +++ b/CotEditor/Sources/UnixScript.swift @@ -26,6 +26,7 @@ import Foundation import AppKit.NSDocument +import Shortcut struct UnixScript: Script { @@ -86,7 +87,7 @@ struct UnixScript: Script { guard try self.url.resourceValues(forKeys: [.isExecutableKey]).isExecutable ?? false else { throw ScriptFileError(.permission, url: self.url) } - guard let script = try? String(contentsOf: self.url), !script.isEmpty else { + guard let script = try? String(contentsOf: self.url, encoding: .utf8), !script.isEmpty else { throw ScriptFileError(.read, url: self.url) } diff --git a/CotEditor/Sources/UserUnixTask.swift b/CotEditor/Sources/UserUnixTask.swift index c2e4ca8ad..cb481b4c5 100644 --- a/CotEditor/Sources/UserUnixTask.swift +++ b/CotEditor/Sources/UserUnixTask.swift @@ -25,7 +25,7 @@ import Foundation -extension NSUserUnixTask: @unchecked Sendable { } +extension NSUserUnixTask: @retroactive @unchecked Sendable { } actor UserUnixTask { diff --git a/CotEditor/Sources/View+Alert.swift b/CotEditor/Sources/View+Alert.swift index 9673beb5f..e4876526b 100644 --- a/CotEditor/Sources/View+Alert.swift +++ b/CotEditor/Sources/View+Alert.swift @@ -47,6 +47,27 @@ extension View { } +extension NSError: @retroactive LocalizedError { + + public var errorDescription: String? { + + self.localizedDescription + } + + + public var failureReason: String? { + + self.localizedFailureReason + } + + + public var recoverySuggestion: String? { + + self.localizedRecoverySuggestion + } +} + + // MARK: Private Structs private struct LocalizedAlertError: LocalizedError { diff --git a/CotEditor/Sources/WarningInspectorView.swift b/CotEditor/Sources/WarningInspectorView.swift index 08677ec7c..2594a9e3c 100644 --- a/CotEditor/Sources/WarningInspectorView.swift +++ b/CotEditor/Sources/WarningInspectorView.swift @@ -24,16 +24,17 @@ // import SwiftUI +import Observation final class WarningInspectorViewController: NSHostingController, DocumentOwner { // MARK: Public Properties - var document: Document { + var document: Document? { didSet { if self.isViewShown { - self.model.document = document + self.model.updateDocument(to: document) } } } @@ -47,9 +48,10 @@ final class WarningInspectorViewController: NSHostingController: View { + + var title: String + var image: Image + @ViewBuilder var content: () -> Content + + var body: some View { + + VStack { + self.image + .font(.system(size: 56, weight: .thin)) + .foregroundStyle(.tint) + .frame(height: 64) + + Text(self.title) + .font(.title3) + .fontWeight(.medium) + .accessibilityAddTraits(.isHeader) + .accessibilityHeading(.h2) + .padding(.vertical, 2) + + self.content() + .fixedSize(horizontal: false, vertical: true) + } + } +} + + +private enum NewFeature: CaseIterable { + + static let version = "4.9" + + case macOSSupport + case donation + + + var image: Image { + + switch self { + case .macOSSupport: + Image(systemName: "sparkles") + case .donation: + Image(.bagCoffee) + } + } + + + var label: String { + + switch self { + case .macOSSupport: + String(localized: "NewFeature.macOSSupport.label", + defaultValue: "macOS 15 Sequoia Support", table: "WhatsNew") + case .donation: + String(localized: "NewFeature.donation.label", + defaultValue: "Donation", table: "WhatsNew") + } + } + + + var description: String { + + switch self { + case .macOSSupport: + String(localized: "NewFeature.macOSSupport.description", + defaultValue: "Work perfectly with new macOS 15.", table: "WhatsNew") + case .donation: + String(localized: "NewFeature.donation.description", + defaultValue: "Support the CotEditor project by offering coffee to the developer.", table: "WhatsNew") + } + } + + + @MainActor @ViewBuilder var supplementalView: some View { + + switch self { + case .donation: + #if SPARKLE + Text("(Available only in the App Store version)", tableName: "WhatsNew") + .foregroundStyle(.secondary) + .controlSize(.small) + .fixedSize() + #else + Button(String(localized: "Open Donation Settings", table: "WhatsNew")) { + SettingsWindowController.shared.openPane(.donation) + } + .buttonStyle(.capsule) + #endif + default: + EmptyView() + } + } +} + + + +// MARK: - Preview + +#Preview { + WhatsNewView() +} diff --git a/CotEditor/Sources/WindowContentViewController.swift b/CotEditor/Sources/WindowContentViewController.swift index c9dc7c45d..b11ee2df0 100644 --- a/CotEditor/Sources/WindowContentViewController.swift +++ b/CotEditor/Sources/WindowContentViewController.swift @@ -31,12 +31,13 @@ final class WindowContentViewController: NSSplitViewController { var document: Document { didSet { self.updateDocument() } } - private(set) lazy var documentViewController = DocumentViewController(document: self.document) + var documentViewController: DocumentViewController? { self.contentViewController.documentViewController } // MARK: Private Properties - private lazy var inspectorViewController = InspectorViewController(document: self.document) + @ViewLoading private var contentViewItem: NSSplitViewItem + @ViewLoading private var inspectorViewItem: NSSplitViewItem private var windowObserver: NSKeyValueObservation? @@ -65,12 +66,6 @@ final class WindowContentViewController: NSSplitViewController { self.view.addSubview(self.splitView) self.splitView.translatesAutoresizingMaskIntoConstraints = false - NSLayoutConstraint.activate([ - self.view.topAnchor.constraint(equalTo: self.splitView.topAnchor), - self.view.bottomAnchor.constraint(equalTo: self.splitView.bottomAnchor), - self.view.leadingAnchor.constraint(equalTo: self.splitView.leadingAnchor), - self.view.trailingAnchor.constraint(equalTo: self.splitView.trailingAnchor), - ]) } @@ -79,21 +74,27 @@ final class WindowContentViewController: NSSplitViewController { super.viewDidLoad() // -> Need to set *both* identifier and autosaveName to make autosaving work. - self.splitView.identifier = NSUserInterfaceItemIdentifier("WindowContentSplitView") - self.splitView.autosaveName = "WindowContentSplitView" + let autosaveName = "WindowContentSplitView" + self.splitView.identifier = NSUserInterfaceItemIdentifier(autosaveName) + self.splitView.autosaveName = autosaveName - self.addChild(self.documentViewController) + let contentViewController = ContentViewController(document: self.document) + self.contentViewItem = NSSplitViewItem(viewController: contentViewController) + self.addSplitViewItem(self.contentViewItem) - let inspectorViewItem = NSSplitViewItem(inspectorWithViewController: self.inspectorViewController) - inspectorViewItem.minimumThickness = NSSplitViewItem.unspecifiedDimension - inspectorViewItem.maximumThickness = NSSplitViewItem.unspecifiedDimension - inspectorViewItem.isCollapsed = true - self.addSplitViewItem(inspectorViewItem) + let inspectorViewController = InspectorViewController(document: self.document) + self.inspectorViewItem = NSSplitViewItem(inspectorWithViewController: inspectorViewController) + self.inspectorViewItem.minimumThickness = NSSplitViewItem.unspecifiedDimension + self.inspectorViewItem.maximumThickness = NSSplitViewItem.unspecifiedDimension + self.inspectorViewItem.isCollapsed = true + self.addSplitViewItem(self.inspectorViewItem) // adopt the visibility of the inspector from the last change self.windowObserver = self.view.observe(\.window, options: .new) { [weak self] (_, change) in - if let window = change.newValue, window != nil { - self?.restoreAutosavingState() + MainActor.assumeIsolated { + if let window = change.newValue, window != nil { + self?.restoreAutosavingState() + } } } } @@ -103,7 +104,7 @@ final class WindowContentViewController: NSSplitViewController { // reel responders from the ideal first responder in the content view // for when the actual first responder is on the sidebar/inspector - if let textView = self.documentViewController.focusedTextView, + if let textView = self.documentViewController?.focusedTextView, let responder = sequence(first: textView, next: \.nextResponder).first(where: { $0.responds(to: action) }) { responder @@ -152,17 +153,6 @@ final class WindowContentViewController: NSSplitViewController { // MARK: Action Messages - /// Toggles visibility of the inspector. - @IBAction override func toggleInspector(_ sender: Any?) { - - if #available(macOS 14, *) { - super.toggleInspector(sender) - } else { - self.inspectorViewItem?.animator().isCollapsed.toggle() - } - } - - /// Toggles visibility of the document inspector pane. @IBAction func getInfo(_ sender: Any?) { @@ -187,17 +177,24 @@ final class WindowContentViewController: NSSplitViewController { // MARK: Private Methods - /// The split view item for the inspector. - private var inspectorViewItem: NSSplitViewItem? { + /// The view controller for the content view. + private var contentViewController: ContentViewController { - self.splitViewItem(for: self.inspectorViewController) + self.contentViewItem.viewController as! ContentViewController + } + + + /// The view controller for the inspector. + private var inspectorViewController: InspectorViewController { + + self.inspectorViewItem.viewController as! InspectorViewController } /// Whether the inspector is opened. private var isInspectorShown: Bool { - self.inspectorViewItem?.isCollapsed == false + self.inspectorViewItem.isCollapsed == false } @@ -208,7 +205,7 @@ final class WindowContentViewController: NSSplitViewController { /// - pane: The inspector pane to change visibility. private func setInspectorShown(_ shown: Bool, pane: InspectorPane) { - self.inspectorViewItem!.animator().isCollapsed = !shown + self.inspectorViewItem.animator().isCollapsed = !shown self.inspectorViewController.selectedTabViewItemIndex = pane.rawValue } @@ -235,7 +232,7 @@ final class WindowContentViewController: NSSplitViewController { /// Updates the document in children. private func updateDocument() { - self.documentViewController.document = self.document + self.contentViewController.document = self.document self.inspectorViewController.document = self.document } } diff --git a/CotEditor/Sources/WindowSettingsView.swift b/CotEditor/Sources/WindowSettingsView.swift index 358ee1e25..8cd9f5cfb 100644 --- a/CotEditor/Sources/WindowSettingsView.swift +++ b/CotEditor/Sources/WindowSettingsView.swift @@ -24,6 +24,7 @@ // import SwiftUI +import Defaults struct WindowSettingsView: View { @@ -72,7 +73,7 @@ struct WindowSettingsView: View { Picker(selection: $windowTabbing) { (Text("Respect System Setting", tableName: "WindowSettings") + - Text(" (\(NSWindow.userTabbingPreference.label))").foregroundColor(.secondary)).tag(-1) + Text(" (\(NSWindow.userTabbingPreference.label))").foregroundStyle(.secondary)).tag(-1) Divider() @@ -249,7 +250,7 @@ struct WindowSettingsView: View { HStack { Spacer() - HelpButton(anchor: "settings_window") + HelpLink(anchor: "settings_window") }.padding(.top, -8) } .scenePadding() diff --git a/CotEditor/Sources/WrappingHStack.swift b/CotEditor/Sources/WrappingHStack.swift index e6d210f42..7c1fbb82b 100644 --- a/CotEditor/Sources/WrappingHStack.swift +++ b/CotEditor/Sources/WrappingHStack.swift @@ -29,7 +29,7 @@ struct WrappingHStack: View { var horizontalSpacing: Double = 4 var verticalSpacing: Double = 4 - var content: () -> Content + @ViewBuilder var content: () -> Content var body: some View { diff --git a/CotEditor/Sources/WriteToConsoleCommand.swift b/CotEditor/Sources/WriteToConsoleCommand.swift index ca7766c9a..201d10066 100644 --- a/CotEditor/Sources/WriteToConsoleCommand.swift +++ b/CotEditor/Sources/WriteToConsoleCommand.swift @@ -34,7 +34,7 @@ final class WriteToConsoleCommand: NSScriptCommand { Task { @MainActor in let log = Console.Log(message: message, title: ScriptManager.shared.currentScriptName) ConsolePanelController.shared.append(log: log) - ConsolePanelController.shared.showWindow(self) + ConsolePanelController.shared.showWindow(nil) } return true diff --git a/CotEditor/SyntaxMap.json b/CotEditor/SyntaxMap.json index d5972fa60..5202b3cc2 100644 --- a/CotEditor/SyntaxMap.json +++ b/CotEditor/SyntaxMap.json @@ -1,4 +1,15 @@ { + "AWK" : { + "extensions" : [ + "awk" + ], + "filenames" : [ + + ], + "interpreters" : [ + "awk" + ] + }, "Apache" : { "extensions" : [ "conf" @@ -21,15 +32,16 @@ ] }, - "AWK" : { + "Assembly" : { "extensions" : [ - "awk" + "s", + "asm" ], "filenames" : [ ], "interpreters" : [ - "awk" + ] }, "BBCode" : { @@ -99,17 +111,6 @@ ] }, - "CoffeeScript" : { - "extensions" : [ - "coffee" - ], - "filenames" : [ - - ], - "interpreters" : [ - "coffee" - ] - }, "CSS" : { "extensions" : [ "css" @@ -121,6 +122,17 @@ ] }, + "CoffeeScript" : { + "extensions" : [ + "coffee" + ], + "filenames" : [ + + ], + "interpreters" : [ + "coffee" + ] + }, "D" : { "extensions" : [ "d" @@ -132,6 +144,29 @@ "rdmd" ] }, + "DOT" : { + "extensions" : [ + "dot", + "gv" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, + "DTD" : { + "extensions" : [ + "dtd" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, "Dart" : { "extensions" : [ "dart" @@ -167,29 +202,6 @@ ] }, - "DOT" : { - "extensions" : [ - "dot", - "gv" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, - "DTD" : { - "extensions" : [ - "dtd" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "Erlang" : { "extensions" : [ "erl" @@ -264,18 +276,6 @@ ] }, - "Haskell" : { - "extensions" : [ - "hs", - "lhs" - ], - "filenames" : [ - - ], - "interpreters" : [ - "runhaskell" - ] - }, "HTML" : { "extensions" : [ "html", @@ -289,16 +289,16 @@ ] }, - "iCalendar" : { + "Haskell" : { "extensions" : [ - "ics", - "ifb" + "hs", + "lhs" ], "filenames" : [ ], "interpreters" : [ - + "runhaskell" ] }, "INI" : { @@ -313,6 +313,21 @@ ] }, + "JSON" : { + "extensions" : [ + "json", + "geojson", + "resolved", + "cottheme", + "cotrpl" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, "Java" : { "extensions" : [ "java", @@ -337,32 +352,6 @@ ] }, - "jq" : { - "extensions" : [ - "jq" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, - "JSON" : { - "extensions" : [ - "json", - "geojson", - "resolved", - "cottheme", - "cotrpl" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "Julia" : { "extensions" : [ "jl" @@ -427,6 +416,28 @@ ] }, + "MATLAB" : { + "extensions" : [ + "m" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, + "METAFONT" : { + "extensions" : [ + "mf" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, "Makefile" : { "extensions" : [ @@ -455,28 +466,6 @@ ] }, - "MATLAB" : { - "extensions" : [ - "m" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, - "METAFONT" : { - "extensions" : [ - "mf" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "Mojo" : { "extensions" : [ "mojo", @@ -489,6 +478,22 @@ "mojo" ] }, + "PHP" : { + "extensions" : [ + "php", + "php3", + "php4", + "php5", + "phps", + "phtml" + ], + "filenames" : [ + + ], + "interpreters" : [ + "php" + ] + }, "Pascal" : { "extensions" : [ "pas", @@ -514,22 +519,6 @@ "perl" ] }, - "PHP" : { - "extensions" : [ - "php", - "php3", - "php4", - "php5", - "phps", - "phtml" - ], - "filenames" : [ - - ], - "interpreters" : [ - "php" - ] - }, "Plain Text" : { "extensions" : [ "txt" @@ -589,18 +578,6 @@ "Rscript" ] }, - "reStructuredText" : { - "extensions" : [ - "rest", - "rst" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "Rich Text Format" : { "extensions" : [ "rtf" @@ -636,6 +613,30 @@ "rustx" ] }, + "SQL" : { + "extensions" : [ + "sql", + "mysql", + "pgsql" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, + "SVG" : { + "extensions" : [ + "svg" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, "Scala" : { "extensions" : [ "scala" @@ -684,30 +685,6 @@ "zsh" ] }, - "SQL" : { - "extensions" : [ - "sql", - "mysql", - "pgsql" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, - "SVG" : { - "extensions" : [ - "svg" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "Swift" : { "extensions" : [ "swift", @@ -720,6 +697,17 @@ "swift" ] }, + "TOML" : { + "extensions" : [ + "toml" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, "Tcl" : { "extensions" : [ "tcl" @@ -742,17 +730,6 @@ ] }, - "TOML" : { - "extensions" : [ - "toml" - ], - "filenames" : [ - - ], - "interpreters" : [ - - ] - }, "TypeScript" : { "extensions" : [ "ts", @@ -767,9 +744,9 @@ ] }, - "Verilog" : { + "VHDL" : { "extensions" : [ - "v" + "vhd" ], "filenames" : [ @@ -778,9 +755,9 @@ ] }, - "VHDL" : { + "Verilog" : { "extensions" : [ - "vhd" + "v" ], "filenames" : [ @@ -815,6 +792,41 @@ ], "interpreters" : [ + ] + }, + "iCalendar" : { + "extensions" : [ + "ics", + "ifb" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, + "jq" : { + "extensions" : [ + "jq" + ], + "filenames" : [ + + ], + "interpreters" : [ + + ] + }, + "reStructuredText" : { + "extensions" : [ + "rest", + "rst" + ], + "filenames" : [ + + ], + "interpreters" : [ + ] } } \ No newline at end of file diff --git a/CotEditor/Syntaxes/Assembly.yml b/CotEditor/Syntaxes/Assembly.yml new file mode 100644 index 000000000..d0798a9ee --- /dev/null +++ b/CotEditor/Syntaxes/Assembly.yml @@ -0,0 +1,213 @@ +attributes: +- beginString: (?<=\[)[^\]]+(?=\]) + regularExpression: true +characters: [] +commands: +- beginString: aaa + ignoreCase: true +- beginString: aad + ignoreCase: true +- beginString: add + ignoreCase: true +- beginString: and + ignoreCase: true +- beginString: daa + ignoreCase: true +- beginString: div + ignoreCase: true +- beginString: enter + ignoreCase: true +- beginString: idiv + ignoreCase: true +- beginString: lad + ignoreCase: true +- beginString: ld + ignoreCase: true +- beginString: loop + ignoreCase: true +- beginString: mov + description: mnemonic + ignoreCase: true +- beginString: mul + ignoreCase: true +- beginString: neg + ignoreCase: true +- beginString: or + ignoreCase: true +- beginString: pop + ignoreCase: true +- beginString: push + ignoreCase: true +- beginString: rcl + ignoreCase: true +- beginString: rcr + ignoreCase: true +- beginString: rol + ignoreCase: true +- beginString: ror + ignoreCase: true +- beginString: sal + ignoreCase: true +- beginString: sar + ignoreCase: true +- beginString: shl + ignoreCase: true +- beginString: shr + ignoreCase: true +- beginString: st + ignoreCase: true +- beginString: sub + ignoreCase: true +- beginString: svc + ignoreCase: true +- beginString: xor + ignoreCase: true +commentDelimiters: + inlineDelimiter: ; +comments: [] +completions: [] +extensions: +- keyString: s +- keyString: asm +filenames: [] +interpreters: [] +keywords: +- beginString: \.\w+\b + regularExpression: true +- beginString: ^[a-z0-9._]+(?=:) + ignoreCase: true + regularExpression: true +kind: code +metadata: + author: 1024jp + description: 'based on Netwide assembler (intel x86) syntax. + + + ref. https://www.nasm.us/doc/nasmdoc3.html' + distributionURL: https://coteditor.com + lastModified: '2022-08-31' + license: Same as CotEditor + version: 1.0.0 +numbers: +- beginString: (\b|[-+])(0[dt])?[0-9][0-9_]*[dt]?\b + description: decimal with pre/suf-fix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])0[by][01][01_]*\b + description: binary with prefix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])0[hx][0-9a-f][0-9a-f_]*\b + description: hex with prefix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])0[qo][0-7][0-7_]*\b + description: octal with prefix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])0p[0-9][0-9_]\b + description: x87-style packed BCD constants with prefix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])0x[0-9a-z][0-9a-z_]*(\.[0-9a-z][0-9a-z_]*)?(p[-+]?[0-9][0-9_]*)\b + description: C99-style hex floating-point + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])[0-7][0-7_]*[qo]\b + description: octal with suffix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])[0-9][0-9_]*\.([0-9][0-9_]*)?(e[-+]?[0-9][0-9_]*)?\b + description: floating-point + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])[0-9][0-9_]*p\b + description: x87-style packed BCD constants with suffix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])[0-9a-f][0-9a-f_]*[hx]\b + description: hex with suffix + ignoreCase: true + regularExpression: true +- beginString: (\b|[-+])[01][01_]*[by]\b + description: binary with suffix + ignoreCase: true + regularExpression: true +- beginString: \$[0-9][0-9a-f_]*\b + description: hex with $ + ignoreCase: true + regularExpression: true +outlineMenu: [] +strings: +- beginString: '"' + endString: '"' +- beginString: '''' + endString: '''' +- beginString: '`' + endString: '`' +types: +- beginString: '%!variable' +- beginString: '%0' +- beginString: '%00' +- beginString: '%abs' +- beginString: '%arg' +- beginString: '%assign' +- beginString: '%clear' +- beginString: '%cond' +- beginString: '%count' +- beginString: '%defalias' +- beginString: '%define' + description: macro +- beginString: '%defstr' +- beginString: '%deftok' +- beginString: '%depend' +- beginString: '%elif' +- beginString: '%else' +- beginString: '%endif' +- beginString: '%error' +- beginString: '%eval' +- beginString: '%fatal' +- beginString: '%hex' +- beginString: '%if' +- beginString: '%ifctx' +- beginString: '%ifempty' +- beginString: '%ifenv' +- beginString: '%ifid' +- beginString: '%ifidn' +- beginString: '%ifidni' +- beginString: '%ifmacro' +- beginString: '%ifnum' +- beginString: '%ifstr' +- beginString: '%iftoken' +- beginString: '%include' +- beginString: '%is' +- beginString: '%line' +- beginString: '%local' +- beginString: '%macro' +- beginString: '%map' +- beginString: '%num' +- beginString: '%pathsearch' +- beginString: '%pop' +- beginString: '%pragma' +- beginString: '%push' +- beginString: '%rep' +- beginString: '%repl' +- beginString: '%rotate' +- beginString: '%sel' +- beginString: '%stacksize' +- beginString: '%str' +- beginString: '%strcat' +- beginString: '%strlen' +- beginString: '%substr' +- beginString: '%tok' +- beginString: '%undef' +- beginString: '%use' +- beginString: '%warning' +- beginString: '%xdefine' + description: macro +values: +- beginString: __?Infinity?__ +- beginString: __?NaN?__ +- beginString: __?QNaN?__ +- beginString: __?SNaN?__ +variables: [] diff --git a/CotEditor/Themes/Anura (Dark).cottheme b/CotEditor/Themes/Anura (Dark).cottheme index be3515625..b19abc995 100644 --- a/CotEditor/Themes/Anura (Dark).cottheme +++ b/CotEditor/Themes/Anura (Dark).cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#e5e5e5" + "attributes" : { + "color" : "#c76090" + }, + "background" : { + "color" : "#1f1f1f" + }, + "characters" : { + "color" : "#9cd936" + }, + "commands" : { + "color" : "#d4a046" + }, + "comments" : { + "color" : "#808080" }, "insertionPoint" : { "color" : "#a8a8a8", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#555555" }, - "background" : { - "color" : "#1f1f1f" + "keywords" : { + "color" : "#4d92ab" }, "lineHighlight" : { - "color" : "#393939" + "color" : "#333333b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Anura (Dark)", + "numbers" : { + "color" : "#a97dd1" }, "selection" : { "color" : "#a7caff", "usesSystemSetting" : true }, - "keywords" : { - "color" : "#4d92ab" + "strings" : { + "color" : "#90ad65" }, - "commands" : { - "color" : "#d4a046" + "text" : { + "color" : "#e5e5e5" }, "types" : { "color" : "#ed734c" }, - "attributes" : { - "color" : "#c76090" - }, - "variables" : { - "color" : "#75c9c6" - }, "values" : { "color" : "#f26669" }, - "numbers" : { - "color" : "#a97dd1" - }, - "strings" : { - "color" : "#90ad65" - }, - "characters" : { - "color" : "#9cd936" - }, - "comments" : { - "color" : "#808080" - }, - "metadata" : { - "author" : "1024jp", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme.", - "distributionURL" : "https:\/\/coteditor.com" + "variables" : { + "color" : "#75c9c6" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Anura.cottheme b/CotEditor/Themes/Anura.cottheme index 6ed797ebd..0df22667b 100644 --- a/CotEditor/Themes/Anura.cottheme +++ b/CotEditor/Themes/Anura.cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#313131" + "attributes" : { + "color" : "#862753" + }, + "background" : { + "color" : "#f5f5f5" + }, + "characters" : { + "color" : "#639808" + }, + "commands" : { + "color" : "#947231" + }, + "comments" : { + "color" : "#66747a" }, "insertionPoint" : { "color" : "#6c6c6c", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#aaaaaa" }, - "background" : { - "color" : "#f5f5f5" + "keywords" : { + "color" : "#1b556b" }, "lineHighlight" : { - "color" : "#e8e8e8" + "color" : "#e3e3e3b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Anura", + "numbers" : { + "color" : "#683a91" }, "selection" : { "color" : "#a7caff", "usesSystemSetting" : true }, - "keywords" : { - "color" : "#1b556b" + "strings" : { + "color" : "#526e2a" }, - "commands" : { - "color" : "#947231" + "text" : { + "color" : "#313131" }, "types" : { "color" : "#ae3d16" }, - "attributes" : { - "color" : "#862753" - }, - "variables" : { - "color" : "#348986" - }, "values" : { "color" : "#b22729" }, - "numbers" : { - "color" : "#683a91" - }, - "strings" : { - "color" : "#526e2a" - }, - "characters" : { - "color" : "#639808" - }, - "comments" : { - "color" : "#66747a" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#348986" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Classic.cottheme b/CotEditor/Themes/Classic.cottheme index da7ee0dee..8618ced16 100644 --- a/CotEditor/Themes/Classic.cottheme +++ b/CotEditor/Themes/Classic.cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#000000" + "attributes" : { + "color" : "#1455a8" + }, + "background" : { + "color" : "#ffffff" + }, + "characters" : { + "color" : "#0000ff" + }, + "commands" : { + "color" : "#683821" + }, + "comments" : { + "color" : "#236e25" }, "insertionPoint" : { "color" : "#000000", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#808080" }, - "background" : { - "color" : "#ffffff" + "keywords" : { + "color" : "#0c1a7e" }, "lineHighlight" : { - "color" : "#d7f3b8" + "color" : "#d1f0afb3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Classic", + "numbers" : { + "color" : "#0000ff" }, "selection" : { "color" : "#a7caff", "usesSystemSetting" : true }, - "keywords" : { - "color" : "#0c1a7e" + "strings" : { + "color" : "#891314" }, - "commands" : { - "color" : "#683821" + "text" : { + "color" : "#000000" }, "types" : { "color" : "#0d8da8" }, - "attributes" : { - "color" : "#1455a8" - }, - "variables" : { - "color" : "#6b6b79" - }, "values" : { "color" : "#760f50" }, - "numbers" : { - "color" : "#0000ff" - }, - "strings" : { - "color" : "#891314" - }, - "characters" : { - "color" : "#0000ff" - }, - "comments" : { - "color" : "#236e25" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#6b6b79" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Dendrobates (Dark).cottheme b/CotEditor/Themes/Dendrobates (Dark).cottheme index d2a5880e9..9d4bc9c77 100644 --- a/CotEditor/Themes/Dendrobates (Dark).cottheme +++ b/CotEditor/Themes/Dendrobates (Dark).cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#e6e6e6" + "attributes" : { + "color" : "#91cc14" + }, + "background" : { + "color" : "#1b1d1f" + }, + "characters" : { + "color" : "#80dfff" + }, + "commands" : { + "color" : "#ff8a66" + }, + "comments" : { + "color" : "#ff4d58" }, "insertionPoint" : { "color" : "#e6e6e6", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#404040" }, - "background" : { - "color" : "#1b1d1f" + "keywords" : { + "color" : "#40adff" }, "lineHighlight" : { - "color" : "#262626" + "color" : "#2b2b2bb3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Dendrobates (Dark)", + "numbers" : { + "color" : "#a357d9" }, "selection" : { "color" : "#314f78", "usesSystemSetting" : true }, - "keywords" : { - "color" : "#40adff" + "strings" : { + "color" : "#7f9299" }, - "commands" : { - "color" : "#ff8a66" + "text" : { + "color" : "#e6e6e6" }, "types" : { "color" : "#cca543" }, - "attributes" : { - "color" : "#91cc14" - }, - "variables" : { - "color" : "#d96caa" - }, "values" : { "color" : "#2aab9c" }, - "numbers" : { - "color" : "#a357d9" - }, - "strings" : { - "color" : "#7f9299" - }, - "characters" : { - "color" : "#80dfff" - }, - "comments" : { - "color" : "#ff4d58" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#d96caa" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Dendrobates.cottheme b/CotEditor/Themes/Dendrobates.cottheme index cb7b19c68..8789b7085 100644 --- a/CotEditor/Themes/Dendrobates.cottheme +++ b/CotEditor/Themes/Dendrobates.cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#000000" + "attributes" : { + "color" : "#577c03" + }, + "background" : { + "color" : "#ffffff" + }, + "characters" : { + "color" : "#1780a3" + }, + "commands" : { + "color" : "#bf4a26" + }, + "comments" : { + "color" : "#991a22" }, "insertionPoint" : { "color" : "#000000", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#b9b9b9" }, - "background" : { - "color" : "#ffffff" + "keywords" : { + "color" : "#005493" }, "lineHighlight" : { - "color" : "#f0f0f0" + "color" : "#edededb3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Dendrobates", + "numbers" : { + "color" : "#631a95" }, "selection" : { "color" : "#a7caff", "usesSystemSetting" : true }, - "keywords" : { - "color" : "#005493" + "strings" : { + "color" : "#5a676c" }, - "commands" : { - "color" : "#bf4a26" + "text" : { + "color" : "#000000" }, "types" : { "color" : "#b07e00" }, - "attributes" : { - "color" : "#577c03" - }, - "variables" : { - "color" : "#a63777" - }, "values" : { "color" : "#177368" }, - "numbers" : { - "color" : "#631a95" - }, - "strings" : { - "color" : "#5a676c" - }, - "characters" : { - "color" : "#1780a3" - }, - "comments" : { - "color" : "#991a22" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#a63777" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Kawazu.cottheme b/CotEditor/Themes/Kawazu.cottheme index 2ee4fa276..7c1bd159f 100644 --- a/CotEditor/Themes/Kawazu.cottheme +++ b/CotEditor/Themes/Kawazu.cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#000000" + "attributes" : { + "color" : "#718129" + }, + "background" : { + "color" : "#ffffff" + }, + "characters" : { + "color" : "#7f3561" + }, + "commands" : { + "color" : "#62480c" + }, + "comments" : { + "color" : "#4d7551" }, "insertionPoint" : { "color" : "#000000", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#929292" }, - "background" : { - "color" : "#ffffff" + "keywords" : { + "color" : "#244364" }, "lineHighlight" : { - "color" : "#edf4ec" + "color" : "#eaf2e9b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Kawazu", + "numbers" : { + "color" : "#327e8c" }, "selection" : { "color" : "#dde6d9", "usesSystemSetting" : false }, - "keywords" : { - "color" : "#244364" + "strings" : { + "color" : "#686868" }, - "commands" : { - "color" : "#62480c" + "text" : { + "color" : "#000000" }, "types" : { "color" : "#843d2c" }, - "attributes" : { - "color" : "#718129" - }, - "variables" : { - "color" : "#4f3081" - }, "values" : { "color" : "#253384" }, - "numbers" : { - "color" : "#327e8c" - }, - "strings" : { - "color" : "#686868" - }, - "characters" : { - "color" : "#7f3561" - }, - "comments" : { - "color" : "#4d7551" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#4f3081" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Lakritz.cottheme b/CotEditor/Themes/Lakritz.cottheme index 2be6ab199..c362e9ed0 100644 --- a/CotEditor/Themes/Lakritz.cottheme +++ b/CotEditor/Themes/Lakritz.cottheme @@ -1,6 +1,18 @@ { - "text" : { - "color" : "#dfdfdf" + "attributes" : { + "color" : "#eba129" + }, + "background" : { + "color" : "#141414" + }, + "characters" : { + "color" : "#81c9d8" + }, + "commands" : { + "color" : "#be6ef0" + }, + "comments" : { + "color" : "#828282" }, "insertionPoint" : { "color" : "#ffffff", @@ -9,50 +21,39 @@ "invisibles" : { "color" : "#6c6c6c" }, - "background" : { - "color" : "#141414" + "keywords" : { + "color" : "#fed80a" }, "lineHighlight" : { - "color" : "#262626" + "color" : "#292929b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Lakritz", + "numbers" : { + "color" : "#83b519" }, "selection" : { "color" : "#403e26", "usesSystemSetting" : false }, - "keywords" : { - "color" : "#fed80a" + "strings" : { + "color" : "#469db2" }, - "commands" : { - "color" : "#be6ef0" + "text" : { + "color" : "#dfdfdf" }, "types" : { "color" : "#fc76d1" }, - "attributes" : { - "color" : "#eba129" - }, - "variables" : { - "color" : "#e24f56" - }, "values" : { "color" : "#1ca693" }, - "numbers" : { - "color" : "#83b519" - }, - "strings" : { - "color" : "#469db2" - }, - "characters" : { - "color" : "#81c9d8" - }, - "comments" : { - "color" : "#828282" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#e24f56" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Mono.cottheme b/CotEditor/Themes/Mono.cottheme index 167bf3310..69a9c1b7f 100644 --- a/CotEditor/Themes/Mono.cottheme +++ b/CotEditor/Themes/Mono.cottheme @@ -1,57 +1,59 @@ { - "text" : { - "color" : "#000000" - }, - "insertionPoint" : { - "color" : "#000000" - }, - "invisibles" : { - "color" : "#cbcbcb" + "attributes" : { + "color" : "#797979" }, "background" : { "color" : "#ffffff" }, - "lineHighlight" : { - "color" : "#ebebeb" - }, - "selection" : { - "color" : "#a7caff", - "usesSystemSetting" : true - }, - "keywords" : { - "color" : "#515151" + "characters" : { + "color" : "#797979" }, "commands" : { "color" : "#797979" }, - "types" : { - "color" : "#797979" - }, - "attributes" : { - "color" : "#797979" - }, - "variables" : { - "color" : "#797979" - }, - "values" : { - "color" : "#797979" - }, - "numbers" : { - "color" : "#797979" - }, - "strings" : { - "color" : "#797979" - }, - "characters" : { - "color" : "#797979" - }, "comments" : { "color" : "#929292" }, + "insertionPoint" : { + "color" : "#000000", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#cbcbcb" + }, + "keywords" : { + "color" : "#515151" + }, + "lineHighlight" : { + "color" : "#e8e8e8b3" + }, "metadata" : { "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Mono", + "numbers" : { + "color" : "#797979" + }, + "selection" : { + "color" : "#a7caff", + "usesSystemSetting" : true + }, + "strings" : { + "color" : "#797979" + }, + "text" : { + "color" : "#000000" + }, + "types" : { + "color" : "#797979" + }, + "values" : { + "color" : "#797979" + }, + "variables" : { + "color" : "#797979" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Note.cottheme b/CotEditor/Themes/Note.cottheme index e5a120395..bfd4a542e 100644 --- a/CotEditor/Themes/Note.cottheme +++ b/CotEditor/Themes/Note.cottheme @@ -1,57 +1,59 @@ { - "text" : { - "color" : "#1d1d1d" - }, - "insertionPoint" : { - "color" : "#6c5e14" - }, - "invisibles" : { - "color" : "#b2aa73" + "attributes" : { + "color" : "#9a0080" }, "background" : { "color" : "#f5f4e2" }, + "characters" : { + "color" : "#815903" + }, + "commands" : { + "color" : "#2c329d" + }, + "comments" : { + "color" : "#878054" + }, + "insertionPoint" : { + "color" : "#6c5e14", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#b2aa73" + }, + "keywords" : { + "color" : "#176f10" + }, "lineHighlight" : { - "color" : "#ece4a8" + "color" : "#ebe2a2b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Note", + "numbers" : { + "color" : "#b18205" }, "selection" : { "color" : "#ebd74e", "usesSystemSetting" : false }, - "keywords" : { - "color" : "#176f10" + "strings" : { + "color" : "#a2222a" }, - "commands" : { - "color" : "#2c329d" + "text" : { + "color" : "#1d1d1d" }, "types" : { "color" : "#5c7f03" }, - "attributes" : { - "color" : "#9a0080" - }, - "variables" : { - "color" : "#0e608d" - }, "values" : { "color" : "#db5300" }, - "numbers" : { - "color" : "#b18205" - }, - "strings" : { - "color" : "#a2222a" - }, - "characters" : { - "color" : "#815903" - }, - "comments" : { - "color" : "#878054" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#0e608d" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Printen.cottheme b/CotEditor/Themes/Printen.cottheme index 0cd6c66ae..01018a32e 100644 --- a/CotEditor/Themes/Printen.cottheme +++ b/CotEditor/Themes/Printen.cottheme @@ -1,57 +1,59 @@ { - "text" : { - "color" : "#b1a9a2" - }, - "insertionPoint" : { - "color" : "#b1a9a2" - }, - "invisibles" : { - "color" : "#806761" + "attributes" : { + "color" : "#965b63" }, "background" : { "color" : "#252316" }, + "characters" : { + "color" : "#b07fb0" + }, + "commands" : { + "color" : "#c15757" + }, + "comments" : { + "color" : "#7f6a54" + }, + "insertionPoint" : { + "color" : "#b1a9a2", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#806761" + }, + "keywords" : { + "color" : "#af7f36" + }, "lineHighlight" : { - "color" : "#373023" + "color" : "#3b3324b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Printen", + "numbers" : { + "color" : "#698888" }, "selection" : { "color" : "#665643", "usesSystemSetting" : false }, - "keywords" : { - "color" : "#af7f36" + "strings" : { + "color" : "#988570" }, - "commands" : { - "color" : "#c15757" + "text" : { + "color" : "#b1a9a2" }, "types" : { "color" : "#af9931" }, - "attributes" : { - "color" : "#965b63" - }, - "variables" : { - "color" : "#6c7e93" - }, "values" : { "color" : "#688745" }, - "numbers" : { - "color" : "#698888" - }, - "strings" : { - "color" : "#988570" - }, - "characters" : { - "color" : "#b07fb0" - }, - "comments" : { - "color" : "#7f6a54" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#6c7e93" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Pulse.cottheme b/CotEditor/Themes/Pulse.cottheme index 9f3cf8d73..a5608b8da 100644 --- a/CotEditor/Themes/Pulse.cottheme +++ b/CotEditor/Themes/Pulse.cottheme @@ -1,57 +1,59 @@ { - "text" : { - "color" : "#b9b9b9" - }, - "insertionPoint" : { - "color" : "#b4bfc0" - }, - "invisibles" : { - "color" : "#576f7e" + "attributes" : { + "color" : "#9ab239" }, "background" : { "color" : "#222e36" }, - "lineHighlight" : { - "color" : "#2c3b44" - }, - "selection" : { - "color" : "#3B596c", - "usesSystemSetting" : false - }, - "keywords" : { - "color" : "#7ba8e0" + "characters" : { + "color" : "#60aec0" }, "commands" : { "color" : "#bf865d" }, + "comments" : { + "color" : "#7f94a1" + }, + "insertionPoint" : { + "color" : "#b4bfc0", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#576f7e" + }, + "keywords" : { + "color" : "#7ba8e0" + }, + "lineHighlight" : { + "color" : "#2f404ab3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Pulse", + "numbers" : { + "color" : "#9795e2" + }, + "selection" : { + "color" : "#3b596c", + "usesSystemSetting" : false + }, + "strings" : { + "color" : "#97bac6" + }, + "text" : { + "color" : "#b9b9b9" + }, "types" : { "color" : "#c9b562" }, - "attributes" : { - "color" : "#9aB239" - }, - "variables" : { - "color" : "#d77e82" - }, "values" : { "color" : "#b17bb9" }, - "numbers" : { - "color" : "#9795e2" - }, - "strings" : { - "color" : "#97baC6" - }, - "characters" : { - "color" : "#60aec0" - }, - "comments" : { - "color" : "#7f94a1" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#d77e82" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Resinifictrix (Dark).cottheme b/CotEditor/Themes/Resinifictrix (Dark).cottheme new file mode 100644 index 000000000..4c44a1828 --- /dev/null +++ b/CotEditor/Themes/Resinifictrix (Dark).cottheme @@ -0,0 +1,59 @@ +{ + "attributes" : { + "color" : "#3e9c99" + }, + "background" : { + "color" : "#282828" + }, + "characters" : { + "color" : "#bf9c63" + }, + "commands" : { + "color" : "#d05961" + }, + "comments" : { + "color" : "#7e999d" + }, + "insertionPoint" : { + "color" : "#336f80", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#6c7d807f" + }, + "keywords" : { + "color" : "#67aad1" + }, + "lineHighlight" : { + "color" : "#333636b3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Resinifictrix (Dark)", + "numbers" : { + "color" : "#8a87c8" + }, + "selection" : { + "color" : "#4d5e66", + "usesSystemSetting" : false + }, + "strings" : { + "color" : "#a17850" + }, + "text" : { + "color" : "#c5c5c5" + }, + "types" : { + "color" : "#dd8251" + }, + "values" : { + "color" : "#af6da2" + }, + "variables" : { + "color" : "#91a336" + } +} \ No newline at end of file diff --git a/CotEditor/Themes/Resinifictrix.cottheme b/CotEditor/Themes/Resinifictrix.cottheme index e7213999c..759f135e0 100644 --- a/CotEditor/Themes/Resinifictrix.cottheme +++ b/CotEditor/Themes/Resinifictrix.cottheme @@ -1,57 +1,59 @@ { - "text" : { - "color" : "#3d3d3d" - }, - "insertionPoint" : { - "color" : "#0e6e87" - }, - "invisibles" : { - "color" : "#9baeb1" + "attributes" : { + "color" : "#157975" }, "background" : { "color" : "#ffffff" }, + "characters" : { + "color" : "#7f5108" + }, + "commands" : { + "color" : "#ac2932" + }, + "comments" : { + "color" : "#46696f" + }, + "insertionPoint" : { + "color" : "#0e6e87", + "usesSystemSetting" : false + }, + "invisibles" : { + "color" : "#9baeb1" + }, + "keywords" : { + "color" : "#0f4a6c" + }, "lineHighlight" : { - "color" : "#ebeeef" + "color" : "#e6ebedb3" + }, + "metadata" : { + "author" : "1024jp", + "description" : "CotEditor bundled theme.", + "distributionURL" : "https:\/\/coteditor.com", + "license" : "Same as CotEditor (Apache, ver.2)" + }, + "name" : "Resinifictrix", + "numbers" : { + "color" : "#373289" }, "selection" : { "color" : "#c2d1d7", "usesSystemSetting" : false }, - "keywords" : { - "color" : "#0f4a6c" + "strings" : { + "color" : "#5c4631" }, - "commands" : { - "color" : "#ac2932" + "text" : { + "color" : "#3d3d3d" }, "types" : { "color" : "#bc5720" }, - "attributes" : { - "color" : "#157975" - }, - "variables" : { - "color" : "#5f7107" - }, "values" : { "color" : "#691257" }, - "numbers" : { - "color" : "#373289" - }, - "characters" : { - "color" : "#7f5108" - }, - "strings" : { - "color" : "#5c4631" - }, - "comments" : { - "color" : "#46696f" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme." + "variables" : { + "color" : "#5f7107" } -} +} \ No newline at end of file diff --git a/CotEditor/Themes/Solarized (Dark).cottheme b/CotEditor/Themes/Solarized (Dark).cottheme deleted file mode 100644 index f55c7b30f..000000000 --- a/CotEditor/Themes/Solarized (Dark).cottheme +++ /dev/null @@ -1,57 +0,0 @@ -{ - "text" : { - "color" : "#839496" - }, - "insertionPoint" : { - "color" : "#839496" - }, - "invisibles" : { - "color" : "#073642" - }, - "background" : { - "color" : "#002b36" - }, - "lineHighlight" : { - "color" : "#073642" - }, - "selection" : { - "color" : "#586e75", - "usesSystemSetting" : false - }, - "keywords" : { - "color" : "#859900" - }, - "commands" : { - "color" : "#cb4b16" - }, - "types" : { - "color" : "#268bd2" - }, - "attributes" : { - "color" : "#6c71c4" - }, - "variables" : { - "color" : "#b58900" - }, - "values" : { - "color" : "#d33682" - }, - "numbers" : { - "color" : "#dc322f" - }, - "strings" : { - "color" : "#2aa198" - }, - "characters" : { - "color" : "#dc322f" - }, - "comments" : { - "color" : "#586e75" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme, which is based on Solarized color scheme by Ethan Schoonover." - } -} diff --git a/CotEditor/Themes/Solarized (Light).cottheme b/CotEditor/Themes/Solarized (Light).cottheme deleted file mode 100644 index bbf8d0a8c..000000000 --- a/CotEditor/Themes/Solarized (Light).cottheme +++ /dev/null @@ -1,57 +0,0 @@ -{ - "text" : { - "color" : "#657b83" - }, - "insertionPoint" : { - "color" : "#657b83" - }, - "invisibles" : { - "color" : "#eee8d5" - }, - "background" : { - "color" : "#fdf6e3" - }, - "lineHighlight" : { - "color" : "#eee8d5" - }, - "selection" : { - "color" : "#93a1a1", - "usesSystemSetting" : false - }, - "keywords" : { - "color" : "#859900" - }, - "commands" : { - "color" : "#cb4b16" - }, - "types" : { - "color" : "#268bd2" - }, - "attributes" : { - "color" : "#6c71c4" - }, - "variables" : { - "color" : "#b58900" - }, - "values" : { - "color" : "#d33682" - }, - "numbers" : { - "color" : "#dc322f" - }, - "strings" : { - "color" : "#2aa198" - }, - "characters" : { - "color" : "#dc322f" - }, - "comments" : { - "color" : "#93a1a1" - }, - "metadata" : { - "author" : "1024jp", - "distributionURL" : "https://coteditor.com", - "license" : "Same as CotEditor (Apache, ver.2)", - "description" : "CotEditor bundled theme, which is based on Solarized color scheme by Ethan Schoonover." - } -} diff --git a/CotEditor/mul.lproj/Main.xcstrings b/CotEditor/mul.lproj/Main.xcstrings index 768d8ff7a..5f6870eee 100644 --- a/CotEditor/mul.lproj/Main.xcstrings +++ b/CotEditor/mul.lproj/Main.xcstrings @@ -1345,6 +1345,84 @@ } } }, + "6fK-Zl-wdN.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Select\"; ObjectID = \"6fK-Zl-wdN\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auswählen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Select" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seleccionar" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sélectionner" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seleziona" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "選択" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Selecteer" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Selecionar" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seç" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "选择" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "選擇" + } + } + } + }, "7NX-1r-Wq7.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Replace Quotes\"; ObjectID = \"7NX-1r-Wq7\";", "extractionState" : "extracted_with_value", @@ -10417,6 +10495,84 @@ } } }, + "Bm6-Jh-1mk.title" : { + "comment" : "Class = \"NSMenu\"; title = \"Select\"; ObjectID = \"Bm6-Jh-1mk\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auswählen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Select" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seleccionar" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sélectionner" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seleziona" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "選択" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Selecteer" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Selecionar" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Seç" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "选择" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "選擇" + } + } + } + }, "bnD-BP-sPi.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Replace\"; ObjectID = \"bnD-BP-sPi\";", "extractionState" : "extracted_with_value", @@ -12769,6 +12925,90 @@ } } }, + "h4w-vU-ArK.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Multiple Replace\"; ObjectID = \"h4w-vU-ArK\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vícenásobné nahrazení" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Multipel ersetzen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Multiple Replace" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Multiple Replace" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Reemplazo múltiple" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Remplacements multiples" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sostituzione multipla" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "複数置換" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vervang meerdere" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Substituição Múltipla" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Çoklu Değiştir" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "多重替换" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "多重取代" + } + } + } + }, "hBJ-Ge-278.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Trim Trailing Whitespace\"; ObjectID = \"hBJ-Ge-278\";", "extractionState" : "extracted_with_value", @@ -13357,6 +13597,36 @@ } } }, + "hYd-RY-2dc.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Select Enclosing Symbols\"; ObjectID = \"hYd-RY-2dc\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Einschließende Symbole auswählen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Select Enclosing Symbols" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Enclosing Symbols" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "内包する記号を選択" + } + } + } + }, "HZ8-G2-f8d.title" : { "comment" : "Class = \"NSMenu\"; title = \"Speech\"; ObjectID = \"HZ8-G2-f8d\";", "extractionState" : "extracted_with_value", @@ -13945,6 +14215,36 @@ } } }, + "jkL-Tg-nug.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Split Selection by Lines\"; ObjectID = \"jkL-Tg-nug\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Auswahl in Zeilen teilen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Split Selection by Lines" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Split Selection by Lines" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "選択範囲を行に分割" + } + } + } + }, "jQ7-hG-AjA.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Horizontal\"; ObjectID = \"jQ7-hG-AjA\";", "extractionState" : "extracted_with_value", @@ -14701,6 +15001,36 @@ } } }, + "m1A-zz-piF.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Select Column Down\"; ObjectID = \"m1A-zz-piF\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte unten auswählen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Select Column Down" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column Down" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "下の列を選択" + } + } + } + }, "M1N-Fg-Bo4.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"CotEditor Scripting Guide\"; ObjectID = \"M1N-Fg-Bo4\";", "extractionState" : "extracted_with_value", @@ -15374,84 +15704,84 @@ } }, "o7K-sI-KJA.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"Multiple Replace…\"; ObjectID = \"o7K-sI-KJA\";", + "comment" : "Class = \"NSMenuItem\"; title = \"Manage Multiple Replace…\"; ObjectID = \"o7K-sI-KJA\";", "extractionState" : "extracted_with_value", "localizations" : { "cs" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Vícenásobné nahrazení…" } }, "de" : { "stringUnit" : { "state" : "translated", - "value" : "Multipel ersetzen …" + "value" : "Multiple Ersetzungen verwalten …" } }, "en" : { "stringUnit" : { "state" : "new", - "value" : "Multiple Replace…" + "value" : "Manage Multiple Replace…" } }, "en-GB" : { "stringUnit" : { "state" : "translated", - "value" : "Multiple Replace…" + "value" : "Manage Multiple Replace…" } }, "es" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Reemplazo múltiple…" } }, "fr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Remplacements multiples…" } }, "it" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Sostituzione multipla…" } }, "ja" : { "stringUnit" : { "state" : "translated", - "value" : "複数置換…" + "value" : "複数置換を管理…" } }, "nl" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Verplaats meerdere…" } }, "pt" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Substituição Múltipla…" } }, "tr" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "Çoklu Değiştir…" } }, "zh-Hans" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "多重替换…" } }, "zh-Hant" : { "stringUnit" : { - "state" : "translated", + "state" : "needs_review", "value" : "多重取代⋯" } } @@ -15541,6 +15871,90 @@ } } }, + "OaT-5c-bMY.title" : { + "comment" : "Class = \"NSMenu\"; title = \"Multiple Replace\"; ObjectID = \"OaT-5c-bMY\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vícenásobné nahrazení" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Multipel ersetzen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Multiple Replace" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Multiple Replace" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Reemplazo múltiple" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Remplacements multiples" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Sostituzione multipla" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "複数置換" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Vervang meerdere" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Substituição Múltipla" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Çoklu Değiştir" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "多重替换" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "多重取代" + } + } + } + }, "OLa-Mb-rXS.title" : { "comment" : "Class = \"NSMenu\"; title = \"CotEditor Scripting Guide\"; ObjectID = \"OLa-Mb-rXS\";", "extractionState" : "extracted_with_value", @@ -19321,6 +19735,36 @@ } } }, + "yVo-uW-dls.title" : { + "comment" : "Class = \"NSMenuItem\"; title = \"Select Column Up\"; ObjectID = \"yVo-uW-dls\";", + "extractionState" : "extracted_with_value", + "localizations" : { + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spalte oben auswählen" + } + }, + "en" : { + "stringUnit" : { + "state" : "new", + "value" : "Select Column Up" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Select Column Up" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "上の列を選択" + } + } + } + }, "ZrR-aL-1eB.title" : { "comment" : "Class = \"NSMenuItem\"; title = \"Make Lower Case\"; ObjectID = \"ZrR-aL-1eB\";", "extractionState" : "extracted_with_value", diff --git a/CotEditor/mul.lproj/NavigationBar.xcstrings b/CotEditor/mul.lproj/NavigationBar.xcstrings deleted file mode 100644 index 4509d4e0a..000000000 --- a/CotEditor/mul.lproj/NavigationBar.xcstrings +++ /dev/null @@ -1,342 +0,0 @@ -{ - "sourceLanguage" : "en", - "strings" : { - "aUE-uy-XLQ.title" : { - "comment" : "Class = \"NSTextFieldCell\"; title = \"Extracting Outline…\"; ObjectID = \"aUE-uy-XLQ\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extrahování osnovy…" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Gliederung extrahieren …" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Extracting Outline…" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extracting Outline…" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extraer esquema…" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Récupération de la structure…" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Estrazione Outline…" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "アウトラインを抽出中…" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Omtrek uitpakken…" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extraindo Plano…" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ana hat çıkarılıyor…" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "提取提纲…" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "提取提綱⋯" - } - } - } - }, - "Bmo-XE-CCn.ibShadowedToolTip" : { - "comment" : "Class = \"NSButton\"; ibShadowedToolTip = \"Close split editor\"; ObjectID = \"Bmo-XE-CCn\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Zavřít rozdělený editor" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Geteilten Editor schließen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Close split editor" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Close split editor" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Cerrar Editor dividido" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Fermer l’éditeur divisé" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Chiudi l’editor diviso" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "分割されたエディタを閉じる" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sluit gesplitste bewerker" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Feche o editor dividido" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Bölünmüş düzenleyiciyi kapat" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "关闭分栏编辑器" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "關閉分欄編輯器" - } - } - } - }, - "IhS-iT-L1i.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"Stack Editors Vertically\"; ObjectID = \"IhS-iT-L1i\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Stack Editors Vertically" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Stapel bewerkers verticaal" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - } - } - }, - "syK-XU-x2I.ibShadowedToolTip" : { - "comment" : "Class = \"NSButton\"; ibShadowedToolTip = \"Split editor\"; ObjectID = \"syK-XU-x2I\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Rozdělit editor" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Editor teilen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Split editor" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Split editor" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dividir editor" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Diviser l’éditeur" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dividi Editor" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "エディタを分割" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Splits bewerker" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Editor dividido" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Düzenleyiciyi böl" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "分栏显示" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "分欄顯示" - } - } - } - } - }, - "version" : "1.0" -} \ No newline at end of file diff --git a/CotEditor/mul.lproj/SnippetsPane.xcstrings b/CotEditor/mul.lproj/SnippetsPane.xcstrings deleted file mode 100644 index c1f1a39e5..000000000 --- a/CotEditor/mul.lproj/SnippetsPane.xcstrings +++ /dev/null @@ -1,2022 +0,0 @@ -{ - "sourceLanguage" : "en", - "strings" : { - "541.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"Insert Variable\"; ObjectID = \"541\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Vložit proměnnou" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Variable hinzufügen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Insert Variable" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insert Variable" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertar variable" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insérer une variable" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inserisci Variabile" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "変数を挿入" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Voeg variabele in" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inserir Variável" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Değişken Ekle" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "插入变量" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "插入變數" - } - } - } - }, - "3332.title" : { - "comment" : "Class = \"NSTextFieldCell\"; title = \"Insertion format:\"; ObjectID = \"3332\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formát vložení:" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Format des einzufügenden Textes:" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Insertion format:" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertion format:" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertar formato:" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Texte à insérer :" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formato di inserimento:" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "挿入フォーマット:" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Invoegformaat:" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formato da inserção:" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ekleme biçimi:" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "按格式插入：" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "按格式插入：" - } - } - } - }, - "cMF-G3-bl6.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Name\"; ObjectID = \"cMF-G3-bl6\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Název" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Name" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Name" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Name" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nombre" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nom" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nome" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "名前" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Naam" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nome" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ad" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "名字" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "名稱" - } - } - } - }, - "EZ8-ej-Fvr.ibShadowedNoSelectionPlaceholder" : { - "comment" : "Class = \"CocoaBindingsConnection\"; ibShadowedNoSelectionPlaceholder = \"Select a snippet to edit.\"; ObjectID = \"EZ8-ej-Fvr\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Vyberte fragment kódu, který chcete upravit." - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Wähle ein zu bearbeitendes Snippet." - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Select a snippet to edit." - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Select a snippet to edit." - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Selecciona un fragmento para editar." - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sélectionnez un snippet à éditer" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Selezionare un ritaglio da modificare." - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "スニペットを選択してください。" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Selecteer een knipsel om te bewerken." - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Selecione um snippet para editar." - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Düzenlenecek bir kod parçacığı seçin." - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "选择片段进行编辑。" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "請選擇一個程式碼片段以編輯。" - } - } - } - }, - "FAF-cL-AAk.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Extensions\"; ObjectID = \"FAF-cL-AAk\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Přípony" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Suffixe" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Extensions" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensions" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensiones" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensions" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Estensioni" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "拡張子" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensies" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensões" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Uzantılar" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "扩展名" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "副檔名" - } - } - } - }, - "FAF-cL-AAk.headerToolTip" : { - "comment" : "Class = \"NSTableColumn\"; headerToolTip = \"File extensions of dropped file (comma separated).\"; ObjectID = \"FAF-cL-AAk\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Přípony přetažených souborů (oddělené čárkou)." - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dateisuffixe der abgelegte Datei (Komma-getrennt)." - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "File extensions of dropped file (comma separated)." - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "File extensions of dropped file (comma separated)." - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensiones de nombre de archivo del archivo eliminado (separado de comas)." - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensions des fichiers déposés (séparées par une virgule)." - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Estensione dei file rilasciati (valori separati da virgola)." - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "ドロップされるファイルの拡張子（カンマ区切り）" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Bestandsextensies van neergezet bestand (door komma's gescheiden)." - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Extensões de arquivo do arquivo solto (separadas por vírgulas)." - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Bırakılan dosyanın uzantıları (virgülle ayrılmış)." - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "拖拽文件的文件扩展名 (逗号分隔)。" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "拖拽檔案的副檔名 (逗號分隔)。" - } - } - } - }, - "hY5-0z-qN6.ibShadowedIsNilPlaceholder" : { - "comment" : "Class = \"CocoaBindingsConnection\"; ibShadowedIsNilPlaceholder = \"All\"; ObjectID = \"hY5-0z-qN6\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Všechny" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alle" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "All" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "All" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todo" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Toutes" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tutti" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "すべて" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alles" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todas" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tümü" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - } - } - }, - "Jku-3h-OhR.title" : { - "comment" : "Class = \"NSViewController\"; title = \"Command\"; ObjectID = \"Jku-3h-OhR\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Příkaz" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Befehl" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Command" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Command" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Comando" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Commande" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Comando" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "コマンド" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Commando" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Comando" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Komut" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "命令" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "指令" - } - } - } - }, - "oXA-8G-UhH.ibShadowedToolTips[0]" : { - "comment" : "Class = \"NSSegmentedCell\"; oXA-8G-UhH.ibShadowedToolTips[0] = \"Add\"; ObjectID = \"oXA-8G-UhH\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Přidat" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Hinzufügen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Add" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Add" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Añadir" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nouveau" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Aggiungi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "追加" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Voeg toe" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Adicione" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ekle" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "添加" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "新增" - } - } - } - }, - "oXA-8G-UhH.ibShadowedToolTips[1]" : { - "comment" : "Class = \"NSSegmentedCell\"; oXA-8G-UhH.ibShadowedToolTips[1] = \"Delete\"; ObjectID = \"oXA-8G-UhH\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Odebrat" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Löschen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Delete" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Delete" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Borrar" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Supprimer" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Rimuovi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "削除" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Verwijder" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Apague" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sil" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "删除" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "刪除" - } - } - } - }, - "p2m-Qi-6k3.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Description\"; ObjectID = \"p2m-Qi-6k3\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Popis" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Beschreibung" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Description" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Description" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Descripción" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Description" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Descrizione" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "説明" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Beschrijving" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Descrição" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Açıklama" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "描述" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "描述" - } - } - } - }, - "PaR-eN-FFs.title" : { - "comment" : "Class = \"NSTextFieldCell\"; title = \"Insertion format:\"; ObjectID = \"PaR-eN-FFs\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formát vložení:" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Format des einzufügenden Textes:" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Insertion format:" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertion format:" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertar formato:" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Texte à insérer :" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formato di inserimento:" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "挿入フォーマット:" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Invoegformaat:" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Formato da inserção:" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ekleme biçimi:" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "按格式插入：" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "按格式插入：" - } - } - } - }, - "pbJ-4Q-CE2.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Syntax\"; ObjectID = \"pbJ-4Q-CE2\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Syntax" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintaxis" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintassi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "シンタックス" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxis" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintaxe" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sözdizim" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "语法" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "文法定義" - } - } - } - }, - "pSX-EP-15e.title" : { - "comment" : "Class = \"NSButtonCell\"; title = \"Restore Defaults\"; ObjectID = \"pSX-EP-15e\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Výchozí hodnoty" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Standard wiederherstellen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Restore Defaults" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Restore Defaults" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Restaurar valores por omisión" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Réglages par défaut" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ripristina default" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "デフォルトに戻す" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Herstel standaardinstellingen" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Restaurar Padrões" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Saptanmışlara Dön" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "恢复默认" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "回復預設值" - } - } - } - }, - "RqT-x4-YbN.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Syntax\"; ObjectID = \"RqT-x4-YbN\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Syntax" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintaxis" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintassi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "シンタックス" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxis" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintaxe" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sözdizim" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "语法" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "文法定義" - } - } - } - }, - "RqT-x4-YbN.headerToolTip" : { - "comment" : "Class = \"NSTableColumn\"; headerToolTip = \"Syntax in which this file drop setting is used.\"; ObjectID = \"RqT-x4-YbN\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe, ve kterém se používá toto nastavení při přetažení souboru." - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax, in der diese Datei-Drop-Einstellung benutzt wird." - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Syntax in which this file drop setting is used." - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntax in which this file drop setting is used." - } - }, - "es" : { - "stringUnit" : { - "state" : "needs_review", - "value" : "Sintaxis utilizada si se utiliza soltar archivos." - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxe pour laquelle cette configuration de fichiers déposés est utilisée." - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintassi che utilizza le impostazioni del file trascinato nell’editor." - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "このファイルドロップ定義を使用するシンタックス" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Syntaxis waarin deze instelling voor het neerzetten van bestanden wordt gebruikt." - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sintaxe na qual essa configuração de soltar arquivo é usada." - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Bu dosya bırakma ayarının etkinleştirildiği sözdizim" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "语法中的文件拖拽设置已启用" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "該檔案拽入設定所使用的文法定義。" - } - } - } - }, - "rUw-Mw-hR2.title" : { - "comment" : "Class = \"NSTextFieldCell\"; title = \"SHORTCUT WARNING MESSAGE\"; ObjectID = \"rUw-Mw-hR2\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "SHORTCUT WARNING MESSAGE" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - } - } - }, - "t2r-oN-Xpf.ibShadowedToolTips[0]" : { - "comment" : "Class = \"NSSegmentedCell\"; t2r-oN-Xpf.ibShadowedToolTips[0] = \"Add\"; ObjectID = \"t2r-oN-Xpf\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Přidat" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Hinzufügen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Add" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Add" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Añadir" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Nouveau" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Aggiungi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "追加" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Voeg toe" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Adicione" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Ekle" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "添加" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "新增" - } - } - } - }, - "t2r-oN-Xpf.ibShadowedToolTips[1]" : { - "comment" : "Class = \"NSSegmentedCell\"; t2r-oN-Xpf.ibShadowedToolTips[1] = \"Delete\"; ObjectID = \"t2r-oN-Xpf\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Odebrat" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Löschen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Delete" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Delete" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Borrar" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Supprimer" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Rimuovi" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "削除" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Verwijder" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Apague" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sil" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "删除" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "刪除" - } - } - } - }, - "UtY-fi-jOg.title" : { - "comment" : "Class = \"NSViewController\"; title = \"File Drop\"; ObjectID = \"UtY-fi-jOg\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Přetažení souboru" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Datei-Drop" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "File Drop" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "File Drop" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Entrega de archivos" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "File Drop" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "File trascinato" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "ファイルドロップ" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Bestand neerzetten" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Arquivos Soltos" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Dosya Bırak" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "文件拖拽" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "檔案拖拽" - } - } - } - }, - "vOg-Tt-3ZZ.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"Insert Variable\"; ObjectID = \"vOg-Tt-3ZZ\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Vložit proměnnou" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Variable hinzufügen" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Insert Variable" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insert Variable" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insertar variable" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Insérer une variable" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inserisci Variabile" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "変数を挿入" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Voeg variabele in" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Inserir Variável" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Değişken Ekle" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "插入变量" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "插入變數" - } - } - } - }, - "vXM-oG-cI7.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"All\"; ObjectID = \"vXM-oG-cI7\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Vše" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alle" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "All" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "All" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todo" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Toutes" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tutti" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "すべて" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alle" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todas" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tümü" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - } - } - }, - "W3Z-PB-IUJ.title" : { - "comment" : "Class = \"NSMenuItem\"; title = \"All\"; ObjectID = \"W3Z-PB-IUJ\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Všechny" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alle" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "All" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "All" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todo" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Toutes" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tutti" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "すべて" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Alle" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Todos" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tümü" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "全部" - } - } - } - }, - "wer-OB-X46.headerCell.title" : { - "comment" : "Class = \"NSTableColumn\"; headerCell.title = \"Key\"; ObjectID = \"wer-OB-X46\";", - "extractionState" : "extracted_with_value", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "Zkratka" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "Taste" - } - }, - "en" : { - "stringUnit" : { - "state" : "new", - "value" : "Key" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "Key" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "Teclas" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Raccourci" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "Tasto" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "キー" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "Sleutel" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "Teclas" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "Düğme" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "按键" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "按鍵" - } - } - } - } - }, - "version" : "1.0" -} \ No newline at end of file diff --git a/CotEditor/mul.lproj/ThemeView.xcstrings b/CotEditor/mul.lproj/ThemeListView.xcstrings similarity index 100% rename from CotEditor/mul.lproj/ThemeView.xcstrings rename to CotEditor/mul.lproj/ThemeListView.xcstrings diff --git a/Packages/Libraries/Package.swift b/Packages/Libraries/Package.swift new file mode 100644 index 000000000..9e9bc3622 --- /dev/null +++ b/Packages/Libraries/Package.swift @@ -0,0 +1,41 @@ +// swift-tools-version: 6.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "Libraries", + defaultLocalization: "en", + platforms: [ + .macOS(.v14), + ], + products: [ + .library(name: "CharacterInfo", targets: ["CharacterInfo"]), + .library(name: "Defaults", targets: ["Defaults"]), + .library(name: "FileEncoding", targets: ["FileEncoding"]), + .library(name: "FilePermissions", targets: ["FilePermissions"]), + .library(name: "UnicodeNormalization", targets: ["UnicodeNormalization"]), + + .library(name: "Shortcut", targets: ["Shortcut"]), + ], + targets: [ + .target(name: "CharacterInfo", resources: [.process("Resources")]), + .testTarget(name: "CharacterInfoTests", dependencies: ["CharacterInfo"]), + + .target(name: "Defaults"), + .testTarget(name: "DefaultsTests", dependencies: ["Defaults"]), + + .target(name: "FileEncoding", resources: [.process("Resources")]), + .testTarget(name: "FileEncodingTests", dependencies: ["FileEncoding"], resources: [.process("Resources")]), + + .target(name: "FilePermissions"), + .testTarget(name: "FilePermissionsTests", dependencies: ["FilePermissions"]), + + .target(name: "UnicodeNormalization"), + .testTarget(name: "UnicodeNormalizationTests", dependencies: ["UnicodeNormalization"]), + + .target(name: "Shortcut", resources: [.process("Resources")]), + .testTarget(name: "ShortcutTests", dependencies: ["Shortcut"]), + ], + swiftLanguageVersions: [.v6] +) diff --git a/Packages/Libraries/Sources/CharacterInfo/CharacterInfo.swift b/Packages/Libraries/Sources/CharacterInfo/CharacterInfo.swift new file mode 100644 index 000000000..a3c891188 --- /dev/null +++ b/Packages/Libraries/Sources/CharacterInfo/CharacterInfo.swift @@ -0,0 +1,71 @@ +// +// CharacterInfo.swift +// CharacterInfo +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2015-11-19. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +public struct CharacterInfo: Sendable { + + // MARK: Public Properties + + public var character: Character + + + // MARK: Public Methods + + public init(character: Character) { + + self.character = character + } + + + public var pictureCharacter: Character? { + + self.character.unicodeScalars.count == 1 // ignore CRLF + ? self.character.unicodeScalars.first?.pictureRepresentation.flatMap(Character.init) + : nil + } + + + public var isComplex: Bool { + + self.character.unicodeScalars.count > 1 && !self.isVariant + } + + + public var isVariant: Bool { + + (self.character.unicodeScalars.count == 2 && + self.character.unicodeScalars.last?.variantDescription != nil) + } +} + + + +extension CharacterInfo: CustomStringConvertible { + + public var description: String { + + String(self.character) + } +} diff --git a/CotEditor/Localizables/Character.xcstrings b/Packages/Libraries/Sources/CharacterInfo/Resources/Localizable.xcstrings similarity index 88% rename from CotEditor/Localizables/Character.xcstrings rename to Packages/Libraries/Sources/CharacterInfo/Resources/Localizable.xcstrings index 66189e5fd..b97e61b82 100644 --- a/CotEditor/Localizables/Character.xcstrings +++ b/Packages/Libraries/Sources/CharacterInfo/Resources/Localizable.xcstrings @@ -1,83 +1,6 @@ { "sourceLanguage" : "en", "strings" : { - "" : { - "comment" : "%lld is always 2 or more.", - "localizations" : { - "cs" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "de" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "en-GB" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "es" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "fr" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "it" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "ja" : { - "stringUnit" : { - "state" : "translated", - "value" : "<%lld字から成る文字>" - } - }, - "nl" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "pt" : { - "stringUnit" : { - "state" : "translated", - "value" : "" - } - }, - "tr" : { - "stringUnit" : { - "state" : "translated", - "value" : "%lld karakterden oluşan bir harf" - } - }, - "zh-Hans" : { - "stringUnit" : { - "state" : "translated", - "value" : "<包含有%lld个字符>" - } - }, - "zh-Hant" : { - "stringUnit" : { - "state" : "translated", - "value" : "<包含有%lld個字元>" - } - } - } - }, "EmojiVariationSelector.emoji.label" : { "comment" : "label for the Unicode variation selector that forces to draw the character in the emoji style", "extractionState" : "extracted_with_value", diff --git a/CotEditor/cs.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/cs.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/cs.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/cs.lproj/UnicodeBlock.strings diff --git a/CotEditor/de.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/de.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/de.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/de.lproj/UnicodeBlock.strings diff --git a/CotEditor/en-GB.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/en-GB.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/en-GB.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/en-GB.lproj/UnicodeBlock.strings diff --git a/CotEditor/es.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/es.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/es.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/es.lproj/UnicodeBlock.strings diff --git a/CotEditor/fr.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/fr.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/fr.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/fr.lproj/UnicodeBlock.strings diff --git a/CotEditor/it.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/it.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/it.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/it.lproj/UnicodeBlock.strings diff --git a/CotEditor/ja.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/ja.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/ja.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/ja.lproj/UnicodeBlock.strings diff --git a/CotEditor/nl.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/nl.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/nl.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/nl.lproj/UnicodeBlock.strings diff --git a/CotEditor/pt.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/pt.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/pt.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/pt.lproj/UnicodeBlock.strings diff --git a/CotEditor/tr.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/tr.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/tr.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/tr.lproj/UnicodeBlock.strings diff --git a/CotEditor/zh-Hans.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/zh-Hans.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/zh-Hans.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/zh-Hans.lproj/UnicodeBlock.strings diff --git a/CotEditor/zh-Hant.lproj/UnicodeBlock.strings b/Packages/Libraries/Sources/CharacterInfo/Resources/zh-Hant.lproj/UnicodeBlock.strings similarity index 100% rename from CotEditor/zh-Hant.lproj/UnicodeBlock.strings rename to Packages/Libraries/Sources/CharacterInfo/Resources/zh-Hant.lproj/UnicodeBlock.strings diff --git a/Packages/Libraries/Sources/CharacterInfo/SkinToneModifier.swift b/Packages/Libraries/Sources/CharacterInfo/SkinToneModifier.swift new file mode 100644 index 000000000..5221344bd --- /dev/null +++ b/Packages/Libraries/Sources/CharacterInfo/SkinToneModifier.swift @@ -0,0 +1,66 @@ +// +// SkinToneModifier.swift +// CharacterInfo +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2015-11-19. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +enum SkinToneModifier: UInt32, Sendable { + + case type12 = 0x1F3FB // 🏻 Light + case type3 = 0x1F3FC // 🏼 Medium Light + case type4 = 0x1F3FD // 🏽 Medium + case type5 = 0x1F3FE // 🏾 Medium Dark + case type6 = 0x1F3FF // 🏿 Dark + + + var label: String { + + switch self { + case .type12: + String(localized: "SkinToneModifier.type12.label", + defaultValue: "Skin Tone I-II", + bundle: .module, + comment: "label for Unicode emoji modifier applying the skin tone to the character") + case .type3: + String(localized: "SkinToneModifier.type3.label", + defaultValue: "Skin Tone III", + bundle: .module, + comment: "label for Unicode emoji modifier applying the skin tone to the character") + case .type4: + String(localized: "SkinToneModifier.type4.label", + defaultValue: "Skin Tone IV", + bundle: .module, + comment: "label for Unicode emoji modifier applying the skin tone to the character") + case .type5: + String(localized: "SkinToneModifier.type5.label", + defaultValue: "Skin Tone V", + bundle: .module, + comment: "label for Unicode emoji modifier applying the skin tone to the character") + case .type6: + String(localized: "SkinToneModifier.type6.label", + defaultValue: "Skin Tone VI", + bundle: .module, + comment: "label for Unicode emoji modifier applying the skin tone to the character") + } + } +} diff --git a/CotEditor/Sources/Unicode.GeneralCategory.swift b/Packages/Libraries/Sources/CharacterInfo/Unicode.GeneralCategory.swift similarity index 97% rename from CotEditor/Sources/Unicode.GeneralCategory.swift rename to Packages/Libraries/Sources/CharacterInfo/Unicode.GeneralCategory.swift index ff3f4707f..6b0e6798c 100644 --- a/CotEditor/Sources/Unicode.GeneralCategory.swift +++ b/Packages/Libraries/Sources/CharacterInfo/Unicode.GeneralCategory.swift @@ -1,5 +1,6 @@ // // Unicode.GeneralCategory.swift +// CharacterInfo // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2023 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +24,7 @@ // limitations under the License. // -extension Unicode.GeneralCategory { +public extension Unicode.GeneralCategory { /// The long value aliases for the category. var longName: String { diff --git a/CotEditor/Sources/Unicode.Scalar+ControlCharacter.swift b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+ControlCharacter.swift similarity index 96% rename from CotEditor/Sources/Unicode.Scalar+ControlCharacter.swift rename to Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+ControlCharacter.swift index 6611dd000..193bb152c 100644 --- a/CotEditor/Sources/Unicode.Scalar+ControlCharacter.swift +++ b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+ControlCharacter.swift @@ -1,5 +1,6 @@ // // Unicode.Scalar+ControlCharacter.swift +// CharacterInfo // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2023 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,9 +24,9 @@ // limitations under the License. // -extension Unicode.Scalar { +public extension Unicode.Scalar { - /// Alternate picture character for invisible control character. + /// The alternate picture character for invisible control character if available. var pictureRepresentation: Unicode.Scalar? { switch self.value { diff --git a/CotEditor/Sources/Unicode.Scalar+Information.swift b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Information.swift similarity index 95% rename from CotEditor/Sources/Unicode.Scalar+Information.swift rename to Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Information.swift index dc7d14fb5..ea2343a55 100644 --- a/CotEditor/Sources/Unicode.Scalar+Information.swift +++ b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Information.swift @@ -1,5 +1,6 @@ // // Unicode.Scalar+Information.swift +// CharacterInfo // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2023 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +24,7 @@ // limitations under the License. // -extension Unicode.Scalar { +public extension Unicode.Scalar { /// Code point string in format like `U+000F`. var codePoint: String { @@ -76,7 +77,7 @@ extension Unicode.Scalar { .replacing(/\ ([A-Z])$/) { "-\($0.1)" } .replacing("Description", with: "Desc.") - return String(localized: String.LocalizationValue(key), table: "UnicodeBlock") + return String(localized: String.LocalizationValue(key), table: "UnicodeBlock", bundle: .module) } } @@ -84,7 +85,7 @@ extension Unicode.Scalar { // MARK: - -extension UTF32.CodeUnit { +public extension UTF32.CodeUnit { /// Returns Unicode name. /// diff --git a/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Variant.swift b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Variant.swift new file mode 100644 index 000000000..a4d3a2e21 --- /dev/null +++ b/Packages/Libraries/Sources/CharacterInfo/Unicode.Scalar+Variant.swift @@ -0,0 +1,73 @@ +// +// Unicode.Scalar+Variant.swift +// CharacterInfo +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2015-11-19. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +public extension Unicode.Scalar { + + var variantDescription: String? { + + if let selector = EmojiVariationSelector(rawValue: self.value) { + selector.label + + } else if let modifier = SkinToneModifier(rawValue: self.value) { + modifier.label + + } else if self.properties.isVariationSelector { + String(localized: "Variant", + bundle: .module, + comment: "label for general Unicode variation selectors") + + } else { + nil + } + } +} + + + +// MARK: - + +private enum EmojiVariationSelector: UInt32 { + + case text = 0xFE0E + case emoji = 0xFE0F + + + var label: String { + + switch self { + case .emoji: + String(localized: "EmojiVariationSelector.emoji.label", + defaultValue: "Emoji Style", + bundle: .module, + comment: "label for the Unicode variation selector that forces to draw the character in the emoji style") + case .text: + String(localized: "EmojiVariationSelector.text.label", + defaultValue: "Text Style", + bundle: .module, + comment: "label for the Unicode variation selector that forces to draw the character in the text style") + } + } +} diff --git a/CotEditor/Sources/Unicode.UTF32.CodeUnit+BlockName.swift b/Packages/Libraries/Sources/CharacterInfo/Unicode.UTF32.CodeUnit+BlockName.swift similarity index 99% rename from CotEditor/Sources/Unicode.UTF32.CodeUnit+BlockName.swift rename to Packages/Libraries/Sources/CharacterInfo/Unicode.UTF32.CodeUnit+BlockName.swift index 48b609f6f..096d1ec00 100644 --- a/CotEditor/Sources/Unicode.UTF32.CodeUnit+BlockName.swift +++ b/Packages/Libraries/Sources/CharacterInfo/Unicode.UTF32.CodeUnit+BlockName.swift @@ -1,5 +1,6 @@ // // Unicode.UTF32.CodeUnit+BlockName.swift +// CharacterInfo // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2018-2023 1024jp +// © 2018-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,7 +24,7 @@ // limitations under the License. // -extension Unicode.UTF32.CodeUnit { +public extension Unicode.UTF32.CodeUnit { /// Unicode block name. /// diff --git a/CotEditor/Sources/AppStorage+DefaultKey.swift b/Packages/Libraries/Sources/Defaults/AppStorage+DefaultKey.swift similarity index 98% rename from CotEditor/Sources/AppStorage+DefaultKey.swift rename to Packages/Libraries/Sources/Defaults/AppStorage+DefaultKey.swift index 0b6c0a668..101768c18 100644 --- a/CotEditor/Sources/AppStorage+DefaultKey.swift +++ b/Packages/Libraries/Sources/Defaults/AppStorage+DefaultKey.swift @@ -1,5 +1,6 @@ // // AppStorage+DefaultKey.swift +// Defaults // // CotEditor // https://coteditor.com @@ -25,7 +26,7 @@ import SwiftUI -extension AppStorage { +public extension AppStorage { /// Creates a property that can read and write to a boolean user default. /// diff --git a/CotEditor/Sources/DefaultInitializable.swift b/Packages/Libraries/Sources/Defaults/DefaultInitializable.swift similarity index 87% rename from CotEditor/Sources/DefaultInitializable.swift rename to Packages/Libraries/Sources/Defaults/DefaultInitializable.swift index 5407bbd2c..17543aea9 100644 --- a/CotEditor/Sources/DefaultInitializable.swift +++ b/Packages/Libraries/Sources/Defaults/DefaultInitializable.swift @@ -1,5 +1,6 @@ // // DefaultInitializable.swift +// Defaults // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2018-2019 1024jp +// © 2018-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,13 +24,13 @@ // limitations under the License. // -protocol DefaultInitializable: RawRepresentable { +public protocol DefaultInitializable: RawRepresentable, Sendable { static var defaultValue: Self { get } } -extension DefaultInitializable { +public extension DefaultInitializable { /// Non-optional initializer by setting the defaultValue if failed. init(_ rawValue: RawValue?) { diff --git a/CotEditor/Sources/DefaultKey.swift b/Packages/Libraries/Sources/Defaults/DefaultKey.swift similarity index 70% rename from CotEditor/Sources/DefaultKey.swift rename to Packages/Libraries/Sources/Defaults/DefaultKey.swift index c90361aab..bf5996176 100644 --- a/CotEditor/Sources/DefaultKey.swift +++ b/Packages/Libraries/Sources/Defaults/DefaultKey.swift @@ -1,5 +1,6 @@ // // DefaultKey.swift +// Defaults // // CotEditor // https://coteditor.com @@ -23,46 +24,52 @@ // limitations under the License. // -class DefaultKeys: RawRepresentable, Hashable, CustomStringConvertible { +public class DefaultKeys: RawRepresentable { - final let rawValue: String + public final let rawValue: String - required init(rawValue: String) { + public required init(rawValue: String) { self.rawValue = rawValue } - init(_ key: String) { + public init(_ key: String) { self.rawValue = key } +} + + +extension DefaultKeys: Hashable { - final func hash(into hasher: inout Hasher) { + public final func hash(into hasher: inout Hasher) { hasher.combine(self.rawValue) } +} + + +extension DefaultKeys: CustomStringConvertible { - - final var description: String { + public final var description: String { self.rawValue } } - -class DefaultKey: DefaultKeys, @unchecked Sendable { +public class DefaultKey: DefaultKeys, @unchecked Sendable { - enum Error: Swift.Error { + public enum Error: Swift.Error, Sendable { case invalidValue } - func newValue(from value: Any?) throws -> Value { + public func newValue(from value: Any?) throws -> Value { // -> The second Optional cast is important for in case if `Value` is already an optional type. guard let newValue = value as? Value ?? Optional.none as? Value else { @@ -76,9 +83,9 @@ class DefaultKey: DefaultKeys, @unchecked Sendable { // Specialize RawRepresentable types to use them for UserDefaults observation using UserDefaults.Publisher. // Otherwise, the type inference for RawRepresentable doesn't work unfortunately. -final class RawRepresentableDefaultKey: DefaultKey, @unchecked Sendable where Value: RawRepresentable { +public final class RawRepresentableDefaultKey: DefaultKey, @unchecked Sendable where Value: RawRepresentable { - override func newValue(from value: Any?) throws -> Value { + public override func newValue(from value: Any?) throws -> Value { guard let newValue = (value as? Value.RawValue).flatMap(Value.init) else { throw Error.invalidValue diff --git a/CotEditor/Sources/UserDefaults+DefaultKey.swift b/Packages/Libraries/Sources/Defaults/UserDefaults+DefaultKey.swift similarity index 99% rename from CotEditor/Sources/UserDefaults+DefaultKey.swift rename to Packages/Libraries/Sources/Defaults/UserDefaults+DefaultKey.swift index a8fd01c6e..b7a77476b 100644 --- a/CotEditor/Sources/UserDefaults+DefaultKey.swift +++ b/Packages/Libraries/Sources/Defaults/UserDefaults+DefaultKey.swift @@ -1,5 +1,6 @@ // // UserDefaults+DefaultKey.swift +// Defaults // // CotEditor // https://coteditor.com @@ -25,7 +26,7 @@ import Foundation -extension UserDefaults { +public extension UserDefaults { /// Restores default value to the factory default. /// diff --git a/CotEditor/Sources/UserDefaults.Publisher.swift b/Packages/Libraries/Sources/Defaults/UserDefaults.Publisher.swift similarity index 94% rename from CotEditor/Sources/UserDefaults.Publisher.swift rename to Packages/Libraries/Sources/Defaults/UserDefaults.Publisher.swift index 158c073a2..f62e5d3ee 100644 --- a/CotEditor/Sources/UserDefaults.Publisher.swift +++ b/Packages/Libraries/Sources/Defaults/UserDefaults.Publisher.swift @@ -1,5 +1,6 @@ // // UserDefaults.Publisher.swift +// Defaults // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2023 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ import Combine import Foundation -extension UserDefaults { +public extension UserDefaults { /// Publishes values when the value identified by a default key changes. /// @@ -43,11 +44,11 @@ extension UserDefaults { struct Publisher: Combine.Publisher { - typealias Output = Value - typealias Failure = Never + public typealias Output = Value + public typealias Failure = Never - // MARK: Public Properties + // MARK: Internal Properties let userDefaults: UserDefaults let key: DefaultKey @@ -57,7 +58,7 @@ extension UserDefaults { // MARK: Publisher Methods - func receive(subscriber: some Combine.Subscriber) { + public func receive(subscriber: some Combine.Subscriber) { let subscription = Subscription(subscriber: subscriber, userDefaults: self.userDefaults, key: self.key) diff --git a/CotEditor/Sources/FileEncoding.swift b/Packages/Libraries/Sources/FileEncoding/FileEncoding.swift similarity index 63% rename from CotEditor/Sources/FileEncoding.swift rename to Packages/Libraries/Sources/FileEncoding/FileEncoding.swift index 7f63e085a..a53c14d0d 100644 --- a/CotEditor/Sources/FileEncoding.swift +++ b/Packages/Libraries/Sources/FileEncoding/FileEncoding.swift @@ -1,5 +1,6 @@ // // FileEncoding.swift +// FileEncoding // // CotEditor // https://coteditor.com @@ -23,23 +24,34 @@ // limitations under the License. // -struct FileEncoding: Equatable, Hashable { +import Foundation + +public struct FileEncoding: Equatable, Hashable, Sendable { - static let utf8 = FileEncoding(encoding: .utf8) + public static let utf8 = FileEncoding(encoding: .utf8) - var encoding: String.Encoding - var withUTF8BOM: Bool = false + public var encoding: String.Encoding + public var withUTF8BOM: Bool = false + + + public init(encoding: String.Encoding, withUTF8BOM: Bool = false) { + + assert(encoding == .utf8 || !withUTF8BOM) + + self.encoding = encoding + self.withUTF8BOM = withUTF8BOM + } /// Human-readable encoding name by taking UTF-8 BOM into consideration. /// /// The `withUTF8BOM` flag is just ignored when `encoding` is other than UTF-8. - var localizedName: String { + public var localizedName: String { let localizedName = String.localizedName(of: self.encoding) return (self.encoding == .utf8 && self.withUTF8BOM) - ? String(localized: "\(localizedName) with BOM", comment: "encoding name for UTF-8 with BOM (%@ is the system localized name for UTF-8)") + ? String(localized: "\(localizedName) with BOM", bundle: .module, comment: "encoding name for UTF-8 with BOM (%@ is the system localized name for UTF-8)") : localizedName } } diff --git a/Packages/Libraries/Sources/FileEncoding/Resources/Localizable.xcstrings b/Packages/Libraries/Sources/FileEncoding/Resources/Localizable.xcstrings new file mode 100644 index 000000000..386a78616 --- /dev/null +++ b/Packages/Libraries/Sources/FileEncoding/Resources/Localizable.xcstrings @@ -0,0 +1,83 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "%@ with BOM" : { + "comment" : "encoding name for UTF-8 with BOM (%@ is the system localized name for UTF-8)", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ s BOM" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ mit BOM" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ with BOM" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ con BOM" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ avec BOM" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ con BOM" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@BOM付き" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : " (%@) met BOM" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ com BOM" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "BOM ile %@" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ with BOM" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "%@ with BOM" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Sources/String+Encoding.swift b/Packages/Libraries/Sources/FileEncoding/String+Encoding.swift similarity index 58% rename from CotEditor/Sources/String+Encoding.swift rename to Packages/Libraries/Sources/FileEncoding/String+Encoding.swift index a5e668fef..c1516e73f 100644 --- a/CotEditor/Sources/String+Encoding.swift +++ b/Packages/Libraries/Sources/FileEncoding/String+Encoding.swift @@ -1,5 +1,6 @@ // // String+Encodings.swift +// FileEncoding // // CotEditor // https://coteditor.com @@ -26,67 +27,35 @@ import Foundation -extension Unicode { +public extension String { - /// Byte order mark. - enum BOM: CaseIterable { + enum DecodingStrategy: Sendable { - case utf8 - case utf32BigEndian - case utf32LittleEndian - case utf16BigEndian - case utf16LittleEndian + case automatic(String.DetectionOptions) + case specific(String.Encoding) + } + + + struct DetectionOptions: Sendable { + + /// The list of encodings to test the encoding. + public var candidates: [String.Encoding] + + /// The text encoding read from the file's extended attributes. + public var xattrEncoding: String.Encoding? + + /// Maximal length to scan encoding declaration, or `nil` it not refer to encoding tag in the file content. + public var tagScanLength: Int? - var sequence: [UInt8] { + public init(candidates: [String.Encoding], xattrEncoding: String.Encoding? = nil, tagScanLength: Int? = nil) { - switch self { - case .utf8: [0xEF, 0xBB, 0xBF] - case .utf32BigEndian: [0x00, 0x00, 0xFE, 0xFF] - case .utf32LittleEndian: [0xFF, 0xFE, 0x00, 0x00] - case .utf16BigEndian: [0xFE, 0xFF] - case .utf16LittleEndian: [0xFF, 0xFE] - } - } - - - var encoding: String.Encoding { - - switch self { - case .utf8: .utf8 - case .utf32BigEndian, .utf32LittleEndian: .utf32 - case .utf16BigEndian, .utf16LittleEndian: .utf16 - } + self.candidates = candidates + self.xattrEncoding = xattrEncoding + self.tagScanLength = tagScanLength } } -} - - - -// MARK: - - -extension String.Encoding { - init(cfEncoding: CFStringEncoding) { - - self.init(rawValue: CFStringConvertEncodingToNSStringEncoding(cfEncoding)) - } - - - // MARK: Public Methods - - /// The name of the IANA registry “charset” that is the closest mapping to the encoding. - var ianaCharSetName: String? { - - let cfEncoding = CFStringConvertNSStringEncodingToEncoding(self.rawValue) - - return CFStringConvertEncodingToIANACharSetName(cfEncoding) as String? - } -} - - - -extension String { /// An array of the encodings that strings support in the application’s environment. `nil` for section divider. static let sortedAvailableStringEncodings: [String.Encoding?] = Self.availableStringEncodings @@ -105,16 +74,82 @@ extension String { } - /// Decodes data and remove UTF-8 BOM if exists. + /// Reads file at the given URL and initialize. /// - /// cf. - init?(bomCapableData data: Data, encoding: String.Encoding) { + /// - Parameters: + /// - data: The content file. + /// - decodingStrategy: The text encoding to read the file. + static func string(data: Data, decodingStrategy: String.DecodingStrategy) throws(CocoaError) -> (String, FileEncoding) { - let bom = Unicode.BOM.utf8.sequence - let hasUTF8WithBOM = (encoding == .utf8 && data.starts(with: bom)) - let bomFreeData = hasUTF8WithBOM ? data[bom.count...] : data + // decode Data to String + let content: String + let encoding: String.Encoding + switch decodingStrategy { + case .automatic(let options): + (content, encoding) = try String.string(data: data, options: options) + case .specific(let readingEncoding): + guard let string = String(bomCapableData: data, encoding: readingEncoding) else { + throw CocoaError(.fileReadInapplicableStringEncoding, userInfo: [NSStringEncodingErrorKey: readingEncoding.rawValue]) + } + content = string + encoding = readingEncoding + } - self.init(data: bomFreeData, encoding: encoding) + let hasUTF8BOM = (encoding == .utf8) && data.starts(with: Unicode.BOM.utf8.sequence) + let fileEncoding = FileEncoding(encoding: encoding, withUTF8BOM: hasUTF8BOM) + + return (content, fileEncoding) + } + + + /// Converts Yen signs (`U+00A5`) in consideration of the encoding. + /// + /// - Parameter encoding: The text encoding to keep compatibility. + /// - Returns: A new string converted all Yen signs. + func convertYenSign(for encoding: String.Encoding) -> String { + + "¥".canBeConverted(to: encoding) ? self : self.replacing("¥", with: "\\") + } +} + + +extension String { + + /// Reads string from data by detecting the text encoding automatically. + /// + /// - Parameters: + /// - data: The data to encode. + /// - options: The options for encoding detection. + /// - Returns: The decoded string and used encoding. + static func string(data: Data, options: String.DetectionOptions) throws(CocoaError) -> (String, String.Encoding) { + + // try interpreting with xattr encoding + if let xattrEncoding = options.xattrEncoding { + // just trust xattr encoding if content is empty + if let string = data.isEmpty ? "" : String(bomCapableData: data, encoding: xattrEncoding) { + return (string, xattrEncoding) + } + } + + // detect encoding from data + var usedEncoding: String.Encoding? + let string = try String(data: data, suggestedEncodings: options.candidates, usedEncoding: &usedEncoding) + + // try reading encoding declaration and take priority of it if it seems well + if let scanLength = options.tagScanLength, + let scannedEncoding = string.scanEncodingDeclaration(upTo: scanLength), + options.candidates.contains(scannedEncoding), + scannedEncoding != usedEncoding, + let string = String(bomCapableData: data, encoding: scannedEncoding) + { + return (string, scannedEncoding) + } + + guard let encoding = usedEncoding else { + throw CocoaError(.fileReadUnknownStringEncoding) + } + + return (string, encoding) } @@ -125,7 +160,7 @@ extension String { /// - suggestedEncodings: The prioritized list of encoding candidates. /// - usedEncoding: The encoding used to interpret the data. /// - Throws: `CocoaError(.fileReadUnknownStringEncoding)` - init(data: Data, suggestedEncodings: [String.Encoding], usedEncoding: inout String.Encoding?) throws { + init(data: Data, suggestedEncodings: [String.Encoding], usedEncoding: inout String.Encoding?) throws(CocoaError) { // detect encoding from so-called "magic numbers" for bom in Unicode.BOM.allCases { @@ -152,8 +187,18 @@ extension String { } + /// Decodes data and remove UTF-8 BOM if exists. + /// + /// cf. + init?(bomCapableData data: Data, encoding: String.Encoding) { + + let bom = Unicode.BOM.utf8.sequence + let hasUTF8WithBOM = (encoding == .utf8 && data.starts(with: bom)) + let bomFreeData = hasUTF8WithBOM ? data[bom.count...] : data + + self.init(data: bomFreeData, encoding: encoding) + } - // MARK: Public Methods /// Scans an possible encoding declaration in the string. /// @@ -177,61 +222,4 @@ extension String { return String.Encoding(cfEncoding: cfEncoding) } - - - /// Converts Yen signs (`U+00A5`) in consideration of the encoding. - /// - /// - Parameter encoding: The text encoding to keep compatibility. - /// - Returns: A new string converted all Yen signs. - func convertYenSign(for encoding: String.Encoding) -> String { - - "¥".canBeConverted(to: encoding) ? self : self.replacing("¥", with: "\\") - } -} - - - -// MARK: - Xattr Encoding - -extension Data { - - /// Decodes `com.apple.TextEncoding` extended file attribute to encoding. - var decodingXattrEncoding: String.Encoding? { - - guard let string = String(data: self, encoding: .ascii) else { return nil } - - let components = string.split(separator: ";") - - guard - let cfEncoding: CFStringEncoding = if let cfEncodingNumber = components[safe: 1] { - UInt32(cfEncodingNumber) - } else if let ianaCharSetName = components[safe: 0] { - CFStringConvertIANACharSetNameToEncoding(ianaCharSetName as CFString) - } else { - nil - }, - cfEncoding != kCFStringEncodingInvalidId - else { return nil } - - return String.Encoding(cfEncoding: cfEncoding) - } -} - - -extension String.Encoding { - - /// Encodes encoding to data for `com.apple.TextEncoding` extended file attribute. - var xattrEncodingData: Data? { - - let cfEncoding = CFStringConvertNSStringEncodingToEncoding(self.rawValue) - - guard - cfEncoding != kCFStringEncodingInvalidId, - let ianaCharSetName = CFStringConvertEncodingToIANACharSetName(cfEncoding) - else { return nil } - - let string = String(format: "%@;%u", ianaCharSetName as String, cfEncoding) - - return string.data(using: .ascii) - } } diff --git a/Packages/Libraries/Sources/FileEncoding/String.Encoding+Xattr.swift b/Packages/Libraries/Sources/FileEncoding/String.Encoding+Xattr.swift new file mode 100644 index 000000000..b222a6e48 --- /dev/null +++ b/Packages/Libraries/Sources/FileEncoding/String.Encoding+Xattr.swift @@ -0,0 +1,70 @@ +// +// String.Encoding+Xattr.swift +// FileEncoding +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2020-08-07. +// +// --------------------------------------------------------------------------- +// +// © 2020-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +public extension String.Encoding { + + /// Encodes encoding to data for `com.apple.TextEncoding` extended file attribute. + var xattrEncodingData: Data? { + + let cfEncoding = CFStringConvertNSStringEncodingToEncoding(self.rawValue) + + guard + cfEncoding != kCFStringEncodingInvalidId, + let ianaCharSetName = CFStringConvertEncodingToIANACharSetName(cfEncoding) + else { return nil } + + let string = String(format: "%@;%u", ianaCharSetName as String, cfEncoding) + + return string.data(using: .ascii) + } +} + + +public extension Data { + + /// Decodes `com.apple.TextEncoding` extended file attribute to encoding. + var decodingXattrEncoding: String.Encoding? { + + guard let string = String(data: self, encoding: .ascii) else { return nil } + + let components = string.split(separator: ";") + + guard + let cfEncoding: CFStringEncoding = if components.count >= 2 { + UInt32(components[1]) + } else if let ianaCharSetName = components.first { + CFStringConvertIANACharSetNameToEncoding(ianaCharSetName as CFString) + } else { + nil + }, + cfEncoding != kCFStringEncodingInvalidId + else { return nil } + + return String.Encoding(cfEncoding: cfEncoding) + } +} diff --git a/Packages/Libraries/Sources/FileEncoding/String.Encoding.swift b/Packages/Libraries/Sources/FileEncoding/String.Encoding.swift new file mode 100644 index 000000000..f94566dcd --- /dev/null +++ b/Packages/Libraries/Sources/FileEncoding/String.Encoding.swift @@ -0,0 +1,44 @@ +// +// String.Encodings.swift +// FileEncoding +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2016-01-16. +// +// --------------------------------------------------------------------------- +// +// © 2014-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +public extension String.Encoding { + + init(cfEncoding: CFStringEncoding) { + + self.init(rawValue: CFStringConvertEncodingToNSStringEncoding(cfEncoding)) + } + + + /// The name of the IANA registry “charset” that is the closest mapping to the encoding. + var ianaCharSetName: String? { + + let cfEncoding = CFStringConvertNSStringEncodingToEncoding(self.rawValue) + + return CFStringConvertEncodingToIANACharSetName(cfEncoding) as String? + } +} diff --git a/Packages/Libraries/Sources/FileEncoding/Unicode+BOM.swift b/Packages/Libraries/Sources/FileEncoding/Unicode+BOM.swift new file mode 100644 index 000000000..a9fd44c4e --- /dev/null +++ b/Packages/Libraries/Sources/FileEncoding/Unicode+BOM.swift @@ -0,0 +1,60 @@ +// +// Unicode+BOM.swift +// FileEncoding +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2016-01-16. +// +// --------------------------------------------------------------------------- +// +// © 2014-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +public extension Unicode { + + /// Byte order mark. + enum BOM: Sendable, CaseIterable { + + case utf8 + case utf32BigEndian + case utf32LittleEndian + case utf16BigEndian + case utf16LittleEndian + + + public var sequence: [UInt8] { + + switch self { + case .utf8: [0xEF, 0xBB, 0xBF] + case .utf32BigEndian: [0x00, 0x00, 0xFE, 0xFF] + case .utf32LittleEndian: [0xFF, 0xFE, 0x00, 0x00] + case .utf16BigEndian: [0xFE, 0xFF] + case .utf16LittleEndian: [0xFF, 0xFE] + } + } + + + var encoding: String.Encoding { + + switch self { + case .utf8: .utf8 + case .utf32BigEndian, .utf32LittleEndian: .utf32 + case .utf16BigEndian, .utf16LittleEndian: .utf16 + } + } + } +} diff --git a/CotEditor/Sources/FilePermissions+FormatStyle.swift b/Packages/Libraries/Sources/FilePermissions/FilePermissions+FormatStyle.swift similarity index 89% rename from CotEditor/Sources/FilePermissions+FormatStyle.swift rename to Packages/Libraries/Sources/FilePermissions/FilePermissions+FormatStyle.swift index e5be55868..8b65fa1bd 100644 --- a/CotEditor/Sources/FilePermissions+FormatStyle.swift +++ b/Packages/Libraries/Sources/FilePermissions/FilePermissions+FormatStyle.swift @@ -1,5 +1,6 @@ // // FilePermissions+FormatStyle.swift +// FilePermissions // // CotEditor // https://coteditor.com @@ -25,11 +26,11 @@ import Foundation -extension FilePermissions { +public extension FilePermissions { - struct FormatStyle: Codable { + struct FormatStyle: Codable, Sendable { - enum Style: Codable { + public enum Style: Codable, Sendable { /// Octal presentation like `644` case octal @@ -56,7 +57,7 @@ extension FilePermissions { extension FilePermissions.FormatStyle: FormatStyle { /// Formats permission number to human readable permission expression. - func format(_ value: FilePermissions) -> String { + public func format(_ value: FilePermissions) -> String { switch self.style { case .octal: @@ -70,7 +71,7 @@ extension FilePermissions.FormatStyle: FormatStyle { } -extension FilePermissions { +public extension FilePermissions { /// Converts `self` to its textual representation. /// @@ -92,7 +93,7 @@ extension FilePermissions { } -extension FormatStyle where Self == FilePermissions.FormatStyle { +public extension FormatStyle where Self == FilePermissions.FormatStyle { /// Format POSIX permission mask in String. static var filePermissions: FilePermissions.FormatStyle { self.filePermissions() } diff --git a/CotEditor/Sources/FilePermissions.swift b/Packages/Libraries/Sources/FilePermissions/FilePermissions.swift similarity index 71% rename from CotEditor/Sources/FilePermissions.swift rename to Packages/Libraries/Sources/FilePermissions/FilePermissions.swift index 8c52881ec..11d8b7510 100644 --- a/CotEditor/Sources/FilePermissions.swift +++ b/Packages/Libraries/Sources/FilePermissions/FilePermissions.swift @@ -1,5 +1,6 @@ // // FilePermissions.swift +// FilePermissions // // CotEditor // https://coteditor.com @@ -23,23 +24,29 @@ // limitations under the License. // -struct FilePermissions: Equatable { +public struct FilePermissions: Equatable, Sendable { - var user: Permission - var group: Permission - var others: Permission + public var user: Permission + public var group: Permission + public var others: Permission - struct Permission: OptionSet { + public struct Permission: OptionSet, Sendable { - let rawValue: Int16 + public let rawValue: Int16 - static let read = Self(rawValue: 0b100) - static let write = Self(rawValue: 0b010) - static let execute = Self(rawValue: 0b001) + public static let read = Self(rawValue: 0b100) + public static let write = Self(rawValue: 0b010) + public static let execute = Self(rawValue: 0b001) - var symbolic: String { + public init(rawValue: Int16) { + + self.rawValue = rawValue + } + + + public var symbolic: String { (self.contains(.read) ? "r" : "-") + (self.contains(.write) ? "w" : "-") + @@ -48,7 +55,7 @@ struct FilePermissions: Equatable { } - init(mask: Int16) { + public init(mask: Int16) { self.user = Permission(rawValue: (mask & 0b111 << 6) >> 6) self.group = Permission(rawValue: (mask & 0b111 << 3) >> 3) @@ -57,7 +64,7 @@ struct FilePermissions: Equatable { /// The `Int16` value. - var mask: Int16 { + public var mask: Int16 { let userMask = self.user.rawValue << 6 let groupMask = self.group.rawValue << 3 @@ -68,14 +75,14 @@ struct FilePermissions: Equatable { /// The human-readable permission expression like “rwxr--r--”. - var symbolic: String { + public var symbolic: String { self.user.symbolic + self.group.symbolic + self.others.symbolic } /// The octal value expression like “644”. - var octal: String { + public var octal: String { String(self.mask, radix: 8) } @@ -85,7 +92,7 @@ struct FilePermissions: Equatable { extension FilePermissions: CustomStringConvertible { - var description: String { + public var description: String { self.symbolic } diff --git a/Packages/Libraries/Sources/Shortcut/ModifierKey.swift b/Packages/Libraries/Sources/Shortcut/ModifierKey.swift new file mode 100644 index 000000000..bbda2b476 --- /dev/null +++ b/Packages/Libraries/Sources/Shortcut/ModifierKey.swift @@ -0,0 +1,117 @@ +// +// ModifierKey.swift +// Shortcut +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2014-04-20. +// +// --------------------------------------------------------------------------- +// +// © 2004-2007 nakamuxu +// © 2014-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import AppKit.NSEvent + +/// Modifier keys for keyboard shortcut. +/// +/// - Note: The order of cases (control, option, shift, and command) is determined in the HIG. +enum ModifierKey: CaseIterable { + + case control + case option + case shift + case command + case function // This key modifier is reserved for system applications. + + static let validCases: [Self] = Array(Self.allCases[0..<4]) + + + /// NSEvent.ModifierFlags representation. + var mask: NSEvent.ModifierFlags { + + switch self { + case .control: .control + case .option: .option + case .shift: .shift + case .command: .command + case .function: .function + } + } + + + /// Symbol to display in GUI. + var symbol: String { + + switch self { + case .control: "^" + case .option: "⌥" + case .shift: "⇧" + case .command: "⌘" + case .function: Self.supportsGlobeKey ? "🌐︎" : "fn" + } + } + + + /// SF Symbol name to display in GUI. + var symbolName: String { + + switch self { + case .control: "control" + case .option: "option" + case .shift: "shift" + case .command: "command" + case .function: Self.supportsGlobeKey ? "globe" : "fn" + } + } + + + /// Symbol to store. + var keySpecChar: String { + + switch self { + case .control: "^" + case .option: "~" + case .shift: "$" + case .command: "@" + case .function: preconditionFailure("Fn/Globe key cannot be used for custom shortcuts.") + } + } + + + /// Returns `true` if the user keyboard is supposed to have the Globe key. + private static let supportsGlobeKey = { + + let entry = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("AppleHIDKeyboardEventDriverV2")) + defer { IOObjectRelease(entry) } + + guard let property = IORegistryEntryCreateCFProperty(entry, "SupportsGlobeKey" as CFString, kCFAllocatorDefault, 0)?.takeRetainedValue() else { return false } + + return (property as? Int) == 1 + }() +} + + +extension [ModifierKey] { + + /// NSEvent.ModifierFlags representation. + var mask: NSEvent.ModifierFlags { + + self.reduce(into: []) { $0.formUnion($1.mask) } + } +} diff --git a/CotEditor/Sources/NSMenuItem+Shortcut.swift b/Packages/Libraries/Sources/Shortcut/NSMenuItem+Shortcut.swift similarity index 95% rename from CotEditor/Sources/NSMenuItem+Shortcut.swift rename to Packages/Libraries/Sources/Shortcut/NSMenuItem+Shortcut.swift index cbd7d75e2..3bd024c6d 100644 --- a/CotEditor/Sources/NSMenuItem+Shortcut.swift +++ b/Packages/Libraries/Sources/Shortcut/NSMenuItem+Shortcut.swift @@ -1,5 +1,6 @@ // // NSMenuItem+Shortcut.swift +// Shortcut // // CotEditor // https://coteditor.com @@ -8,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,7 +26,7 @@ import AppKit -extension NSMenuItem { +public extension NSMenuItem { final var shortcut: Shortcut? { @@ -41,7 +42,7 @@ extension NSMenuItem { } -extension NSMenu { +public extension NSMenu { /// Finds the menu item that has the given shortcut. /// diff --git a/Packages/Libraries/Sources/Shortcut/Resources/Localizable.xcstrings b/Packages/Libraries/Sources/Shortcut/Resources/Localizable.xcstrings new file mode 100644 index 000000000..8662affd2 --- /dev/null +++ b/Packages/Libraries/Sources/Shortcut/Resources/Localizable.xcstrings @@ -0,0 +1,83 @@ +{ + "sourceLanguage" : "en", + "strings" : { + "Space" : { + "comment" : "keyboard key name", + "localizations" : { + "cs" : { + "stringUnit" : { + "state" : "translated", + "value" : "Mezerník" + } + }, + "de" : { + "stringUnit" : { + "state" : "translated", + "value" : "Leertaste" + } + }, + "en-GB" : { + "stringUnit" : { + "state" : "translated", + "value" : "Space" + } + }, + "es" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espacio" + } + }, + "fr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espace" + } + }, + "it" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spazio" + } + }, + "ja" : { + "stringUnit" : { + "state" : "translated", + "value" : "スペース" + } + }, + "nl" : { + "stringUnit" : { + "state" : "translated", + "value" : "Spatie" + } + }, + "pt" : { + "stringUnit" : { + "state" : "translated", + "value" : "Espaço" + } + }, + "tr" : { + "stringUnit" : { + "state" : "translated", + "value" : "Boşluk" + } + }, + "zh-Hans" : { + "stringUnit" : { + "state" : "translated", + "value" : "空格" + } + }, + "zh-Hant" : { + "stringUnit" : { + "state" : "translated", + "value" : "空格" + } + } + } + } + }, + "version" : "1.0" +} \ No newline at end of file diff --git a/CotEditor/Sources/Shortcut.swift b/Packages/Libraries/Sources/Shortcut/Shortcut.swift similarity index 76% rename from CotEditor/Sources/Shortcut.swift rename to Packages/Libraries/Sources/Shortcut/Shortcut.swift index 4ed640bd2..6c3872f2a 100644 --- a/CotEditor/Sources/Shortcut.swift +++ b/Packages/Libraries/Sources/Shortcut/Shortcut.swift @@ -1,5 +1,6 @@ // // Shortcut.swift +// Shortcut // // CotEditor // https://coteditor.com @@ -26,104 +27,13 @@ import Foundation import AppKit.NSEvent -import IOKit -extension NSEvent.SpecialKey: @unchecked Sendable { } +extension NSEvent.SpecialKey: @retroactive @unchecked Sendable { } - -/// Modifier keys for keyboard shortcut. -/// -/// - Note: The order of cases (control, option, shift, and command) is determined in the HIG. -private enum ModifierKey: CaseIterable { +public struct Shortcut: Sendable { - case control - case option - case shift - case command - case function // This key modifier is reserved for system applications. - - static let validCases: [Self] = Array(Self.allCases[0..<4]) - - - /// NSEvent.ModifierFlags representation. - var mask: NSEvent.ModifierFlags { - - switch self { - case .control: .control - case .option: .option - case .shift: .shift - case .command: .command - case .function: .function - } - } - - - /// Symbol to display in GUI. - var symbol: String { - - switch self { - case .control: "^" - case .option: "⌥" - case .shift: "⇧" - case .command: "⌘" - case .function: Self.supportsGlobeKey ? "🌐︎" : "fn" - } - } - - - /// SF Symbol name to display in GUI. - var symbolName: String { - - switch self { - case .control: "control" - case .option: "option" - case .shift: "shift" - case .command: "command" - case .function: Self.supportsGlobeKey ? "globe" : "fn" - } - } - - - /// Symbol to store. - var keySpecChar: String { - - switch self { - case .control: "^" - case .option: "~" - case .shift: "$" - case .command: "@" - case .function: preconditionFailure("Fn/Globe key cannot be used for custom shortcuts.") - } - } - - - /// Returns `true` if the user keyboard is supposed to have the Globe key. - private static let supportsGlobeKey = { - - let entry = IOServiceGetMatchingService(kIOMainPortDefault, IOServiceMatching("AppleHIDKeyboardEventDriverV2")) - defer { IOObjectRelease(entry) } - - guard let property = IORegistryEntryCreateCFProperty(entry, "SupportsGlobeKey" as CFString, kCFAllocatorDefault, 0)?.takeRetainedValue() else { return false } - - return (property as? Int) == 1 - }() -} - - -private extension [ModifierKey] { - - /// NSEvent.ModifierFlags representation. - var mask: NSEvent.ModifierFlags { - - self.reduce(into: []) { $0.formUnion($1.mask) } - } -} - - -struct Shortcut { - - let keyEquivalent: String - let modifiers: NSEvent.ModifierFlags + public var keyEquivalent: String + public var modifiers: NSEvent.ModifierFlags // MARK: Lifecycle @@ -131,7 +41,7 @@ struct Shortcut { /// Initializes Shortcut directly from a key equivalent character and modifiers. /// /// - Note: This initializer accepts the fn key while the others not. - init?(_ keyEquivalent: String, modifiers: NSEvent.ModifierFlags) { + public init?(_ keyEquivalent: String, modifiers: NSEvent.ModifierFlags) { guard !keyEquivalent.isEmpty else { return nil } @@ -140,10 +50,17 @@ struct Shortcut { } + public init(_ specialKey: NSEvent.SpecialKey, modifiers: NSEvent.ModifierFlags) { + + self.keyEquivalent = String(specialKey.unicodeScalar) + self.modifiers = modifiers + } + + /// Initializes Shortcut from a stored string. /// /// - Parameter keySpecChars: The storable representation. - init?(keySpecChars: String) { + public init?(keySpecChars: String) { guard let keyEquivalent = keySpecChars.last else { return nil } @@ -160,7 +77,7 @@ struct Shortcut { /// Initializes Shortcut from a display representation. /// /// - Parameter string: The shortcut string to display in GUI. - init?(symbolRepresentation string: String) { + public init?(symbolRepresentation string: String) { let components = string.split(whereSeparator: \.isWhitespace) @@ -184,7 +101,7 @@ struct Shortcut { /// Initializes Shortcut from a key down event. /// /// - Parameter event: The key down event. - init?(keyDownEvent event: NSEvent) { + public init?(keyDownEvent event: NSEvent) { assert(event.type == .keyDown) @@ -216,7 +133,7 @@ struct Shortcut { // MARK: Public Methods /// Unique string to store in plist. - var keySpecChars: String { + public var keySpecChars: String { let shortcut = self.normalized let modifierCharacters = ModifierKey.validCases @@ -229,7 +146,7 @@ struct Shortcut { /// Shortcut string to display. - var symbol: String { + public var symbol: String { let shortcut = self.normalized @@ -238,7 +155,7 @@ struct Shortcut { /// Whether key combination is valid for a shortcut. - var isValid: Bool { + public var isValid: Bool { guard self.keyEquivalent.count == 1, @@ -256,7 +173,7 @@ struct Shortcut { /// Modifier key strings to display. - var modifierSymbols: [String] { + public var modifierSymbols: [String] { ModifierKey.allCases .filter { self.modifiers.contains($0.mask) } @@ -265,7 +182,7 @@ struct Shortcut { /// SF Symbol name for modifier keys to display. - var modifierSymbolNames: [String] { + public var modifierSymbolNames: [String] { ModifierKey.allCases .filter { self.modifiers.contains($0.mask) } @@ -274,7 +191,7 @@ struct Shortcut { /// Key equivalent to display. - var keyEquivalentSymbol: String { + public var keyEquivalentSymbol: String { guard let scalar = self.keyEquivalent.unicodeScalars.first else { return "" } @@ -283,7 +200,7 @@ struct Shortcut { /// SF Symbol name for key equivalent if exists - var keyEquivalentSymbolName: String? { + public var keyEquivalentSymbolName: String? { guard let scalar = self.keyEquivalent.unicodeScalars.first else { return nil } @@ -291,6 +208,20 @@ struct Shortcut { } + /// Normalizes Shortcut by preferring to use the Shift key rather than an upper key equivalent character. + /// + /// According to the AppKit's specification, the Command-Shift-c and Command-C should be considered to be identical. + public var normalized: Self { + + let needsShift = self.keyEquivalent.last?.isUppercase == true + + let keyEquivalent = self.keyEquivalent.lowercased() + let modifiers = self.modifiers.union(needsShift ? .shift : []) + + return Shortcut(keyEquivalent, modifiers: modifiers) ?? self + } + + // MARK: Private Methods @@ -396,7 +327,7 @@ struct Shortcut { .f33: "F33", .f34: "F34", .f35: "F35", - .space: String(localized: "Space", comment: "keyboard key name"), + .space: String(localized: "Space", bundle: .module, comment: "keyboard key name"), .mic: "🎤︎", // U+1F3A4, U+FE0E ].mapKeys(\.unicodeScalar) @@ -440,33 +371,19 @@ private extension NSEvent.SpecialKey { extension Shortcut: Equatable { - static func == (lhs: Self, rhs: Self) -> Bool { + public static func == (lhs: Self, rhs: Self) -> Bool { let lhs = lhs.normalized let rhs = rhs.normalized return lhs.modifiers == rhs.modifiers && lhs.keyEquivalent == rhs.keyEquivalent } - - - /// Normalizes Shortcut by preferring to use the Shift key rather than an upper key equivalent character. - /// - /// According to the AppKit's specification, the Command-Shift-c and Command-C should be considered to be identical. - var normalized: Self { - - let needsShift = self.keyEquivalent.last?.isUppercase == true - - let keyEquivalent = self.keyEquivalent.lowercased() - let modifiers = self.modifiers.union(needsShift ? .shift : []) - - return Shortcut(keyEquivalent, modifiers: modifiers) ?? self - } } extension Shortcut: CustomDebugStringConvertible { - var debugDescription: String { + public var debugDescription: String { self.symbol } @@ -475,7 +392,7 @@ extension Shortcut: CustomDebugStringConvertible { extension Shortcut: Hashable { - func hash(into hasher: inout Hasher) { + public func hash(into hasher: inout Hasher) { hasher.combine(self.keyEquivalent) hasher.combine(self.modifiers.rawValue) @@ -485,7 +402,7 @@ extension Shortcut: Hashable { extension Shortcut: Codable { - init(from decoder: any Decoder) throws { + public init(from decoder: any Decoder) throws { let container = try decoder.singleValueContainer() let string = try container.decode(String.self) @@ -498,10 +415,39 @@ extension Shortcut: Codable { } - func encode(to encoder: any Encoder) throws { + public func encode(to encoder: any Encoder) throws { var container = encoder.singleValueContainer() try container.encode(self.keySpecChars) } } + + +private extension String { + + static let thinSpace = "\u{2009}" +} + + +private extension Dictionary { + + /// Returns a new dictionary containing the keys transformed by the given closure with the values of this dictionary. + /// + /// - Parameter transform: A closure that transforms a key. Every transformed key must be unique. + /// - Returns: A dictionary containing transformed keys and the values of this dictionary. + func mapKeys(_ transform: (Key) throws -> T) rethrows -> [T: Value] { + + try self.reduce(into: [:]) { $0[try transform($1.key)] = $1.value } + } + + + /// Returns a new dictionary containing the keys transformed by the given keyPath with the values of this dictionary. + /// + /// - Parameter keyPath: The keyPath to the value to transform key. Every transformed key must be unique. + /// - Returns: A dictionary containing transformed keys and the values of this dictionary. + func mapKeys(_ keyPath: KeyPath) -> [T: Value] { + + self.mapKeys { $0[keyPath: keyPath] } + } +} diff --git a/CotEditor/Sources/ShortcutFormatter.swift b/Packages/Libraries/Sources/Shortcut/ShortcutFormatter.swift similarity index 77% rename from CotEditor/Sources/ShortcutFormatter.swift rename to Packages/Libraries/Sources/Shortcut/ShortcutFormatter.swift index 446bd33e7..90168145b 100644 --- a/CotEditor/Sources/ShortcutFormatter.swift +++ b/Packages/Libraries/Sources/Shortcut/ShortcutFormatter.swift @@ -25,17 +25,17 @@ import Foundation -final class ShortcutFormatter: Formatter { +public final class ShortcutFormatter: Formatter { /// Converts to plain string. - override func string(for obj: Any?) -> String? { + public override func string(for obj: Any?) -> String? { (obj as? Shortcut)?.symbol } /// Formats backwards. - override func getObjectValue(_ obj: AutoreleasingUnsafeMutablePointer?, for string: String, errorDescription error: AutoreleasingUnsafeMutablePointer?) -> Bool { + public override func getObjectValue(_ obj: AutoreleasingUnsafeMutablePointer?, for string: String, errorDescription error: AutoreleasingUnsafeMutablePointer?) -> Bool { obj?.pointee = Shortcut(symbolRepresentation: string) as AnyObject? diff --git a/Packages/Libraries/Sources/UnicodeNormalization/String+Normalization.swift b/Packages/Libraries/Sources/UnicodeNormalization/String+Normalization.swift new file mode 100644 index 000000000..512b62735 --- /dev/null +++ b/Packages/Libraries/Sources/UnicodeNormalization/String+Normalization.swift @@ -0,0 +1,92 @@ +// +// String+Normalization.swift +// UnicodeNormalization +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2015-08-25. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation + +public extension StringProtocol { + + /// Returns a string created by normalizing the string’s contents using the specified form. + /// + /// - Parameter form: The Unicode normalization form. + /// - Returns: A normalized string. + func normalizing(in form: UnicodeNormalizationForm) -> String { + + switch form { + case .nfd: + self.decomposedStringWithCanonicalMapping + case .nfc: + self.precomposedStringWithCanonicalMapping + case .nfkd: + self.decomposedStringWithCompatibilityMapping + case .nfkc: + self.precomposedStringWithCompatibilityMapping + case .nfkcCasefold: + self.precomposedStringWithCompatibilityMappingWithCasefold + case .modifiedNFD: + String(self).decomposedStringWithHFSPlusMapping + case .modifiedNFC: + String(self).precomposedStringWithHFSPlusMapping + } + } + + + /// A string made by normalizing the receiver’s contents using the Unicode Normalization Form KC with Casefold a.k.a. `NFKC_Casefold` or `NFKC_CF`. + var precomposedStringWithCompatibilityMappingWithCasefold: String { + + self.precomposedStringWithCompatibilityMapping + .folding(options: .caseInsensitive, locale: nil) + } +} + + +public extension String { + + /// A string made by normalizing the receiver’s contents using the normalization form adopted by HFS+, a.k.a. Apple Modified NFC. + var precomposedStringWithHFSPlusMapping: String { + + let exclusionCharacters = "\\x{0340}\\x{0341}\\x{0343}\\x{0344}\\x{0374}\\x{037E}\\x{0387}\\x{0958}-\\x{095F}\\x{09DC}\\x{09DD}\\x{09DF}\\x{0A33}\\x{0A36}\\x{0A59}-\\x{0A5B}\\x{0A5E}\\x{0B5C}\\x{0B5D}\\x{0F43}\\x{0F4D}\\x{0F52}\\x{0F57}\\x{0F5C}\\x{0F69}\\x{0F73}\\x{0F75}\\x{0F76}\\x{0F78}\\x{0F81}\\x{0F93}\\x{0F9D}\\x{0FA2}\\x{0FA7}\\x{0FAC}\\x{0FB9}\\x{1F71}\\x{1F73}\\x{1F75}\\x{1F77}\\x{1F79}\\x{1F7B}\\x{1F7D}\\x{1FBB}\\x{1FBE}\\x{1FC9}\\x{1FCB}\\x{1FD3}\\x{1FDB}\\x{1FE3}\\x{1FEB}\\x{1FEE}\\x{1FEF}\\x{1FF9}\\x{1FFB}\\x{1FFD}\\x{2000}\\x{2001}\\x{2126}\\x{212A}\\x{212B}\\x{2329}\\x{232A}\\x{2ADC}\\x{F900}-\\x{FA0D}\\x{FA10}\\x{FA12}\\x{FA15}-\\x{FA1E}\\x{FA20}\\x{FA22}\\x{FA25}\\x{FA26}\\x{FA2A}-\\x{FA6D}\\x{FA70}-\\x{FAD9}\\x{FB1D}\\x{FB1F}\\x{FB2A}-\\x{FB36}\\x{FB38}-\\x{FB3C}\\x{FB3E}\\x{FB40}\\x{FB41}\\x{FB43}\\x{FB44}\\x{FB46}-\\x{FB4E}\\x{1D15E}-\\x{1D164}\\x{1D1BB}-\\x{1D1C0}\\x{2F800}-\\x{2FA1D}" + let regex = try! NSRegularExpression(pattern: "[^" + exclusionCharacters + "]+") + + let mutable = NSMutableString(string: self) + + return regex.matches(in: self, range: NSRange(..") + #expect(character.blockName == "High Surrogates") + + #expect(Unicode.Scalar(character) == nil) + } +} diff --git a/Packages/Libraries/Tests/CharacterInfoTests/UnicodeCharacterTests.swift b/Packages/Libraries/Tests/CharacterInfoTests/UnicodeCharacterTests.swift new file mode 100644 index 000000000..f18ed2084 --- /dev/null +++ b/Packages/Libraries/Tests/CharacterInfoTests/UnicodeCharacterTests.swift @@ -0,0 +1,96 @@ +// +// UnicodeCharacterTests.swift +// CharacterInfoTests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2015-11-19. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Testing +@testable import CharacterInfo + +struct UnicodeCharacterTests { + + @Test func singleChar() { + + let unicode = Unicode.Scalar("あ") + #expect(unicode.codePoint == "U+3042") + #expect(!unicode.isSurrogatePair) + #expect(unicode.surrogateCodePoints == nil) + #expect(unicode.name == "HIRAGANA LETTER A") + #expect(unicode.blockName == "Hiragana") + #expect(unicode.localizedBlockName != nil) + } + + + @Test func surrogateEmoji() { + + let unicode = Unicode.Scalar("😀") + + #expect(unicode.codePoint == "U+1F600") + #expect(unicode.isSurrogatePair) + #expect(unicode.surrogateCodePoints?.lead == "U+D83D") + #expect(unicode.surrogateCodePoints?.trail == "U+DE00") + #expect(unicode.name == "GRINNING FACE") + #expect(unicode.blockName == "Emoticons") + #expect(unicode.localizedBlockName != nil) + } + + + @Test func unicodeBlockNameWithHyphen() { + + let character = Unicode.Scalar("﷽") + + #expect(character.codePoint == "U+FDFD") + #expect(character.name == "ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM") + #expect(character.localizedBlockName == "Arabic Presentation Forms-A") + } + + + @Test func unicodeControlPictures() throws { + + // test NULL + let nullCharacter = try #require(Unicode.Scalar(0x0000)) + let nullPictureCharacter = try #require(Unicode.Scalar(0x2400)) + #expect(nullCharacter.name == "NULL") + #expect(nullPictureCharacter.name == "SYMBOL FOR NULL") + #expect(nullCharacter.pictureRepresentation == nullPictureCharacter) + + // test SPACE + let spaceCharacter = try #require(Unicode.Scalar(0x0020)) + let spacePictureCharacter = try #require(Unicode.Scalar(0x2420)) + #expect(spaceCharacter.name == "SPACE") + #expect(spacePictureCharacter.name == "SYMBOL FOR SPACE") + #expect(spaceCharacter.pictureRepresentation == spacePictureCharacter) + + // test DELETE (NSDeleteCharacter) + let deleteCharacter = try #require(Unicode.Scalar(0x007f)) + let deletePictureCharacter = Unicode.Scalar("␡") + #expect(deleteCharacter.name == "DELETE") + #expect(deletePictureCharacter.name == "SYMBOL FOR DELETE") + #expect(deleteCharacter.pictureRepresentation == deletePictureCharacter) + + // test one after the last C0 control character + let exclamationCharacter = try #require(Unicode.Scalar(0x0021)) + #expect(exclamationCharacter.name == "EXCLAMATION MARK") + #expect(exclamationCharacter.pictureRepresentation == nil) + } +} diff --git a/Packages/Libraries/Tests/DefaultsTests/UserDefaultsObservationTests.swift b/Packages/Libraries/Tests/DefaultsTests/UserDefaultsObservationTests.swift new file mode 100644 index 000000000..a5f6e92fd --- /dev/null +++ b/Packages/Libraries/Tests/DefaultsTests/UserDefaultsObservationTests.swift @@ -0,0 +1,127 @@ +// +// UserDefaultsObservationTests.swift +// DefaultsTests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2019-11-22. +// +// --------------------------------------------------------------------------- +// +// © 2019-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Combine +import Testing +@testable import Defaults + +struct UserDefaultsObservationTests { + + @Test func observeKey() async { + + let key = DefaultKey("Test Key") + defer { UserDefaults.standard.restore(key: key) } + + UserDefaults.standard[key] = false + + await confirmation("UserDefaults observation for normal key") { confirm in + let observer = UserDefaults.standard.publisher(for: key) + .sink { value in + #expect(value) + confirm() + } + + UserDefaults.standard[key] = true + + observer.cancel() + UserDefaults.standard[key] = false + } + } + + + @Test func initialEmit() async { + + let key = DefaultKey("Initial Emission Test Key") + defer { UserDefaults.standard.restore(key: key) } + + UserDefaults.standard[key] = false + + await confirmation("UserDefaults observation for initial emission") { confirm in + let observer = UserDefaults.standard.publisher(for: key, initial: true) + .sink { value in + #expect(!value) + confirm() + } + + observer.cancel() + UserDefaults.standard[key] = true + } + } + + + @Test func optionalKey() async { + + let key = DefaultKey("Optional Test Key") + defer { UserDefaults.standard.restore(key: key) } + + #expect(UserDefaults.standard[key] == nil) + + UserDefaults.standard[key] = "cow" + #expect(UserDefaults.standard[key] == "cow") + + await confirmation("UserDefaults observation for optional key") { confirm in + let observer = UserDefaults.standard.publisher(for: key) + .sink { value in + #expect(value == nil) + confirm() + } + + UserDefaults.standard[key] = nil + + #expect(UserDefaults.standard[key] == nil) + + observer.cancel() + UserDefaults.standard[key] = "dog" + #expect(UserDefaults.standard[key] == "dog") + } + } + + + @Test func rawRepresentable() async { + + enum Clarus: Int { case dog, cow } + + let key = RawRepresentableDefaultKey("Raw Representable Test Key") + defer { UserDefaults.standard.restore(key: key) } + + UserDefaults.standard[key] = .dog + + await confirmation("UserDefaults observation for raw representable") { confirm in + let observer = UserDefaults.standard.publisher(for: key) + .sink { value in + #expect(value == .cow) + confirm() + } + + UserDefaults.standard[key] = .cow + + observer.cancel() + UserDefaults.standard[key] = .dog + #expect(UserDefaults.standard[key] == .dog) + } + } +} diff --git a/Packages/Libraries/Tests/FileEncodingTests/EncodingDetectionTests.swift b/Packages/Libraries/Tests/FileEncodingTests/EncodingDetectionTests.swift new file mode 100644 index 000000000..3b682dcd5 --- /dev/null +++ b/Packages/Libraries/Tests/FileEncodingTests/EncodingDetectionTests.swift @@ -0,0 +1,291 @@ +// +// EncodingDetectionTests.swift +// FileEncodingTests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2016-01-16. +// +// --------------------------------------------------------------------------- +// +// © 2016-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Testing +@testable import FileEncoding + +struct EncodingDetectionTests { + + @Test(.bug("https://bugs.swift.org/browse/SR-10173")) func utf8BOM() throws { + + // -> String(data:encoding:) preserves BOM since Swift 5 (2019-03) + let data = try self.dataForFileName("UTF-8 BOM") + withKnownIssue { + #expect(String(decoding: data, as: UTF8.self) == "0") + } + #expect(String(decoding: data, as: UTF8.self) == "\u{FEFF}0") + #expect(String(bomCapableData: data, encoding: .utf8) == "0") + + var encoding: String.Encoding? + let string = try self.encodedStringForFileName("UTF-8 BOM", usedEncoding: &encoding) + + #expect(string == "0") + #expect(encoding == .utf8) + + #expect(String(bomCapableData: Data(Unicode.BOM.utf8.sequence), encoding: .utf8)?.isEmpty == true) + #expect(String(bomCapableData: Data(), encoding: .utf8)?.isEmpty == true) + } + + + /// Tests if the U+FEFF omitting bug on Swift 5 still exists. + @Test(.bug("https://bugs.swift.org/browse/SR-10896")) func feff() { + + let bom = "\u{feff}" + #expect(bom.count == 1) + #expect(("\(bom)abc").count == 4) + + #expect(NSString(string: "a\(bom)bc").length == 4) + withKnownIssue { + #expect(NSString(string: bom) as String == bom) + #expect(NSString(string: bom).length == 1) + #expect(NSString(string: "\(bom)\(bom)").length == 2) + #expect(NSString(string: "\(bom)abc").length == 4) + } + + // -> These test cases must fail if the bug fixed. + #expect(NSString(string: bom).length == 0) + #expect(NSString(string: "\(bom)\(bom)").length == 1) + #expect(NSString(string: "\(bom)abc").length == 3) + + let string = "\(bom)abc" + + // Implicit NSString cast is fixed. + // -> However, still crashes when `string.immutable.enumerateSubstrings(in:)` + let middleIndex = string.index(string.startIndex, offsetBy: 2) + string.enumerateSubstrings(in: middleIndex.." + #expect(string.scanEncodingDeclaration(upTo: 16) == nil) + #expect(string.scanEncodingDeclaration(upTo: 128) == String.Encoding(cfEncodings: .shiftJIS)) + + #expect("".scanEncodingDeclaration(upTo: 128) == .utf8) + + // Swift.Regex with non-simple word boundaries never returns when the given string contains a specific pattern of letters (2023-12 on Swift 5.9). + #expect("ﾀﾏｺﾞ,1,".scanEncodingDeclaration(upTo: 128) == nil) + #expect(try /\ba/.wordBoundaryKind(.simple).firstMatch(in: "ﾀﾏｺﾞ,1,") == nil) + } + + + @Test func initializeEncoding() { + + #expect(String.Encoding(cfEncodings: CFStringEncodings.dosJapanese) == .shiftJIS) + #expect(String.Encoding(cfEncodings: CFStringEncodings.shiftJIS) != .shiftJIS) + #expect(String.Encoding(cfEncodings: CFStringEncodings.shiftJIS_X0213) != .shiftJIS) + + #expect(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.dosJapanese.rawValue)) == .shiftJIS) + #expect(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.shiftJIS.rawValue)) != .shiftJIS) + #expect(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.shiftJIS_X0213.rawValue)) != .shiftJIS) + } + + + /// Makes sure the behaviors around Shift-JIS. + @Test func shiftJIS() { + + let shiftJIS = CFStringEncoding(CFStringEncodings.shiftJIS.rawValue) + let shiftJIS_X0213 = CFStringEncoding(CFStringEncodings.shiftJIS_X0213.rawValue) + let dosJapanese = CFStringEncoding(CFStringEncodings.dosJapanese.rawValue) + + // IANA charset name conversion + // CFStringEncoding -> IANA charset name + #expect(CFStringConvertEncodingToIANACharSetName(shiftJIS) as String == "shift_jis") + #expect(CFStringConvertEncodingToIANACharSetName(shiftJIS_X0213) as String == "Shift_JIS") + + #expect(CFStringConvertEncodingToIANACharSetName(dosJapanese) as String == "cp932") + // IANA charset name -> CFStringEncoding + #expect(CFStringConvertIANACharSetNameToEncoding("SHIFT_JIS" as CFString) == shiftJIS) + #expect(CFStringConvertIANACharSetNameToEncoding("shift_jis" as CFString) == shiftJIS) + #expect(CFStringConvertIANACharSetNameToEncoding("cp932" as CFString) == dosJapanese) + #expect(CFStringConvertIANACharSetNameToEncoding("sjis" as CFString) == dosJapanese) + #expect(CFStringConvertIANACharSetNameToEncoding("shiftjis" as CFString) == dosJapanese) + #expect(CFStringConvertIANACharSetNameToEncoding("shift_jis" as CFString) != shiftJIS_X0213) + + // `String.Encoding.shiftJIS` is "Japanese (Windows, DOS)." + #expect(CFStringConvertNSStringEncodingToEncoding(String.Encoding.shiftJIS.rawValue) == dosJapanese) + } + + + @Test func encodeXattr() { + + let utf8Data = Data("utf-8;134217984".utf8) + + #expect(String.Encoding.utf8.xattrEncodingData == utf8Data) + #expect(utf8Data.decodingXattrEncoding == .utf8) + #expect(Data("utf-8".utf8).decodingXattrEncoding == .utf8) + + + let eucJPData = Data("euc-jp;2336".utf8) + + #expect(String.Encoding.japaneseEUC.xattrEncodingData == eucJPData) + #expect(eucJPData.decodingXattrEncoding == .japaneseEUC) + #expect(Data("euc-jp".utf8).decodingXattrEncoding == .japaneseEUC) + } + + + @Test func convertYen() { + + #expect("¥".canBeConverted(to: .utf8)) + #expect("¥".canBeConverted(to: String.Encoding(cfEncodings: .shiftJIS))) + #expect(!"¥".canBeConverted(to: .shiftJIS)) + #expect(!"¥".canBeConverted(to: .japaneseEUC)) // ? (U+003F) + #expect(!"¥".canBeConverted(to: .ascii)) // Y (U+0059) + + let string = "\\ ¥ yen" + #expect(string.convertYenSign(for: .utf8) == string) + #expect(string.convertYenSign(for: String.Encoding(cfEncodings: .shiftJIS)) == string) + #expect(string.convertYenSign(for: .shiftJIS) == "\\ \\ yen") + #expect(string.convertYenSign(for: .japaneseEUC) == "\\ \\ yen") + #expect(string.convertYenSign(for: .ascii) == "\\ \\ yen") + } + + + @Test func ianaCharsetName() { + + #expect(String.Encoding.utf8.ianaCharSetName == "utf-8") + #expect(String.Encoding.isoLatin1.ianaCharSetName == "iso-8859-1") + } +} + + +// MARK: Private Methods + +private extension String.Encoding { + + init(cfEncodings: CFStringEncodings) { + + self.init(rawValue: CFStringConvertEncodingToNSStringEncoding(CFStringEncoding(cfEncodings.rawValue))) + } +} + + +private extension EncodingDetectionTests { + + func encodedStringForFileName(_ fileName: String, usedEncoding: inout String.Encoding?) throws -> String { + + let data = try self.dataForFileName(fileName) + + return try String(data: data, suggestedEncodings: [], usedEncoding: &usedEncoding) + } + + + func dataForFileName(_ fileName: String) throws -> Data { + + guard + let fileURL = Bundle.module.url(forResource: fileName, withExtension: "txt") + else { throw CocoaError(.fileNoSuchFile) } + + return try Data(contentsOf: fileURL) + } +} diff --git a/Tests/TestFiles/Encodings/ISO 2022-JP.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/ISO 2022-JP.txt similarity index 100% rename from Tests/TestFiles/Encodings/ISO 2022-JP.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/ISO 2022-JP.txt diff --git a/Tests/TestFiles/Encodings/UTF-16.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-16.txt similarity index 100% rename from Tests/TestFiles/Encodings/UTF-16.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-16.txt diff --git a/Tests/TestFiles/Encodings/UTF-32.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-32.txt similarity index 100% rename from Tests/TestFiles/Encodings/UTF-32.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-32.txt diff --git a/Tests/TestFiles/Encodings/UTF-8 BOM.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-8 BOM.txt similarity index 100% rename from Tests/TestFiles/Encodings/UTF-8 BOM.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-8 BOM.txt diff --git a/Tests/TestFiles/Encodings/UTF-8.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-8.txt similarity index 100% rename from Tests/TestFiles/Encodings/UTF-8.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/UTF-8.txt diff --git a/Tests/TestFiles/Encodings/Yen-Backslash.txt b/Packages/Libraries/Tests/FileEncodingTests/Resources/Yen-Backslash.txt similarity index 100% rename from Tests/TestFiles/Encodings/Yen-Backslash.txt rename to Packages/Libraries/Tests/FileEncodingTests/Resources/Yen-Backslash.txt diff --git a/Tests/ShiftJISTests.swift b/Packages/Libraries/Tests/FileEncodingTests/ShiftJISTests.swift similarity index 55% rename from Tests/ShiftJISTests.swift rename to Packages/Libraries/Tests/FileEncodingTests/ShiftJISTests.swift index 019797078..4ec5d4341 100644 --- a/Tests/ShiftJISTests.swift +++ b/Packages/Libraries/Tests/FileEncodingTests/ShiftJISTests.swift @@ -1,5 +1,6 @@ // // ShiftJISTests.swift +// FileEncodingTests // // CotEditor // https://coteditor.com @@ -23,59 +24,64 @@ // limitations under the License. // -import XCTest -@testable import CotEditor +import Foundation +import Testing +@testable import FileEncoding -final class ShiftJISTests: XCTestCase { +struct ShiftJISTests { - func testIANACharSetNames() { + @Test func ianaCharSetNames() { - XCTAssertEqual(ShiftJIS.shiftJIS.ianaCharSet, "shift_jis") - XCTAssertEqual(ShiftJIS.shiftJIS_X0213.ianaCharSet, "Shift_JIS") - XCTAssertEqual(ShiftJIS.macJapanese.ianaCharSet, "x-mac-japanese") - XCTAssertEqual(ShiftJIS.dosJapanese.ianaCharSet, "cp932") + #expect(ShiftJIS.shiftJIS.ianaCharSet == "shift_jis") + #expect(ShiftJIS.shiftJIS_X0213.ianaCharSet == "Shift_JIS") + #expect(ShiftJIS.macJapanese.ianaCharSet == "x-mac-japanese") + #expect(ShiftJIS.dosJapanese.ianaCharSet == "cp932") - XCTAssertEqual(ShiftJIS(ianaCharSetName: ShiftJIS.shiftJIS.ianaCharSet!), .shiftJIS) - XCTAssertEqual(ShiftJIS(ianaCharSetName: ShiftJIS.shiftJIS_X0213.ianaCharSet!), .shiftJIS) + #expect(ShiftJIS(ianaCharSetName: ShiftJIS.shiftJIS.ianaCharSet!) == .shiftJIS) + #expect(ShiftJIS(ianaCharSetName: ShiftJIS.shiftJIS_X0213.ianaCharSet!) == .shiftJIS) } - func testTildaEncoding() { + @Test func encodeTilda() { - XCTAssertEqual(ShiftJIS.shiftJIS.encode("~"), "?") - XCTAssertEqual(ShiftJIS.shiftJIS_X0213.encode("~"), "〜") - XCTAssertEqual(ShiftJIS.macJapanese.encode("~"), "~") - XCTAssertEqual(ShiftJIS.dosJapanese.encode("~"), "~") + #expect(ShiftJIS.shiftJIS.encode("~") == "?") + #expect(ShiftJIS.shiftJIS_X0213.encode("~") == "〜") + #expect(ShiftJIS.macJapanese.encode("~") == "~") + #expect(ShiftJIS.dosJapanese.encode("~") == "~") } - func testBackslashEncoding() { + @Test func encodeBackslash() { - XCTAssertEqual(ShiftJIS.shiftJIS.encode("\\"), "＼") - XCTAssertEqual(ShiftJIS.shiftJIS_X0213.encode("\\"), "＼") - XCTAssertEqual(ShiftJIS.macJapanese.encode("\\"), "\\") - XCTAssertEqual(ShiftJIS.dosJapanese.encode("\\"), "\\") + #expect(ShiftJIS.shiftJIS.encode("\\") == "＼") + #expect(ShiftJIS.shiftJIS_X0213.encode("\\") == "＼") + #expect(ShiftJIS.macJapanese.encode("\\") == "\\") + #expect(ShiftJIS.dosJapanese.encode("\\") == "\\") } - func testYenEncoding() { + @Test func encodeYen() { - XCTAssertEqual(ShiftJIS.shiftJIS.encode("¥"), "¥") - XCTAssertEqual(ShiftJIS.shiftJIS_X0213.encode("¥"), "¥") - XCTAssertEqual(ShiftJIS.macJapanese.encode("¥"), "¥") - XCTAssertEqual(ShiftJIS.dosJapanese.encode("¥"), "?") + #expect(ShiftJIS.shiftJIS.encode("¥") == "¥") + #expect(ShiftJIS.shiftJIS_X0213.encode("¥") == "¥") + #expect(ShiftJIS.macJapanese.encode("¥") == "¥") + #expect(ShiftJIS.dosJapanese.encode("¥") == "?") } - func testYenConversion() { + @Test func convertYen() { - XCTAssertEqual("¥".convertYenSign(for: ShiftJIS.shiftJIS.encoding), "¥") - XCTAssertEqual("¥".convertYenSign(for: ShiftJIS.shiftJIS_X0213.encoding), "¥") - XCTAssertEqual("¥".convertYenSign(for: ShiftJIS.macJapanese.encoding), "¥") - XCTAssertEqual("¥".convertYenSign(for: ShiftJIS.dosJapanese.encoding), "\\") + #expect("¥".convertYenSign(for: ShiftJIS.shiftJIS.encoding) == "¥") + #expect("¥".convertYenSign(for: ShiftJIS.shiftJIS_X0213.encoding) == "¥") + #expect("¥".convertYenSign(for: ShiftJIS.macJapanese.encoding) == "¥") + #expect("¥".convertYenSign(for: ShiftJIS.dosJapanese.encoding) == "\\") + } + + + @Test(arguments: ShiftJIS.allCases) + private func convertYen(shiftJIS: ShiftJIS) { - ShiftJIS.allCases - .forEach { XCTAssertEqual("¥".convertYenSign(for: $0.encoding) == "¥", $0.encode("¥") == "¥") } + #expect(("¥".convertYenSign(for: shiftJIS.encoding) == "¥") == (shiftJIS.encode("¥") == "¥")) } } diff --git a/Tests/FilePermissionTests.swift b/Packages/Libraries/Tests/FilePermissionsTests/FilePermissionTests.swift similarity index 55% rename from Tests/FilePermissionTests.swift rename to Packages/Libraries/Tests/FilePermissionsTests/FilePermissionTests.swift index 9a963b945..0a47adf70 100644 --- a/Tests/FilePermissionTests.swift +++ b/Packages/Libraries/Tests/FilePermissionsTests/FilePermissionTests.swift @@ -1,6 +1,6 @@ // // FilePermissionTests.swift -// Tests +// FilePermissionTests // // CotEditor // https://coteditor.com @@ -24,34 +24,34 @@ // limitations under the License. // -import XCTest -@testable import CotEditor +import Testing +@testable import FilePermissions -final class FilePermissionTests: XCTestCase { +struct FilePermissionTests { - func testFilePermissions() { + @Test func filePermissions() { - XCTAssertEqual(FilePermissions(mask: 0o777).mask, 0o777) - XCTAssertEqual(FilePermissions(mask: 0o643).mask, 0o643) + #expect(FilePermissions(mask: 0o777).mask == 0o777) + #expect(FilePermissions(mask: 0o643).mask == 0o643) - XCTAssertEqual(FilePermissions(mask: 0o777).symbolic, "rwxrwxrwx") - XCTAssertEqual(FilePermissions(mask: 0o643).symbolic, "rw-r---wx") + #expect(FilePermissions(mask: 0o777).symbolic == "rwxrwxrwx") + #expect(FilePermissions(mask: 0o643).symbolic == "rw-r---wx") } - func testFormatStyle() { + @Test func formatStyle() { - XCTAssertEqual(FilePermissions(mask: 0o777).formatted(.filePermissions(.full)), "777 (-rwxrwxrwx)") - XCTAssertEqual(FilePermissions(mask: 0o643).formatted(.filePermissions(.full)), "643 (-rw-r---wx)") + #expect(FilePermissions(mask: 0o777).formatted(.filePermissions(.full)) == "777 (-rwxrwxrwx)") + #expect(FilePermissions(mask: 0o643).formatted(.filePermissions(.full)) == "643 (-rw-r---wx)") } - func testCalculation() { + @Test func calculate() { var permissions = FilePermissions(mask: 0o644) permissions.user.insert(.execute) - XCTAssertTrue(permissions.user.contains(.execute)) - XCTAssertEqual(permissions.mask, 0o744) + #expect(permissions.user.contains(.execute)) + #expect(permissions.mask == 0o744) } } diff --git a/Packages/Libraries/Tests/ShortcutTests/ShortcutTests.swift b/Packages/Libraries/Tests/ShortcutTests/ShortcutTests.swift new file mode 100644 index 000000000..b9dbd21ed --- /dev/null +++ b/Packages/Libraries/Tests/ShortcutTests/ShortcutTests.swift @@ -0,0 +1,121 @@ +// +// ShortcutTests.swift +// ShortcutTests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2016-06-04. +// +// --------------------------------------------------------------------------- +// +// © 2016-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import AppKit.NSEvent +import Testing +@testable import Shortcut + +struct ShortcutTests { + + @Test func equivalent() { + + #expect(Shortcut("A", modifiers: [.control]) == + Shortcut("a", modifiers: [.control, .shift])) + + #expect(Shortcut(keySpecChars: "^A") == + Shortcut(keySpecChars: "^$a")) + } + + + @Test func createKeySpecChars() { + + #expect(Shortcut("", modifiers: []) == nil) + #expect(Shortcut("a", modifiers: [.control, .shift])?.keySpecChars == "^$a") + #expect(Shortcut("b", modifiers: [.command, .option])?.keySpecChars == "~@b") + #expect(Shortcut("A", modifiers: [.control])?.keySpecChars == "^$a") // uppercase for Shift key + #expect(Shortcut("a", modifiers: [.control, .shift])?.keySpecChars == "^$a") + + #expect(Shortcut("a", modifiers: [])?.keySpecChars == "a") + #expect(Shortcut("a", modifiers: [])?.isValid == false) + #expect(Shortcut("", modifiers: [.control, .shift]) == nil) + #expect(Shortcut("a", modifiers: [.control, .shift])?.isValid == true) + #expect(Shortcut("ab", modifiers: [.control, .shift])?.isValid == false) + } + + + @Test func stringToShortcut() throws { + + let shortcut = try #require(Shortcut(keySpecChars: "^$a")) + + #expect(shortcut.keyEquivalent == "a") + #expect(shortcut.modifiers == [.control, .shift]) + #expect(shortcut.isValid) + } + + + @Test func shortcutWithFnKey() throws { + + let shortcut = try #require(Shortcut("a", modifiers: [.function])) + + #expect(!shortcut.isValid) + #expect(shortcut.keyEquivalent == "a") + #expect(shortcut.modifiers == [.function]) + #expect(shortcut.symbol == "fn A" || shortcut.symbol == "🌐︎ A") + #expect(shortcut.keySpecChars == "a", "The fn key should be ignored.") + } + + + @Test(arguments: ModifierKey.allCases) func symbol(modifierKey: ModifierKey) { + + #expect(NSImage(systemSymbolName: modifierKey.symbolName, accessibilityDescription: nil) != nil) + } + + + @Test func menuItemShortcut() { + + let menuItem = NSMenuItem(title: "", action: nil, keyEquivalent: "C") + menuItem.keyEquivalentModifierMask = [.command] + + let shortcut = Shortcut(menuItem.keyEquivalent, modifiers: menuItem.keyEquivalentModifierMask) + + #expect(shortcut?.symbol == "⇧ ⌘ C") + #expect(shortcut == menuItem.shortcut) + } + + + @Test func shortcutSymbols() throws { + + // test modifier symbols + #expect(Shortcut(keySpecChars: "") == nil) + #expect(Shortcut(keySpecChars: "^$a")?.symbol == "^ ⇧ A") + #expect(Shortcut(keySpecChars: "~@b")?.symbol == "⌥ ⌘ B") + + // test unprintable keys + let f10 = try #require(String(NSEvent.SpecialKey.f10.unicodeScalar)) + #expect(Shortcut(keySpecChars: "@" + f10)?.symbol == "⌘ F10") + + let delete = try #require(UnicodeScalar(NSDeleteCharacter).flatMap(String.init)) + #expect(Shortcut(keySpecChars: "@" + delete)?.symbol == "⌘ ⌫") + + // test creation + let deleteForward = try #require(String(NSEvent.SpecialKey.deleteForward.unicodeScalar)) + #expect(Shortcut(symbolRepresentation: "") == nil) + #expect(Shortcut(symbolRepresentation: "^ ⇧ A")?.keySpecChars == "^$a") + #expect(Shortcut(symbolRepresentation: "⌥ ⌘ B")?.keySpecChars == "~@b") + #expect(Shortcut(symbolRepresentation: "⌘ F10")?.keySpecChars == "@" + f10) + #expect(Shortcut(symbolRepresentation: "⌘ ⌦")?.keySpecChars == "@" + deleteForward) + } +} diff --git a/Packages/Libraries/Tests/UnicodeNormalizationTests/NormalizationTests.swift b/Packages/Libraries/Tests/UnicodeNormalizationTests/NormalizationTests.swift new file mode 100644 index 000000000..f298584f5 --- /dev/null +++ b/Packages/Libraries/Tests/UnicodeNormalizationTests/NormalizationTests.swift @@ -0,0 +1,39 @@ +// +// NormalizationTests.swift +// UnicodeNormalizationTests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-06-13. +// +// --------------------------------------------------------------------------- +// +// © 2015-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Testing +@testable import UnicodeNormalization + +struct NormalizationTests { + + @Test func normalize() { + + #expect("É \t 神 ㍑ ＡＢC".precomposedStringWithCompatibilityMappingWithCasefold == "é \t 神 リットル abc") + #expect("\u{1f71} \u{03b1}\u{0301}".precomposedStringWithHFSPlusMapping == "\u{1f71} \u{03ac}") + #expect("\u{1f71}".precomposedStringWithHFSPlusMapping == "\u{1f71}") // test single char + #expect("\u{1f71}".decomposedStringWithHFSPlusMapping == "\u{03b1}\u{0301}") + } +} diff --git a/SyntaxMap/Package.swift b/Packages/SyntaxMap/Package.swift similarity index 62% rename from SyntaxMap/Package.swift rename to Packages/SyntaxMap/Package.swift index 178fa16a7..3dc4eb88b 100644 --- a/SyntaxMap/Package.swift +++ b/Packages/SyntaxMap/Package.swift @@ -1,11 +1,11 @@ -// swift-tools-version:5.9 +// swift-tools-version:6.0 import PackageDescription let package = Package( name: "SyntaxMap", platforms: [ - .macOS(.v13), + .macOS(.v14), ], products: [ .library(name: "SyntaxMap", targets: ["SyntaxMap"]), @@ -20,15 +20,13 @@ let package = Package( dependencies: [ "SyntaxMap", .product(name: "ArgumentParser", package: "swift-argument-parser"), - ], - swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]), - .target(name: "SyntaxMap", dependencies: ["Yams"], - swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]), - + ]), + .target(name: "SyntaxMap", dependencies: ["Yams"]), + .testTarget( name: "SyntaxMapTests", dependencies: ["SyntaxMap"], - resources: [.copy("Syntaxes")], - swiftSettings: [.enableExperimentalFeature("StrictConcurrency")]), - ] + resources: [.copy("Syntaxes")]), + ], + swiftLanguageVersions: [.v6] ) diff --git a/SyntaxMap/README.md b/Packages/SyntaxMap/README.md similarity index 100% rename from SyntaxMap/README.md rename to Packages/SyntaxMap/README.md diff --git a/SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift b/Packages/SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift similarity index 97% rename from SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift rename to Packages/SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift index 8055437e7..a994e370c 100644 --- a/SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift +++ b/Packages/SyntaxMap/Sources/SyntaxMap/SyntaxMap.swift @@ -26,7 +26,7 @@ import Foundation import Yams -public struct SyntaxMap: Equatable, Codable { +public struct SyntaxMap: Equatable, Sendable, Codable { struct InvalidError: Error { diff --git a/SyntaxMap/Sources/SyntaxMapBuilder/Command.swift b/Packages/SyntaxMap/Sources/SyntaxMapBuilder/Command.swift similarity index 96% rename from SyntaxMap/Sources/SyntaxMapBuilder/Command.swift rename to Packages/SyntaxMap/Sources/SyntaxMapBuilder/Command.swift index 3abc10e21..585ecbcf1 100644 --- a/SyntaxMap/Sources/SyntaxMapBuilder/Command.swift +++ b/Packages/SyntaxMap/Sources/SyntaxMapBuilder/Command.swift @@ -52,7 +52,7 @@ struct Command: ParsableCommand { } -extension URL: ExpressibleByArgument { +extension URL: @retroactive ExpressibleByArgument { public init?(argument: String) { diff --git a/SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift b/Packages/SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift similarity index 84% rename from SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift rename to Packages/SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift index 955b205eb..d8bf21751 100644 --- a/SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift +++ b/Packages/SyntaxMap/Tests/SyntaxMapTests/SyntaxMapTests.swift @@ -23,14 +23,15 @@ // limitations under the License. // -import XCTest +import Testing +import Foundation @testable import SyntaxMap -final class SyntaxMapTests: XCTestCase { +struct SyntaxMapTests { - func testMapLoad() throws { + @Test func testMapLoad() throws { - let urls = try XCTUnwrap(Bundle.module.urls(forResourcesWithExtension: "yml", subdirectory: "Syntaxes")) + let urls = try #require(Bundle.module.urls(forResourcesWithExtension: "yml", subdirectory: "Syntaxes")) let maps = try SyntaxMap.loadMaps(at: urls) let expectedResult: [String: SyntaxMap] = [ @@ -42,6 +43,6 @@ final class SyntaxMapTests: XCTestCase { interpreters: ["python", "python2", "python3"]), ] - XCTAssertEqual(maps, expectedResult) + #expect(maps == expectedResult) } } diff --git a/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Apache.yml b/Packages/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Apache.yml similarity index 100% rename from SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Apache.yml rename to Packages/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Apache.yml diff --git a/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Python.yml b/Packages/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Python.yml similarity index 100% rename from SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Python.yml rename to Packages/SyntaxMap/Tests/SyntaxMapTests/Syntaxes/Python.yml diff --git a/README.md b/README.md index 491e3e169..c2c7dd3c3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ CotEditor is a lightweight plain-text editor for macOS. The project aims to provide a general plain-text editor for everyone with an intuitive macOS-native user interface. -- __Requirement__: macOS 13 Ventura or later +- __Requirement__: macOS 14 Sonoma or later - __Web Site__: - __Mac App Store__: - __Languages__: English, Czech, Dutch, French, German, Italian, Japanese, Portuguese, Spanish, Simplified Chinese, Traditional Chinese, Turkish @@ -19,7 +19,7 @@ CotEditor is a purely macOS native application written in Swift. It adopts Cocoa ### Development Environment - macOS 14 Sonoma -- Xcode 15.4 +- Xcode 16 Beta - Swift 5.10 - Sandbox enabled diff --git a/SyntaxMap/.gitignore b/SyntaxMap/.gitignore deleted file mode 100644 index 95c432091..000000000 --- a/SyntaxMap/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.DS_Store -/.build -/Packages -/*.xcodeproj -xcuserdata/ diff --git a/Tests/ArithmeticsTests.swift b/Tests/ArithmeticsTests.swift index 39142ab19..778ab6dd3 100644 --- a/Tests/ArithmeticsTests.swift +++ b/Tests/ArithmeticsTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,14 +23,14 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class ArithmeticsTests: XCTestCase { +struct ArithmeticsTests { - func testDigits() { + @Test func digits() { - XCTAssertEqual(0.digits, [0]) - XCTAssertEqual(1024.digits, [4, 2, 0, 1]) + #expect(0.digits == [0]) + #expect(1024.digits == [4, 2, 0, 1]) } } diff --git a/Tests/BracePairTests.swift b/Tests/BracePairTests.swift index 859b33e3d..7fc7be5e1 100644 --- a/Tests/BracePairTests.swift +++ b/Tests/BracePairTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2022 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,35 +24,64 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class BracePairTests: XCTestCase { +struct BracePairTests { - func testIndexFind() { + @Test func findIndex() { let string = "if < foo < 🐕 > > else < >" let pair = BracePair("<", ">") - XCTAssertEqual(string.indexOfBracePair(endIndex: string.index(14), pair: pair), string.index(3)) - XCTAssertEqual(string.indexOfBracePair(beginIndex: string.index(4), pair: pair), string.index(15)) - XCTAssertNil(string.indexOfBracePair(endIndex: string.index(2), pair: pair)) - XCTAssertNil(string.indexOfBracePair(beginIndex: string.index(2), pair: .ltgt)) + #expect(string.indexOfBracePair(endIndex: string.index(14), pair: pair) == string.index(3)) + #expect(string.indexOfBracePair(beginIndex: string.index(4), pair: pair) == string.index(15)) + #expect(string.indexOfBracePair(endIndex: string.index(2), pair: pair) == nil) + #expect(string.indexOfBracePair(beginIndex: string.index(2), pair: .ltgt) == nil) - XCTAssertNil(string.indexOfBracePair(endIndex: string.index(14), pair: pair, until: string.index(15))) - XCTAssertNil(string.indexOfBracePair(beginIndex: string.index(4), pair: pair, until: string.index(2))) + #expect(string.indexOfBracePair(endIndex: string.index(14), pair: pair, until: string.index(15)) == nil) + #expect(string.indexOfBracePair(beginIndex: string.index(4), pair: pair, until: string.index(2)) == nil) } - func testSamePair() { + @Test func samePair() { let string = "if ' foo ' 🐕 ' ' else ' '" let pair = BracePair("'", "'") - XCTAssertEqual(string.indexOfBracePair(endIndex: string.index(14), pair: pair), string.index(13)) - XCTAssertEqual(string.indexOfBracePair(beginIndex: string.index(4), pair: pair), string.index(9)) - XCTAssertNil(string.indexOfBracePair(endIndex: string.index(2), pair: pair)) - XCTAssertEqual(string.indexOfBracePair(beginIndex: string.index(2), pair: pair), string.index(3)) + #expect(string.indexOfBracePair(endIndex: string.index(14), pair: pair) == string.index(13)) + #expect(string.indexOfBracePair(beginIndex: string.index(4), pair: pair) == string.index(9)) + #expect(string.indexOfBracePair(endIndex: string.index(2), pair: pair) == nil) + #expect(string.indexOfBracePair(beginIndex: string.index(2), pair: pair) == string.index(3)) + } + + + @Test func scan() { + + let string = "def { foo {} | { bar } } " + let pairs = BracePair.braces + + #expect(string.rangeOfEnclosingBracePair(at: string.range(1..<2), candidates: pairs) == nil) + #expect(string.rangeOfEnclosingBracePair(at: string.range(24..<24), candidates: pairs) == nil) + + #expect(string.rangeOfEnclosingBracePair(at: string.range(13..<14), candidates: pairs) == string.range(4..<24)) // = | + + #expect(string.rangeOfEnclosingBracePair(at: string.range(11..<11), candidates: pairs) == string.range(10..<12)) // = {} + } + + + @Test func scanWithEscape() { + + let pairs = BracePair.braces + + let string1 = #"foo (\() )"# + #expect(string1.rangeOfEnclosingBracePair(at: string1.range(7..<7), candidates: pairs) == string1.range(4..<8)) + + let string2 = #"foo (\\() )"# + #expect(string2.rangeOfEnclosingBracePair(at: string2.range(8..<8), candidates: pairs) == string2.range(7..<9)) + + let string3 = #"foo (\\\() )"# + #expect(string3.rangeOfEnclosingBracePair(at: string3.range(9..<9), candidates: pairs) == string3.range(4..<10)) } } @@ -63,4 +92,10 @@ private extension String { self.index(self.startIndex, offsetBy: index) } + + + func range(_ range: Range) -> Range { + + self.index(range.lowerBound)..") - XCTAssertEqual(character.blockName, "High Surrogates") - - XCTAssertNil(Unicode.Scalar(character)) - } - - - // MARK: - UnicodeCharacter Tests - - func testSingleChar() { - - let unicode = Unicode.Scalar("あ") - XCTAssertEqual(unicode.codePoint, "U+3042") - XCTAssertFalse(unicode.isSurrogatePair) - XCTAssertNil(unicode.surrogateCodePoints) - XCTAssertEqual(unicode.name, "HIRAGANA LETTER A") - XCTAssertEqual(unicode.blockName, "Hiragana") - XCTAssertNotNil(unicode.localizedBlockName) - } - - - func testSurrogateEmoji() { - - let unicode = Unicode.Scalar("😀") - - XCTAssertEqual(unicode.codePoint, "U+1F600") - XCTAssertTrue(unicode.isSurrogatePair) - XCTAssertEqual(unicode.surrogateCodePoints?.lead, "U+D83D") - XCTAssertEqual(unicode.surrogateCodePoints?.trail, "U+DE00") - XCTAssertEqual(unicode.name, "GRINNING FACE") - XCTAssertEqual(unicode.blockName, "Emoticons") - XCTAssertNotNil(unicode.localizedBlockName) - } - - - func testUnicodeBlockNameWithHyphen() { - - let character = Unicode.Scalar("﷽") - - XCTAssertEqual(character.codePoint, "U+FDFD") - XCTAssertEqual(character.name, "ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM") - XCTAssertEqual(character.localizedBlockName, "Arabic Presentation Forms-A") - } - - - func testUnicodeControlPictures() throws { - - // test NULL - let nullCharacter = try XCTUnwrap(Unicode.Scalar(0x0000)) - let nullPictureCharacter = try XCTUnwrap(Unicode.Scalar(0x2400)) - XCTAssertEqual(nullCharacter.name, "NULL") - XCTAssertEqual(nullPictureCharacter.name, "SYMBOL FOR NULL") - XCTAssertEqual(nullCharacter.pictureRepresentation, nullPictureCharacter) - - // test SPACE - let spaceCharacter = try XCTUnwrap(Unicode.Scalar(0x0020)) - let spacePictureCharacter = try XCTUnwrap(Unicode.Scalar(0x2420)) - XCTAssertEqual(spaceCharacter.name, "SPACE") - XCTAssertEqual(spacePictureCharacter.name, "SYMBOL FOR SPACE") - XCTAssertEqual(spaceCharacter.pictureRepresentation, spacePictureCharacter) - - // test DELETE - let deleteCharacter = try XCTUnwrap(Unicode.Scalar(NSDeleteCharacter)) - let deletePictureCharacter = Unicode.Scalar("␡") - XCTAssertEqual(deleteCharacter.name, "DELETE") - XCTAssertEqual(deletePictureCharacter.name, "SYMBOL FOR DELETE") - XCTAssertEqual(deleteCharacter.pictureRepresentation, deletePictureCharacter) - - // test one after the last C0 control character - let exclamationCharacter = try XCTUnwrap(Unicode.Scalar(0x0021)) - XCTAssertEqual(exclamationCharacter.name, "EXCLAMATION MARK") - XCTAssertNil(exclamationCharacter.pictureRepresentation) - } - - - // MARK: - CharacterInfo Tests - - func testSingleCharWithVSInfo() { - - let charInfo = CharacterInfo(character: "☺︎") - - XCTAssertEqual(charInfo.character, "☺︎") - XCTAssertFalse(charInfo.isComplex) - XCTAssertEqual(charInfo.character.unicodeScalars.map(\.codePoint), ["U+263A", "U+FE0E"]) - XCTAssertEqual(charInfo.character.unicodeScalars.map(\.name), ["WHITE SMILING FACE", "VARIATION SELECTOR-15"]) - XCTAssertEqual(charInfo.localizedDescription, "WHITE SMILING FACE (Text Style)") - } - - - func testCombiningCharacterInfo() { - - let charInfo = CharacterInfo(character: "1️⃣") - - XCTAssertTrue(charInfo.isComplex) - XCTAssertEqual(charInfo.character.unicodeScalars.map(\.codePoint), ["U+0031", "U+FE0F", "U+20E3"]) - XCTAssertEqual(charInfo.localizedDescription, "") - } - - - func testNationalIndicatorInfo() { - - let charInfo = CharacterInfo(character: "🇯🇵") - - XCTAssertTrue(charInfo.isComplex) - XCTAssertEqual(charInfo.character.unicodeScalars.map(\.codePoint), ["U+1F1EF", "U+1F1F5"]) - } - - - func testControlCharacterInfo() { - - let charInfo = CharacterInfo(character: " ") - - XCTAssertEqual(charInfo.character, " ") - XCTAssertEqual(charInfo.pictureCharacter, "␠") - XCTAssertEqual(charInfo.character.unicodeScalars.map(\.name), ["SPACE"]) - } -} diff --git a/Tests/CollectionTests.swift b/Tests/CollectionTests.swift index ec85fccd1..92c2b7b0a 100644 --- a/Tests/CollectionTests.swift +++ b/Tests/CollectionTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2022 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,104 +24,100 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class CollectionTests: XCTestCase { +struct CollectionTests { - func testAppendUnique() { + @Test func appendUnique() { var array = [0, 1, 2, 3, 4] array.appendUnique(0, maximum: 5) - XCTAssertEqual(array, [1, 2, 3, 4, 0]) + #expect(array == [1, 2, 3, 4, 0]) array.appendUnique(6, maximum: 5) - XCTAssertEqual(array, [2, 3, 4, 0, 6]) + #expect(array == [2, 3, 4, 0, 6]) array.appendUnique(7, maximum: 6) - XCTAssertEqual(array, [2, 3, 4, 0, 6, 7]) + #expect(array == [2, 3, 4, 0, 6, 7]) array.appendUnique(6, maximum: 3) - XCTAssertEqual(array, [0, 7, 6]) + #expect(array == [0, 7, 6]) } - func testCount() { + @Test func count() { - XCTAssertEqual([1, 2, 0, -1, 3].count(where: { $0 > 0 }), 3) - XCTAssertEqual([0, 1, 2, 0, -1].count(where: { $0 > 0 }), 2) - XCTAssertEqual([1, 2, 3, 4, 5].count(where: { $0 > 0 }), 5) + #expect([1, 2, 0, -1, 3].count(where: { $0 > 0 }) == 3) + #expect([0, 1, 2, 0, -1].count(where: { $0 > 0 }) == 2) + #expect([1, 2, 3, 4, 5].count(where: { $0 > 0 }) == 5) - XCTAssertEqual([1, 2, 0, -1, 3].countPrefix(while: { $0 > 0 }), 2) - XCTAssertEqual([0, 1, 2, 0, -1].countPrefix(while: { $0 > 0 }), 0) - XCTAssertEqual([1, 2, 3, 4, 5].countPrefix(while: { $0 > 0 }), 5) + #expect([1, 2, 0, -1, 3].countPrefix(while: { $0 > 0 }) == 2) + #expect([0, 1, 2, 0, -1].countPrefix(while: { $0 > 0 }) == 0) + #expect([1, 2, 3, 4, 5].countPrefix(while: { $0 > 0 }) == 5) } - func testCountComparison() { + @Test func compareCount() { - XCTAssertEqual("".compareCount(with: 0), .equal) - XCTAssertEqual("".compareCount(with: 1), .less) + #expect("".compareCount(with: 0) == .equal) + #expect("".compareCount(with: 1) == .less) - XCTAssertEqual("a".compareCount(with: 1), .equal) - XCTAssertEqual("🐕".compareCount(with: 1), .equal) - XCTAssertEqual("🐕‍🦺".compareCount(with: 1), .equal) + #expect("a".compareCount(with: 1) == .equal) + #expect("🐕".compareCount(with: 1) == .equal) + #expect("🐕‍🦺".compareCount(with: 1) == .equal) - XCTAssertEqual("🐶🐱".compareCount(with: 3), .less) - XCTAssertEqual("🐶🐱".compareCount(with: 2), .equal) - XCTAssertEqual("🐶🐱".compareCount(with: 1), .greater) + #expect("🐶🐱".compareCount(with: 3) == .less) + #expect("🐶🐱".compareCount(with: 2) == .equal) + #expect("🐶🐱".compareCount(with: 1) == .greater) } - func testKeyMapping() { + @Test func mapKeys() { let dict = [1: 1, 2: 2, 3: 3] let mapped = dict.mapKeys { String($0 * 10) } - XCTAssertEqual(mapped, ["10": 1, "20": 2, "30": 3]) + #expect(mapped == ["10": 1, "20": 2, "30": 3]) } - func testRawRepresentable() { + @Test func rawRepresentable() { enum TestKey: String { case dog, cat, cow } var dict = ["dog": "🐶", "cat": "🐱"] - XCTAssertEqual(dict[TestKey.dog], dict[TestKey.dog.rawValue]) - XCTAssertNil(dict[TestKey.cow]) + #expect(dict[TestKey.dog] == dict[TestKey.dog.rawValue]) + #expect(dict[TestKey.cow] == nil) dict[TestKey.cow] = "🐮" - XCTAssertEqual(dict[TestKey.cow], "🐮") + #expect(dict[TestKey.cow] == "🐮") } - func testSorting() { + @Test(arguments: 0..<10) func sort(index: Int) { - for _ in 0..<10 { - var array: [Int] = (0..<10).map { _ in .random(in: 0..<100) } - let sorted = array.sorted { $0 < $1 } - - XCTAssertEqual(array.sorted(), sorted) - - array.sort() - XCTAssertEqual(array, sorted) - } + var array: [Int] = (0..<10).map { _ in .random(in: 0..<100) } + let sorted = array.sorted { $0 < $1 } + + #expect(array.sorted() == sorted) + + array.sort() + #expect(array == sorted) } - func testBinarySearch() { + @Test(arguments: 0..<10) func binarySearch(index: Int) { + + let array = (0..<20).map { _ in Int.random(in: 0..<100) }.sorted() for _ in 0..<10 { - let array = (0..<20).map { _ in Int.random(in: 0..<100) }.sorted() - - for _ in 0..<10 { - let index = Int.random(in: 0..<100) - XCTAssertEqual(array.binarySearchedFirstIndex(where: { $0 > index }), - array.firstIndex(where: { $0 > index })) - } + let index = Int.random(in: 0..<100) + #expect(array.binarySearchedFirstIndex(where: { $0 > index }) == + array.firstIndex(where: { $0 > index })) } } } diff --git a/Tests/ComparableTests.swift b/Tests/ComparableTests.swift new file mode 100644 index 000000000..055768754 --- /dev/null +++ b/Tests/ComparableTests.swift @@ -0,0 +1,78 @@ +// +// ComparableTests.swift +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2024-05-25. +// +// --------------------------------------------------------------------------- +// +// © 2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Testing +@testable import CotEditor + +struct ComparableTests { + + @Test func clamp() { + + #expect((-2).clamped(to: -10...10) == -2) + #expect(5.clamped(to: 6...10) == 6) + #expect(20.clamped(to: 6...10) == 10) + } + + + @Test func compareBool() { + + #expect([false, true, false, true, false].sorted() == [true, true, false, false, false]) + } + + + @Test func compareBoolItem() { + + struct Item: Equatable { + + var id: Int + var bool: Bool + } + + let items = [ + Item(id: 0, bool: false), + Item(id: 1, bool: true), + Item(id: 2, bool: true), + Item(id: 3, bool: false), + Item(id: 4, bool: true), + ] + + #expect(items.sorted(\.bool) == [ + Item(id: 1, bool: true), + Item(id: 2, bool: true), + Item(id: 4, bool: true), + Item(id: 0, bool: false), + Item(id: 3, bool: false), + ]) + + #expect(items.sorted(using: [KeyPathComparator(\.bool)]) == [ + Item(id: 1, bool: true), + Item(id: 2, bool: true), + Item(id: 4, bool: true), + Item(id: 0, bool: false), + Item(id: 3, bool: false), + ]) + } +} diff --git a/Tests/DebouncerTests.swift b/Tests/DebouncerTests.swift index 310a7542a..88828bd80 100644 --- a/Tests/DebouncerTests.swift +++ b/Tests/DebouncerTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2020 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,71 +23,55 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class DebouncerTests: XCTestCase { +struct DebouncerTests { - func testDebounce() { + @Test func debounce() async throws { - let expectation = self.expectation(description: "Debouncer executed") - let waitingExpectation = self.expectation(description: "Debouncer waiting") - waitingExpectation.isInverted = true - - var value = 0 - let debouncer = Debouncer(delay: .seconds(0.5)) { - value += 1 - expectation.fulfill() - waitingExpectation.fulfill() + try await confirmation("Debouncer executed", expectedCount: 1) { confirm in + let debouncer = Debouncer(delay: .seconds(0.5)) { + confirm() + } + + debouncer.schedule() + debouncer.schedule() + + try await Task.sleep(for: .seconds(1)) } - - XCTAssertEqual(value, 0) - - debouncer.schedule() - debouncer.schedule() - - self.wait(for: [waitingExpectation], timeout: 0.1) - - XCTAssertEqual(value, 0) - - self.wait(for: [expectation], timeout: 0.5) - - XCTAssertEqual(value, 1) } - func testImidiateFire() { + @Test func immediateFire() { var value = 0 let debouncer = Debouncer { value += 1 } - XCTAssertEqual(0, value) + #expect(0 == value) debouncer.fireNow() - XCTAssertEqual(value, 0, "The action is performed only when scheduled.") + #expect(value == 0, "The action is performed only when scheduled.") debouncer.schedule() - XCTAssertEqual(value, 0) + #expect(value == 0) debouncer.fireNow() - XCTAssertEqual(value, 1, "The scheduled action must be performed immediately.") + #expect(value == 1, "The scheduled action must be performed immediately.") } - func testCancellation() { + @Test func cancel() async { - let expectation = self.expectation(description: "Debouncer cancelled") - expectation.isInverted = true - - let debouncer = Debouncer { - expectation.fulfill() + await confirmation("Debouncer cancelled", expectedCount: 0) { confirm in + let debouncer = Debouncer { + confirm() + } + + debouncer.schedule() + debouncer.cancel() } - - debouncer.schedule() - debouncer.cancel() - - self.waitForExpectations(timeout: 1) } } diff --git a/Tests/EditedRangeSetTests.swift b/Tests/EditedRangeSetTests.swift index 7d2ec1d9a..98b6c25d9 100644 --- a/Tests/EditedRangeSetTests.swift +++ b/Tests/EditedRangeSetTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2023 1024jp +// © 2023-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,13 +23,14 @@ // limitations under the License. // +import AppKit.NSTextStorage import Combine -import XCTest +import Testing @testable import CotEditor -final class EditedRangeSetTests: XCTestCase { +struct EditedRangeSetTests { - func testRangeSet() throws { + @Test func rangeSet() throws { // abcdefg var set = EditedRangeSet() @@ -37,35 +38,35 @@ final class EditedRangeSetTests: XCTestCase { // ab|0000|efg // .replaceCharacters(in: NSRange(2..<3), with: "0000") set.append(editedRange: NSRange(location: 2, length: 4), changeInLength: 2) - XCTAssertEqual(set.ranges, [NSRange(location: 2, length: 4)]) + #expect(set.ranges == [NSRange(location: 2, length: 4)]) // ab0000e|g // .replaceCharacters(in: NSRange(7..<8), with: "") set.append(editedRange: NSRange(location: 7, length: 0), changeInLength: -1) - XCTAssertEqual(set.ranges, [NSRange(location: 2, length: 4), - NSRange(location: 7, length: 0)]) + #expect(set.ranges == [NSRange(location: 2, length: 4), + NSRange(location: 7, length: 0)]) // ab0|0eg // .replaceCharacters(in: NSRange(3..<5), with: "") set.append(editedRange: NSRange(location: 3, length: 0), changeInLength: -2) - XCTAssertEqual(set.ranges, [NSRange(location: 2, length: 2), - NSRange(location: 5, length: 0)]) + #expect(set.ranges == [NSRange(location: 2, length: 2), + NSRange(location: 5, length: 0)]) // a|1|b00eg // .replaceCharacters(in: NSRange(1..<1), with: "1") set.append(editedRange: NSRange(location: 1, length: 1), changeInLength: 1) - XCTAssertEqual(set.ranges, [NSRange(location: 1, length: 1), - NSRange(location: 3, length: 2), - NSRange(location: 6, length: 0)]) + #expect(set.ranges == [NSRange(location: 1, length: 1), + NSRange(location: 3, length: 2), + NSRange(location: 6, length: 0)]) set.clear() - XCTAssert(set.ranges.isEmpty) + #expect(set.ranges.isEmpty) } - func testUnion() throws { + @Test func union() throws { - XCTAssertEqual(NSRange(2..<3).union(NSRange(3..<4)), NSRange(2..<4)) + #expect(NSRange(2..<3).union(NSRange(3..<4)) == NSRange(2..<4)) let textStorage = NSTextStorage("abcdefghij") var set = EditedRangeSet() @@ -74,22 +75,22 @@ final class EditedRangeSetTests: XCTestCase { set.append(editedRange: NSRange(location: 2, length: 2), changeInLength: 0) textStorage.replaceCharacters(in: NSRange(location: 6, length: 2), with: "00") set.append(editedRange: NSRange(location: 6, length: 2), changeInLength: 0) - XCTAssertEqual(textStorage.string, "ab00ef00ij") - XCTAssertEqual(set.ranges, [NSRange(location: 2, length: 2), NSRange(location: 6, length: 2)]) + #expect(textStorage.string == "ab00ef00ij") + #expect(set.ranges == [NSRange(location: 2, length: 2), NSRange(location: 6, length: 2)]) textStorage.replaceCharacters(in: NSRange(location: 3, length: 4), with: "11") set.append(editedRange: NSRange(location: 3, length: 2), changeInLength: -2) - XCTAssertEqual(textStorage.string, "ab0110ij") - XCTAssertEqual(set.ranges, [NSRange(location: 2, length: 4)]) + #expect(textStorage.string == "ab0110ij") + #expect(set.ranges == [NSRange(location: 2, length: 4)]) textStorage.replaceCharacters(in: NSRange(location: 1, length: 3), with: "22") set.append(editedRange: NSRange(location: 1, length: 2), changeInLength: -1) - XCTAssertEqual(textStorage.string, "a2210ij") - XCTAssertEqual(set.ranges, [NSRange(location: 1, length: 4)]) + #expect(textStorage.string == "a2210ij") + #expect(set.ranges == [NSRange(location: 1, length: 4)]) } - func testJoin() throws { + @Test func join() throws { var set = EditedRangeSet() @@ -98,38 +99,35 @@ final class EditedRangeSetTests: XCTestCase { set.append(editedRange: NSRange(location: 0, length: 2), changeInLength: 0) set.append(editedRange: NSRange(location: 2, length: 2), changeInLength: 0) - XCTAssertEqual(set.ranges, [NSRange(location: 0, length: 6)]) + #expect(set.ranges == [NSRange(location: 0, length: 6)]) } - func testStorageTest() async throws { + @Test func testStorage() async throws { let textStorage = NSTextStorage("abcdefg") var set = EditedRangeSet() - let expectation = self.expectation(description: "UserDefaults observation for normal key") - expectation.expectedFulfillmentCount = 4 - - let observer = NotificationCenter.default.publisher(for: NSTextStorage.didProcessEditingNotification, object: textStorage) - .map { $0.object as! NSTextStorage } - .filter { $0.editedMask.contains(.editedCharacters) } - .sink { storage in - set.append(editedRange: storage.editedRange, changeInLength: storage.changeInLength) - expectation.fulfill() - } - - textStorage.replaceCharacters(in: NSRange(2..<4), with: "0000") - textStorage.replaceCharacters(in: NSRange(7..<8), with: "") - textStorage.replaceCharacters(in: NSRange(3..<5), with: "") - textStorage.replaceCharacters(in: NSRange(1..<1), with: "1") - - await self.fulfillment(of: [expectation], timeout: 2) - - XCTAssertEqual(textStorage.string, "a1b00eg") - XCTAssertEqual(set.ranges, [NSRange(location: 1, length: 1), - NSRange(location: 3, length: 2), - NSRange(location: 6, length: 0)]) - - observer.cancel() + await confirmation("UserDefaults observation for normal key", expectedCount: 4) { confirm in + let observer = NotificationCenter.default.publisher(for: NSTextStorage.didProcessEditingNotification, object: textStorage) + .map { $0.object as! NSTextStorage } + .filter { $0.editedMask.contains(.editedCharacters) } + .sink { storage in + set.append(editedRange: storage.editedRange, changeInLength: storage.changeInLength) + confirm() + } + + textStorage.replaceCharacters(in: NSRange(2..<4), with: "0000") + textStorage.replaceCharacters(in: NSRange(7..<8), with: "") + textStorage.replaceCharacters(in: NSRange(3..<5), with: "") + textStorage.replaceCharacters(in: NSRange(1..<1), with: "1") + + #expect(textStorage.string == "a1b00eg") + #expect(set.ranges == [NSRange(location: 1, length: 1), + NSRange(location: 3, length: 2), + NSRange(location: 6, length: 0)]) + + observer.cancel() + } } } diff --git a/Tests/EditorCounterTests.swift b/Tests/EditorCounterTests.swift index ad6a50dad..e573699f4 100644 --- a/Tests/EditorCounterTests.swift +++ b/Tests/EditorCounterTests.swift @@ -23,10 +23,24 @@ // limitations under the License. // -import XCTest +import AppKit +import Testing @testable import CotEditor -final class EditorCounterTests: XCTestCase { +@MainActor final class EditorCounterTests { + + @MainActor final class Provider: TextViewProvider { + + var textView: NSTextView? = NSTextView() + + + init(string: String, selectedRange: NSRange) { + + self.textView?.string = string + self.textView?.selectedRange = selectedRange + } + } + private let testString = """ dog is 🐕. @@ -34,109 +48,112 @@ final class EditorCounterTests: XCTestCase { Both are 👍🏼. """ - func testNoRequiredInfo() async throws { + @Test func noRequiredInfo() throws { - let selectedRange = try XCTUnwrap(Range(NSRange(0..<3), in: self.testString)) + let provider = Provider(string: self.testString, selectedRange: NSRange(0..<3)) let counter = EditorCounter() - try await counter.count(string: self.testString) - try await counter.move(selectedRanges: [selectedRange], string: self.testString) - let result = await counter.result + counter.document = provider + counter.invalidateContent() + counter.invalidateSelection() - XCTAssertNil(result.lines.entire) - XCTAssertNil(result.characters.entire) - XCTAssertNil(result.words.entire) - XCTAssertNil(result.location) - XCTAssertNil(result.line) - XCTAssertNil(result.column) + #expect(counter.result.lines.entire == nil) + #expect(counter.result.characters.entire == nil) + #expect(counter.result.words.entire == nil) + #expect(counter.result.location == nil) + #expect(counter.result.line == nil) + #expect(counter.result.column == nil) } - func testAllRequiredInfo() async throws { + @Test func allRequiredInfo() throws { - let selectedRange = try XCTUnwrap(Range(NSRange(11..<21), in: self.testString)) + let provider = Provider(string: self.testString, selectedRange: NSRange(11..<21)) let counter = EditorCounter() - await counter.update(types: .all) - try await counter.count(string: self.testString) - try await counter.move(selectedRanges: [selectedRange], string: self.testString) - let result = await counter.result + counter.document = provider + counter.updatesAll = true + counter.invalidateContent() + counter.invalidateSelection() - XCTAssertEqual(result.lines.entire, 3) - XCTAssertEqual(result.characters.entire, 31) - XCTAssertEqual(result.words.entire, 6) - - XCTAssertEqual(result.characters.selected, 9) - XCTAssertEqual(result.lines.selected, 1) - XCTAssertEqual(result.words.selected, 2) - - XCTAssertEqual(result.location, 10) - XCTAssertEqual(result.column, 0) - XCTAssertEqual(result.line, 2) + withKnownIssue("values will be updated asynchronously (This is the issue on the test side.)") { + #expect(counter.result.lines.entire == 3) + #expect(counter.result.characters.entire == 31) + #expect(counter.result.words.entire == 6) + + #expect(counter.result.characters.selected == 9) + #expect(counter.result.lines.selected == 1) + #expect(counter.result.words.selected == 2) + + #expect(counter.result.location == 10) + #expect(counter.result.column == 0) + #expect(counter.result.line == 2) + } } - func testWholeTextSkip() async throws { + @Test func skipWholeText() throws { - let selectedRange = try XCTUnwrap(Range(NSRange(11..<21), in: self.testString)) + let provider = Provider(string: self.testString, selectedRange: NSRange(11..<21)) let counter = EditorCounter() - await counter.update(types: .all) - try await counter.move(selectedRanges: [selectedRange], string: self.testString) - let result = await counter.result + counter.document = provider + counter.updatesAll = true + counter.invalidateSelection() - XCTAssertNil(result.lines.entire) - XCTAssertNil(result.characters.entire) - XCTAssertNil(result.words.entire) + #expect(counter.result.lines.entire == nil) + #expect(counter.result.characters.entire == nil) + #expect(counter.result.words.entire == nil) - XCTAssertEqual(result.lines.selected, 1) - XCTAssertEqual(result.characters.selected, 9) - XCTAssertEqual(result.words.selected, 2) - - XCTAssertEqual(result.location, 10) - XCTAssertEqual(result.column, 0) - XCTAssertEqual(result.line, 2) + withKnownIssue("values will be updated asynchronously (This is the issue on the test side.)") { + #expect(counter.result.lines.selected == 1) + #expect(counter.result.characters.selected == 9) + #expect(counter.result.words.selected == 2) + + #expect(counter.result.location == 10) + #expect(counter.result.column == 0) + #expect(counter.result.line == 2) + } } - func testCRLF() async throws { + @Test func crlf() throws { - let string = "a\r\nb" - let selectedRange = try XCTUnwrap(Range(NSRange(1..<4), in: string)) + let provider = Provider(string: "a\r\nb", selectedRange: NSRange(1..<4)) let counter = EditorCounter() - await counter.update(types: .all) - try await counter.count(string: string) - try await counter.move(selectedRanges: [selectedRange], string: string) - let result = await counter.result + counter.document = provider + counter.updatesAll = true + counter.invalidateContent() + counter.invalidateSelection() - XCTAssertEqual(result.lines.entire, 2) - XCTAssertEqual(result.characters.entire, 3) - XCTAssertEqual(result.words.entire, 2) +// #expect(counter.result.lines.entire == 2) +// #expect(counter.result.characters.entire == 3) +// #expect(counter.result.words.entire == 2) - XCTAssertEqual(result.lines.selected, 2) - XCTAssertEqual(result.characters.selected, 2) - XCTAssertEqual(result.words.selected, 1) +// #expect(counter.result.lines.selected == 2) +// #expect(counter.result.characters.selected == 2) +// #expect(counter.result.words.selected == 1) - XCTAssertEqual(result.location, 1) - XCTAssertEqual(result.column, 1) - XCTAssertEqual(result.line, 1) +// #expect(counter.result.location == 1) +// #expect(counter.result.column == 1) +// #expect(counter.result.line == 1) } - func testCountFormatting() { + @Test func formatEditorCount() { - var count = EditorCounter.Result.Count() + var count = EditorCount() - XCTAssertNil(count.formatted) + #expect(count.formatted == nil) count.entire = 1000 - XCTAssertEqual(count.formatted, "1,000") + #expect(count.formatted == "1,000") count.selected = 100 - XCTAssertEqual(count.formatted, "1,000 (100)") + #expect(count.formatted == "1,000 (100)") count.entire = nil - XCTAssertNil(count.formatted) + #expect(count.formatted == nil) } } diff --git a/Tests/EncodingDetectionTests.swift b/Tests/EncodingDetectionTests.swift deleted file mode 100644 index 7c6e80b0a..000000000 --- a/Tests/EncodingDetectionTests.swift +++ /dev/null @@ -1,315 +0,0 @@ -// -// EncodingDetectionTests.swift -// Tests -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2016-01-16. -// -// --------------------------------------------------------------------------- -// -// © 2016-2024 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import XCTest -@testable import CotEditor - -final class EncodingDetectionTests: XCTestCase { - - private lazy var bundle = Bundle(for: type(of: self)) - - - func testUTF8BOM() throws { - - // -> String(data:encoding:) preserves BOM since Swift 5 (2019-03) - // cf. https://bugs.swift.org/browse/SR-10173 - let data = try self.dataForFileName("UTF-8 BOM") - XCTAssertEqual(String(decoding: data, as: UTF8.self), "\u{FEFF}0") - XCTAssertEqual(String(bomCapableData: data, encoding: .utf8), "0") - - var encoding: String.Encoding? - let string = try self.encodedStringForFileName("UTF-8 BOM", usedEncoding: &encoding) - - XCTAssertEqual(string, "0") - XCTAssertEqual(encoding, .utf8) - - XCTAssertEqual(String(bomCapableData: Data(Unicode.BOM.utf8.sequence), encoding: .utf8), "") - XCTAssertEqual(String(bomCapableData: Data(), encoding: .utf8), "") - } - - - func testUTF16() throws { - - var encoding: String.Encoding? - let string = try self.encodedStringForFileName("UTF-16", usedEncoding: &encoding) - - XCTAssertEqual(string, "0") - XCTAssertEqual(encoding, .utf16) - } - - - func testUTF32() throws { - - var encoding: String.Encoding? - let string = try self.encodedStringForFileName("UTF-32", usedEncoding: &encoding) - - XCTAssertEqual(string, "0") - XCTAssertEqual(encoding, .utf32) - } - - - func testISO2022() throws { - - let data = try self.dataForFileName("ISO 2022-JP") - let encodings: [String.Encoding] = [.iso2022JP, .utf16] - - var encoding: String.Encoding? - let string = try String(data: data, suggestedEncodings: encodings, usedEncoding: &encoding) - - XCTAssertEqual(string, "dog犬") - XCTAssertEqual(encoding, .iso2022JP) - } - - - func testUTF8() throws { - - let data = try self.dataForFileName("UTF-8") - - var encoding: String.Encoding? - XCTAssertThrowsError(try String(data: data, suggestedEncodings: [], usedEncoding: &encoding)) { error in - XCTAssertEqual(error as? CocoaError, CocoaError(.fileReadUnknownStringEncoding)) - } - XCTAssertNil(encoding) - } - - - func testSuggestedEncoding() throws { - - let data = try self.dataForFileName("UTF-8") - - var encoding: String.Encoding? - let invalidEncoding = String.Encoding(cfEncoding: kCFStringEncodingInvalidId) - let string = try String(data: data, suggestedEncodings: [invalidEncoding, .utf8], usedEncoding: &encoding) - - XCTAssertEqual(string, "0") - XCTAssertEqual(encoding, .utf8) - } - - - func testEmptyData() { - - let data = Data() - - var encoding: String.Encoding? - var string: String? - - XCTAssertThrowsError(string = try String(data: data, suggestedEncodings: [], usedEncoding: &encoding)) { error in - XCTAssertEqual(error as? CocoaError, CocoaError(.fileReadUnknownStringEncoding)) - } - - XCTAssertNil(string) - XCTAssertNil(encoding) - XCTAssertFalse(data.starts(with: Unicode.BOM.utf8.sequence)) - } - - - func testUTF8BOMData() throws { - - let withBOMData = try self.dataForFileName("UTF-8 BOM") - XCTAssertTrue(withBOMData.starts(with: Unicode.BOM.utf8.sequence)) - - let data = try self.dataForFileName("UTF-8") - XCTAssertFalse(data.starts(with: Unicode.BOM.utf8.sequence)) - } - - - func testEncodingDeclarationScan() { - - let string = "" - XCTAssertNil(string.scanEncodingDeclaration(upTo: 16)) - XCTAssertEqual(string.scanEncodingDeclaration(upTo: 128), String.Encoding(cfEncodings: .shiftJIS)) - - XCTAssertEqual("".scanEncodingDeclaration(upTo: 128), .utf8) - - // Swift.Regex with non-simple word boundaries never returns when the given string contains a specific pattern of letters (2023-12 on Swift 5.9). - XCTAssertNil("ﾀﾏｺﾞ,1,".scanEncodingDeclaration(upTo: 128)) - XCTAssertNil(try /\ba/.wordBoundaryKind(.simple).firstMatch(in: "ﾀﾏｺﾞ,1,")) - } - - - func testEncodingInitialization() { - - XCTAssertEqual(String.Encoding(cfEncodings: CFStringEncodings.dosJapanese), .shiftJIS) - XCTAssertNotEqual(String.Encoding(cfEncodings: CFStringEncodings.shiftJIS), .shiftJIS) - XCTAssertNotEqual(String.Encoding(cfEncodings: CFStringEncodings.shiftJIS_X0213), .shiftJIS) - - XCTAssertEqual(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.dosJapanese.rawValue)), .shiftJIS) - XCTAssertNotEqual(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.shiftJIS.rawValue)), .shiftJIS) - XCTAssertNotEqual(String.Encoding(cfEncoding: CFStringEncoding(CFStringEncodings.shiftJIS_X0213.rawValue)), .shiftJIS) - } - - - /// Makes sure the behaviors around Shift-JIS. - func testShiftJIS() { - - let shiftJIS = CFStringEncoding(CFStringEncodings.shiftJIS.rawValue) - let shiftJIS_X0213 = CFStringEncoding(CFStringEncodings.shiftJIS_X0213.rawValue) - let dosJapanese = CFStringEncoding(CFStringEncodings.dosJapanese.rawValue) - - // IANA charset name conversion - // CFStringEncoding -> IANA charset name - XCTAssertEqual(CFStringConvertEncodingToIANACharSetName(shiftJIS) as String, "shift_jis") - XCTAssertEqual(CFStringConvertEncodingToIANACharSetName(shiftJIS_X0213) as String, "Shift_JIS") - - XCTAssertEqual(CFStringConvertEncodingToIANACharSetName(dosJapanese) as String, "cp932") - // IANA charset name -> CFStringEncoding - XCTAssertEqual(CFStringConvertIANACharSetNameToEncoding("SHIFT_JIS" as CFString), shiftJIS) - XCTAssertEqual(CFStringConvertIANACharSetNameToEncoding("shift_jis" as CFString), shiftJIS) - XCTAssertEqual(CFStringConvertIANACharSetNameToEncoding("cp932" as CFString), dosJapanese) - XCTAssertEqual(CFStringConvertIANACharSetNameToEncoding("sjis" as CFString), dosJapanese) - XCTAssertEqual(CFStringConvertIANACharSetNameToEncoding("shiftjis" as CFString), dosJapanese) - XCTAssertNotEqual(CFStringConvertIANACharSetNameToEncoding("shift_jis" as CFString), shiftJIS_X0213) - - // `String.Encoding.shiftJIS` is "Japanese (Windows, DOS)." - XCTAssertEqual(CFStringConvertNSStringEncodingToEncoding(String.Encoding.shiftJIS.rawValue), dosJapanese) - } - - - func testXattrEncoding() { - - let utf8Data = Data("utf-8;134217984".utf8) - - XCTAssertEqual(String.Encoding.utf8.xattrEncodingData, utf8Data) - XCTAssertEqual(utf8Data.decodingXattrEncoding, .utf8) - XCTAssertEqual(Data("utf-8".utf8).decodingXattrEncoding, .utf8) - - - let eucJPData = Data("euc-jp;2336".utf8) - - XCTAssertEqual(String.Encoding.japaneseEUC.xattrEncodingData, eucJPData) - XCTAssertEqual(eucJPData.decodingXattrEncoding, .japaneseEUC) - XCTAssertEqual(Data("euc-jp".utf8).decodingXattrEncoding, .japaneseEUC) - } - - - func testYenConversion() { - - XCTAssertTrue("¥".canBeConverted(to: .utf8)) - XCTAssertTrue("¥".canBeConverted(to: String.Encoding(cfEncodings: .shiftJIS))) - XCTAssertFalse("¥".canBeConverted(to: .shiftJIS)) - XCTAssertFalse("¥".canBeConverted(to: .japaneseEUC)) // ? (U+003F) - XCTAssertFalse("¥".canBeConverted(to: .ascii)) // Y (U+0059) - - let string = "\\ ¥ yen" - XCTAssertEqual(string.convertYenSign(for: .utf8), string) - XCTAssertEqual(string.convertYenSign(for: String.Encoding(cfEncodings: .shiftJIS)), string) - XCTAssertEqual(string.convertYenSign(for: .shiftJIS), "\\ \\ yen") - XCTAssertEqual(string.convertYenSign(for: .japaneseEUC), "\\ \\ yen") - XCTAssertEqual(string.convertYenSign(for: .ascii), "\\ \\ yen") - } - - - func testIANACharsetName() { - - XCTAssertEqual(String.Encoding.utf8.ianaCharSetName, "utf-8") - XCTAssertEqual(String.Encoding.isoLatin1.ianaCharSetName, "iso-8859-1") - } - - - func testYenEncoding() throws { - - // encodings listed in faq_about_yen_backslash.html - let ascii = try XCTUnwrap(CFStringEncodings(rawValue: CFIndex(CFStringBuiltInEncodings.ASCII.rawValue))) - let inHelpCFEncodings: [CFStringEncodings] = [ - .dosJapanese, - .EUC_JP, // Japanese (EUC) - .EUC_TW, // Traditional Chinese (EUC) - .EUC_CN, // Simplified Chinese (GB 2312) - .EUC_KR, // Korean (EUC) - .dosKorean, // Korean (Windows, DOS) - .dosThai, // Thai (Windows, DOS) - .isoLatinThai, // Thai (ISO 8859-11) - - .macArabic, // Arabic (Mac OS) - .isoLatinArabic, // Arabic (ISO 8859-6) - .macHebrew, // Hebrew (Mac OS) - .isoLatinGreek, // Greek (ISO 8859-7) - .macCyrillic, // Cyrillic (Mac OS) - .isoLatinCyrillic, // Cyrillic (ISO 8859-5) - .windowsCyrillic, // Cyrillic (Windows) - .macCentralEurRoman, // Central European (Mac OS) - .isoLatin2, // Central European (ISO Latin 2) - .isoLatin3, // Western (ISO Latin 3) - .isoLatin4, // Central European (ISO Latin 4) - .dosLatinUS, // Latin-US (DOS) - .windowsLatin2, // Central European (Windows Latin 2) - .isoLatin6, // Nordic (ISO Latin 6) - .isoLatin7, // Baltic (ISO Latin 7) - .isoLatin8, // Celtic (ISO Latin 8) - .isoLatin10, // Romanian (ISO Latin 10) - .dosRussian, // Russian (DOS) - ascii, // Western (ASCII) - ] - let inHelpEncodings = inHelpCFEncodings - .map(\.rawValue) - .map(CFStringEncoding.init) - .map(String.Encoding.init(cfEncoding:)) - let availableEncodings = DefaultSettings.encodings - .filter { $0 != kCFStringEncodingInvalidId } - .map(String.Encoding.init(cfEncoding:)) - let yenIncompatibleEncodings = availableEncodings - .filter { !"¥".canBeConverted(to: $0) } - - for encoding in yenIncompatibleEncodings { - XCTAssert(inHelpEncodings.contains(encoding), "\(String.localizedName(of: encoding))") - } - for encoding in inHelpEncodings { - XCTAssert(availableEncodings.contains(encoding), "\(String.localizedName(of: encoding))") - } - } -} - - -// MARK: Private Methods - -private extension String.Encoding { - - init(cfEncodings: CFStringEncodings) { - - self.init(rawValue: CFStringConvertEncodingToNSStringEncoding(CFStringEncoding(cfEncodings.rawValue))) - } -} - - -private extension EncodingDetectionTests { - - func encodedStringForFileName(_ fileName: String, usedEncoding: inout String.Encoding?) throws -> String { - - let data = try self.dataForFileName(fileName) - - return try String(data: data, suggestedEncodings: [], usedEncoding: &usedEncoding) - } - - - func dataForFileName(_ fileName: String) throws -> Data { - - guard - let fileURL = self.bundle.url(forResource: fileName, withExtension: "txt", subdirectory: "Encodings") - else { throw CocoaError(.fileNoSuchFile) } - - return try Data(contentsOf: fileURL) - } -} diff --git a/Tests/EncodingTests.swift b/Tests/EncodingTests.swift new file mode 100644 index 000000000..1bc14a913 --- /dev/null +++ b/Tests/EncodingTests.swift @@ -0,0 +1,84 @@ +// +// EncodingTests.swift +// Tests +// +// CotEditor +// https://coteditor.com +// +// Created by 1024jp on 2016-01-16. +// +// --------------------------------------------------------------------------- +// +// © 2016-2024 1024jp +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import Foundation +import Testing +@testable import CotEditor + +struct EncodingTests { + + @Test func encodeYen() throws { + + // encodings listed in faq_about_yen_backslash.html + let ascii = try #require(CFStringEncodings(rawValue: CFIndex(CFStringBuiltInEncodings.ASCII.rawValue))) + let inHelpCFEncodings: [CFStringEncodings] = [ + .dosJapanese, + .EUC_JP, // Japanese (EUC) + .EUC_TW, // Traditional Chinese (EUC) + .EUC_CN, // Simplified Chinese (GB 2312) + .EUC_KR, // Korean (EUC) + .dosKorean, // Korean (Windows, DOS) + .dosThai, // Thai (Windows, DOS) + .isoLatinThai, // Thai (ISO 8859-11) + + .macArabic, // Arabic (Mac OS) + .isoLatinArabic, // Arabic (ISO 8859-6) + .macHebrew, // Hebrew (Mac OS) + .isoLatinGreek, // Greek (ISO 8859-7) + .macCyrillic, // Cyrillic (Mac OS) + .isoLatinCyrillic, // Cyrillic (ISO 8859-5) + .windowsCyrillic, // Cyrillic (Windows) + .macCentralEurRoman, // Central European (Mac OS) + .isoLatin2, // Central European (ISO Latin 2) + .isoLatin3, // Western (ISO Latin 3) + .isoLatin4, // Central European (ISO Latin 4) + .dosLatinUS, // Latin-US (DOS) + .windowsLatin2, // Central European (Windows Latin 2) + .isoLatin6, // Nordic (ISO Latin 6) + .isoLatin7, // Baltic (ISO Latin 7) + .isoLatin8, // Celtic (ISO Latin 8) + .isoLatin10, // Romanian (ISO Latin 10) + .dosRussian, // Russian (DOS) + ascii, // Western (ASCII) + ] + let inHelpEncodings = inHelpCFEncodings + .map(\.rawValue) + .map(CFStringEncoding.init) + .map(String.Encoding.init(cfEncoding:)) + let availableEncodings = DefaultSettings.encodings + .filter { $0 != kCFStringEncodingInvalidId } + .map(String.Encoding.init(cfEncoding:)) + let yenIncompatibleEncodings = availableEncodings + .filter { !"¥".canBeConverted(to: $0) } + + for encoding in yenIncompatibleEncodings { + #expect(inHelpEncodings.contains(encoding), "\(String.localizedName(of: encoding))") + } + for encoding in inHelpEncodings { + #expect(availableEncodings.contains(encoding), "\(String.localizedName(of: encoding))") + } + } +} diff --git a/Tests/FileDropItemTests.swift b/Tests/FileDropItemTests.swift index 3df42416d..1b9e711c3 100644 --- a/Tests/FileDropItemTests.swift +++ b/Tests/FileDropItemTests.swift @@ -23,41 +23,53 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class FileDropItemTests: XCTestCase { +struct FileDropItemTests { - func testAvailability() { + @Test func emptyAvailability() { - let emptyItem = FileDropItem() - XCTAssertTrue(emptyItem.supports(extension: "JPG", scope: "foo")) - XCTAssertTrue(emptyItem.supports(extension: "jpg", scope: nil)) - XCTAssertTrue(emptyItem.supports(extension: nil, scope: "")) - XCTAssertTrue(emptyItem.supports(extension: nil, scope: nil)) + let item = FileDropItem() + #expect(item.supports(extension: "JPG", scope: "foo")) + #expect(item.supports(extension: "jpg", scope: nil)) + #expect(item.supports(extension: nil, scope: "")) + #expect(item.supports(extension: nil, scope: nil)) + } + + + @Test func extensionAvailability() { - let extensionItem = FileDropItem(format: "", extensions: ["jpg", "JPEG"]) - XCTAssertTrue(extensionItem.supports(extension: "JPG", scope: "foo")) - XCTAssertTrue(extensionItem.supports(extension: "JPG", scope: nil)) - XCTAssertFalse(extensionItem.supports(extension: "gif", scope: "foo")) - XCTAssertFalse(extensionItem.supports(extension: nil, scope: "foo")) - XCTAssertFalse(extensionItem.supports(extension: nil, scope: nil)) + let item = FileDropItem(format: "", extensions: ["jpg", "JPEG"]) + #expect(item.supports(extension: "JPG", scope: "foo")) + #expect(item.supports(extension: "JPG", scope: nil)) + #expect(!item.supports(extension: "gif", scope: "foo")) + #expect(!item.supports(extension: nil, scope: "foo")) + #expect(!item.supports(extension: nil, scope: nil)) + } + + + @Test func scopeAvailability() { - let scopeItem = FileDropItem(format: "", scope: "foo") - XCTAssertTrue(scopeItem.supports(extension: "JPG", scope: "foo")) - XCTAssertTrue(scopeItem.supports(extension: "gif", scope: "foo")) - XCTAssertTrue(scopeItem.supports(extension: nil, scope: "foo")) - XCTAssertFalse(scopeItem.supports(extension: nil, scope: "bar")) - XCTAssertFalse(scopeItem.supports(extension: "JPG", scope: nil)) - XCTAssertFalse(scopeItem.supports(extension: nil, scope: nil)) + let item = FileDropItem(format: "", scope: "foo") + #expect(item.supports(extension: "JPG", scope: "foo")) + #expect(item.supports(extension: "gif", scope: "foo")) + #expect(item.supports(extension: nil, scope: "foo")) + #expect(!item.supports(extension: nil, scope: "bar")) + #expect(!item.supports(extension: "JPG", scope: nil)) + #expect(!item.supports(extension: nil, scope: nil)) + } + + + @Test func mixAvailability() { let item = FileDropItem(format: "", extensions: ["jpg", "JPEG"], scope: "foo") - XCTAssertTrue(item.supports(extension: "JPG", scope: "foo")) - XCTAssertTrue(item.supports(extension: "jpeg", scope: "foo")) - XCTAssertFalse(item.supports(extension: "gif", scope: "foo")) - XCTAssertFalse(item.supports(extension: nil, scope: "foo")) - XCTAssertFalse(item.supports(extension: nil, scope: "bar")) - XCTAssertFalse(item.supports(extension: "JPG", scope: nil)) - XCTAssertFalse(item.supports(extension: nil, scope: nil)) + #expect(item.supports(extension: "JPG", scope: "foo")) + #expect(item.supports(extension: "jpeg", scope: "foo")) + #expect(!item.supports(extension: "gif", scope: "foo")) + #expect(!item.supports(extension: nil, scope: "foo")) + #expect(!item.supports(extension: nil, scope: "bar")) + #expect(!item.supports(extension: "JPG", scope: nil)) + #expect(!item.supports(extension: nil, scope: nil)) } } diff --git a/Tests/FontExtensionTests.swift b/Tests/FontExtensionTests.swift index 0b2e0c645..b9ba8d0bd 100644 --- a/Tests/FontExtensionTests.swift +++ b/Tests/FontExtensionTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,40 +24,45 @@ // limitations under the License. // -import XCTest +import AppKit.NSFont +import Testing @testable import CotEditor -final class FontExtensionTests: XCTestCase { +struct FontExtensionTests { - func testFontSize() { + @Test func fontSize() { let font = NSFont(name: "Menlo-Regular", size: 11) - XCTAssertEqual(font?.width(of: " "), 6.62255859375) + #expect(font?.width(of: " ") == 6.62255859375) } - func testFontWeight() throws { + @Test func fontWeight() throws { - let regularFont = try XCTUnwrap(NSFont(name: "Menlo-Regular", size: 11)) - let boldFont = try XCTUnwrap(NSFont(name: "Menlo-Bold", size: 11)) + let regularFont = try #require(NSFont(name: "Menlo-Regular", size: 11)) + let boldFont = try #require(NSFont(name: "Menlo-Bold", size: 11)) - XCTAssertEqual(regularFont.weight, .regular) - XCTAssertEqual(boldFont.weight.rawValue, NSFont.Weight.bold.rawValue, accuracy: 0.00001) + #expect(regularFont.weight == .regular) + withKnownIssue("Test-side issue") { + #expect(boldFont.weight.rawValue == NSFont.Weight.bold.rawValue) // accuracy: 0.00001 + } // The const value is (unfortunately) not exact equal... - XCTAssertEqual(boldFont.weight.rawValue, 0.4) - XCTAssertNotEqual(NSFont.Weight.bold.rawValue, 0.4) + #expect(boldFont.weight.rawValue == 0.4) + #expect(NSFont.Weight.bold.rawValue != 0.4) } - func testNamedFont() throws { + @Test func namedFont() throws { - let menlo = try XCTUnwrap(NSFont(named: .menlo, size: 11)) - XCTAssertEqual(menlo, NSFont(name: "Menlo-Regular", size: 11)) + let menlo = try #require(NSFont(named: .menlo, size: 11)) + #expect(menlo == NSFont(name: "Menlo-Regular", size: 11)) - let avenirNextCondensed = try XCTUnwrap(NSFont(named: .avenirNextCondensed, weight: .bold, size: 11)) - XCTAssertEqual(avenirNextCondensed, NSFont(name: "AvenirNextCondensed-Bold", size: 11)) - XCTAssertEqual(avenirNextCondensed.weight.rawValue, NSFont.Weight.bold.rawValue, accuracy: 0.00001) + let avenirNextCondensed = try #require(NSFont(named: .avenirNextCondensed, weight: .bold, size: 11)) + #expect(avenirNextCondensed == NSFont(name: "AvenirNextCondensed-Bold", size: 11)) + withKnownIssue("Test-side issue") { + #expect(avenirNextCondensed.weight.rawValue == NSFont.Weight.bold.rawValue) // accuracy: 0.00001 + } } } diff --git a/Tests/FormatStylesTests.swift b/Tests/FormatStylesTests.swift index fbd02f64b..50b9cb3ea 100644 --- a/Tests/FormatStylesTests.swift +++ b/Tests/FormatStylesTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,32 +23,47 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class FormatStylesTests: XCTestCase { +struct FormatStylesTests { - func testRangedInteger() throws { + @Test func formatCSV() throws { + + #expect(["dog", "cat"].formatted(.csv) == "dog, cat") + #expect(["dog"].formatted(.csv) == "dog") + #expect(["dog", "", "dog", ""].formatted(.csv) == "dog, , dog, ") + #expect(["dog", "", "dog", ""].formatted(.csv(omittingEmptyItems: true)) == "dog, dog") + + let strategy = CSVFormatStyle().parseStrategy + #expect(try strategy.parse("dog, cat") == ["dog", "cat"]) + #expect(try strategy.parse(" a,b,c") == ["a", "b", "c"]) + #expect(try strategy.parse(" a, ,c") == ["a", "", "c"]) + #expect(try CSVFormatStyle(omittingEmptyItems: true).parseStrategy.parse(" a,,c") == ["a", "c"]) + } + + + @Test func rangedInteger() throws { let formatter = RangedIntegerFormatStyle(range: 1...(.max)) - XCTAssertEqual(formatter.format(-3), "1") - XCTAssertEqual(try formatter.parseStrategy.parse("0"), 1) - XCTAssertEqual(try formatter.parseStrategy.parse("1"), 1) - XCTAssertEqual(try formatter.parseStrategy.parse("2"), 2) - XCTAssertEqual(try formatter.parseStrategy.parse("a"), 1) + #expect(formatter.format(-3) == "1") + #expect(try formatter.parseStrategy.parse("0") == 1) + #expect(try formatter.parseStrategy.parse("1") == 1) + #expect(try formatter.parseStrategy.parse("2") == 2) + #expect(try formatter.parseStrategy.parse("a") == 1) } - func testRangedIntegerWithDefault() throws { + @Test func rangedIntegerWithDefault() throws { let formatter = RangedIntegerFormatStyle(range: -1...(.max), defaultValue: 4) - XCTAssertEqual(formatter.format(-3), "-1") - XCTAssertEqual(try formatter.parseStrategy.parse("-2"), -1) - XCTAssertEqual(try formatter.parseStrategy.parse("-1"), -1) - XCTAssertEqual(try formatter.parseStrategy.parse("0"), 0) - XCTAssertEqual(try formatter.parseStrategy.parse("2"), 2) - XCTAssertEqual(try formatter.parseStrategy.parse("a"), 4) + #expect(formatter.format(-3) == "-1") + #expect(try formatter.parseStrategy.parse("-2") == -1) + #expect(try formatter.parseStrategy.parse("-1") == -1) + #expect(try formatter.parseStrategy.parse("0") == 0) + #expect(try formatter.parseStrategy.parse("2") == 2) + #expect(try formatter.parseStrategy.parse("a") == 4) } } diff --git a/Tests/FourCharCodeTests.swift b/Tests/FourCharCodeTests.swift index 2bea53b73..c029919cc 100644 --- a/Tests/FourCharCodeTests.swift +++ b/Tests/FourCharCodeTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2020 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,14 +24,15 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class FourCharCodeTests: XCTestCase { +struct FourCharCodeTests { - func testInitializer() { + @Test func initialize() { - XCTAssertEqual(FourCharCode(stringLiteral: "TEXT"), NSHFSTypeCodeFromFileType("'TEXT'")) - XCTAssertEqual("rtfd", NSHFSTypeCodeFromFileType("'rtfd'")) + #expect(FourCharCode(stringLiteral: "TEXT") == NSHFSTypeCodeFromFileType("'TEXT'")) + #expect("rtfd" == NSHFSTypeCodeFromFileType("'rtfd'")) } } diff --git a/Tests/FuzzyRangeTests.swift b/Tests/FuzzyRangeTests.swift index ea49dcb96..c35bc35a8 100644 --- a/Tests/FuzzyRangeTests.swift +++ b/Tests/FuzzyRangeTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2023 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,111 +23,116 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class FuzzyRangeTests: XCTestCase { +struct FuzzyRangeTests { - func testFuzzyCharacterRange() { + @Test func fuzzyCharacterRange() { let string = "0123456789" - XCTAssertEqual(string.range(in: FuzzyRange(location: 2, length: 2)), NSRange(location: 2, length: 2)) - XCTAssertEqual(string.range(in: FuzzyRange(location: -1, length: 0)), NSRange(location: 10, length: 0)) - XCTAssertEqual(string.range(in: FuzzyRange(location: -2, length: 1)), NSRange(location: 9, length: 1)) - XCTAssertEqual(string.range(in: FuzzyRange(location: 3, length: -1)), NSRange(3..<9)) - XCTAssertEqual(string.range(in: FuzzyRange(location: 3, length: -2)), NSRange(location: 3, length: "45678".utf16.count)) + #expect(string.range(in: FuzzyRange(location: 2, length: 2)) == NSRange(location: 2, length: 2)) + #expect(string.range(in: FuzzyRange(location: -1, length: 0)) == NSRange(location: 10, length: 0)) + #expect(string.range(in: FuzzyRange(location: -2, length: 1)) == NSRange(location: 9, length: 1)) + #expect(string.range(in: FuzzyRange(location: 3, length: -1)) == NSRange(3..<9)) + #expect(string.range(in: FuzzyRange(location: 3, length: -2)) == NSRange(location: 3, length: "45678".utf16.count)) + + // grapheme cluster count + #expect("black 🐈‍⬛ cat".range(in: FuzzyRange(location: 6, length: 2)) == NSRange(location: 6, length: 5)) } - func testFuzzyLineRange() throws { + @Test func fuzzyLineRange() throws { let string = "1\r\n2\r\n3\r\n4" // 1 based var range: NSRange - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: 1, length: 2))) - XCTAssertEqual((string as NSString).substring(with: range), "1\r\n2\r\n") + range = try #require(string.rangeForLine(in: FuzzyRange(location: 1, length: 2))) + #expect((string as NSString).substring(with: range) == "1\r\n2\r\n") - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: 4, length: 1))) - XCTAssertEqual((string as NSString).substring(with: range), "4") + range = try #require(string.rangeForLine(in: FuzzyRange(location: 4, length: 1))) + #expect((string as NSString).substring(with: range) == "4") - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: 3, length: 0))) - XCTAssertEqual((string as NSString).substring(with: range), "3\r\n") + range = try #require(string.rangeForLine(in: FuzzyRange(location: 3, length: 0))) + #expect((string as NSString).substring(with: range) == "3\r\n") - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: -1, length: 1))) - XCTAssertEqual((string as NSString).substring(with: range), "4") + range = try #require(string.rangeForLine(in: FuzzyRange(location: -1, length: 1))) + #expect((string as NSString).substring(with: range) == "4") - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: -2, length: 1))) - XCTAssertEqual((string as NSString).substring(with: range), "3\r\n") + range = try #require(string.rangeForLine(in: FuzzyRange(location: -2, length: 1))) + #expect((string as NSString).substring(with: range) == "3\r\n") - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: 2, length: -2))) - XCTAssertEqual((string as NSString).substring(with: range), "2\r\n") + range = try #require(string.rangeForLine(in: FuzzyRange(location: 2, length: -2))) + #expect((string as NSString).substring(with: range) == "2\r\n") - range = try XCTUnwrap("1\n".rangeForLine(in: FuzzyRange(location: -1, length: 0))) - XCTAssertEqual(range, NSRange(location: 2, length: 0)) + range = try #require("1\n".rangeForLine(in: FuzzyRange(location: -1, length: 0))) + #expect(range == NSRange(location: 2, length: 0)) - range = try XCTUnwrap(string.rangeForLine(in: FuzzyRange(location: 1, length: 2), includingLineEnding: false)) - XCTAssertEqual((string as NSString).substring(with: range), "1\r\n2") + range = try #require(string.rangeForLine(in: FuzzyRange(location: 1, length: 2), includingLineEnding: false)) + #expect((string as NSString).substring(with: range) == "1\r\n2") } - func testFormattingFuzzyRange() { + @Test func formatFuzzyRange() { - XCTAssertEqual(FuzzyRange(location: 0, length: 0).formatted(), "0") - XCTAssertEqual(FuzzyRange(location: 1, length: 0).formatted(), "1") - XCTAssertEqual(FuzzyRange(location: 1, length: 1).formatted(), "1") - XCTAssertEqual(FuzzyRange(location: 1, length: 2).formatted(), "1:2") - XCTAssertEqual(FuzzyRange(location: -1, length: 0).formatted(), "-1") - XCTAssertEqual(FuzzyRange(location: -1, length: -1).formatted(), "-1:-1") + #expect(FuzzyRange(location: 0, length: 0).formatted() == "0") + #expect(FuzzyRange(location: 1, length: 0).formatted() == "1") + #expect(FuzzyRange(location: 1, length: 1).formatted() == "1") + #expect(FuzzyRange(location: 1, length: 2).formatted() == "1:2") + #expect(FuzzyRange(location: -1, length: 0).formatted() == "-1") + #expect(FuzzyRange(location: -1, length: -1).formatted() == "-1:-1") } - func testParsingFuzzyRange() throws { + @Test func parseFuzzyRange() throws { let parser = FuzzyRangeParseStrategy() - XCTAssertEqual(try parser.parse("0"), FuzzyRange(location: 0, length: 0)) - XCTAssertEqual(try parser.parse("1"), FuzzyRange(location: 1, length: 0)) - XCTAssertEqual(try parser.parse("1:2"), FuzzyRange(location: 1, length: 2)) - XCTAssertEqual(try parser.parse("-1"), FuzzyRange(location: -1, length: 0)) - XCTAssertEqual(try parser.parse("-1:-1"), FuzzyRange(location: -1, length: -1)) - XCTAssertThrowsError(try parser.parse("")) - XCTAssertThrowsError(try parser.parse("abc")) - XCTAssertThrowsError(try parser.parse("1:a")) - XCTAssertThrowsError(try parser.parse("1:1:1")) + #expect(try parser.parse("0") == FuzzyRange(location: 0, length: 0)) + #expect(try parser.parse("1") == FuzzyRange(location: 1, length: 0)) + #expect(try parser.parse("1:2") == FuzzyRange(location: 1, length: 2)) + #expect(try parser.parse("-1") == FuzzyRange(location: -1, length: 0)) + #expect(try parser.parse("-1:-1") == FuzzyRange(location: -1, length: -1)) + + #expect(throws: FuzzyRangeParseStrategy.ParseError.invalidValue) { try parser.parse("") } + #expect(throws: FuzzyRangeParseStrategy.ParseError.invalidValue) { try parser.parse("abc") } + #expect(throws: FuzzyRangeParseStrategy.ParseError.invalidValue) { try parser.parse("1:a") } + #expect(throws: FuzzyRangeParseStrategy.ParseError.invalidValue) { try parser.parse("1:1:1") } } - func testFuzzyLocation() throws { + @Test func fuzzyLocation() throws { let string = "1\r\n2\r\n3\r\n456\n567" // 1 based - XCTAssertEqual(try string.fuzzyLocation(line: 0), 0) - XCTAssertEqual(try string.fuzzyLocation(line: 0, column: 1), 1) + #expect(try string.fuzzyLocation(line: 0) == 0) + #expect(try string.fuzzyLocation(line: 0, column: 1) == 1) - XCTAssertEqual(try string.fuzzyLocation(line: 1), 0) - XCTAssertEqual(try string.fuzzyLocation(line: 2), 3) - XCTAssertEqual(try string.fuzzyLocation(line: 4), 9) - XCTAssertEqual(try string.fuzzyLocation(line: 5), 13) - XCTAssertEqual(try string.fuzzyLocation(line: -1), 13) - XCTAssertEqual(try string.fuzzyLocation(line: -2), 9) - XCTAssertEqual(try string.fuzzyLocation(line: -5), 0) - XCTAssertThrowsError(try string.fuzzyLocation(line: -6)) + #expect(try string.fuzzyLocation(line: 1) == 0) + #expect(try string.fuzzyLocation(line: 2) == 3) + #expect(try string.fuzzyLocation(line: 4) == 9) + #expect(try string.fuzzyLocation(line: 5) == 13) + #expect(try string.fuzzyLocation(line: -1) == 13) + #expect(try string.fuzzyLocation(line: -2) == 9) + #expect(try string.fuzzyLocation(line: -5) == 0) + #expect(throws: FuzzyLocationError.invalidLine(-6)) { try string.fuzzyLocation(line: -6) } // line with a line ending - XCTAssertEqual(try string.fuzzyLocation(line: 4, column: 0), 9) - XCTAssertEqual(try string.fuzzyLocation(line: 4, column: 1), 10) - XCTAssertEqual(try string.fuzzyLocation(line: 4, column: 3), 12) - XCTAssertThrowsError(try string.fuzzyLocation(line: 4, column: 4)) - XCTAssertEqual(try string.fuzzyLocation(line: 4, column: -1), 12) - XCTAssertEqual(try string.fuzzyLocation(line: 4, column: -2), 11) + #expect(try string.fuzzyLocation(line: 4, column: 0) == 9) + #expect(try string.fuzzyLocation(line: 4, column: 1) == 10) + #expect(try string.fuzzyLocation(line: 4, column: 3) == 12) + #expect(throws: FuzzyLocationError.invalidColumn(4)) { try string.fuzzyLocation(line: 4, column: 4) } + #expect(try string.fuzzyLocation(line: 4, column: -1) == 12) + #expect(try string.fuzzyLocation(line: 4, column: -2) == 11) // line without any line endings (the last line) - XCTAssertEqual(try string.fuzzyLocation(line: 5, column: 0), 13) - XCTAssertEqual(try string.fuzzyLocation(line: 5, column: 1), 14) - XCTAssertEqual(try string.fuzzyLocation(line: 5, column: 3), 16) - XCTAssertThrowsError(try string.fuzzyLocation(line: 5, column: 4)) - XCTAssertEqual(try string.fuzzyLocation(line: 5, column: -1), 16) - XCTAssertEqual(try string.fuzzyLocation(line: 5, column: -2), 15) + #expect(try string.fuzzyLocation(line: 5, column: 0) == 13) + #expect(try string.fuzzyLocation(line: 5, column: 1) == 14) + #expect(try string.fuzzyLocation(line: 5, column: 3) == 16) + #expect(throws: FuzzyLocationError.invalidColumn(4)) { try string.fuzzyLocation(line: 5, column: 4) } + #expect(try string.fuzzyLocation(line: 5, column: -1) == 16) + #expect(try string.fuzzyLocation(line: 5, column: -2) == 15) } } diff --git a/Tests/GeometryTests.swift b/Tests/GeometryTests.swift index f1bced095..ace915153 100644 --- a/Tests/GeometryTests.swift +++ b/Tests/GeometryTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2022 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,37 +24,38 @@ // limitations under the License. // -import XCTest +import CoreGraphics +import Testing @testable import CotEditor -final class GeometryTests: XCTestCase { +struct GeometryTests { - func testScaling() { + @Test func scale() { - XCTAssertEqual(CGSize.unit.scaled(to: 0.5), CGSize(width: 0.5, height: 0.5)) - XCTAssertEqual(CGPoint(x: 2, y: 1).scaled(to: 2), CGPoint(x: 4, y: 2)) - XCTAssertEqual(CGRect(x: 2, y: 1, width: 2, height: 1).scaled(to: 2), - CGRect(x: 4, y: 2, width: 4, height: 2)) + #expect(CGSize.unit.scaled(to: 0.5) == CGSize(width: 0.5, height: 0.5)) + #expect(CGPoint(x: 2, y: 1).scaled(to: 2) == CGPoint(x: 4, y: 2)) + #expect(CGRect(x: 2, y: 1, width: 2, height: 1).scaled(to: 2) == + CGRect(x: 4, y: 2, width: 4, height: 2)) } - func testRectMid() { + @Test func rectMid() { - XCTAssertEqual(CGRect(x: 1, y: 2, width: 2, height: 4).mid, CGPoint(x: 2, y: 4)) + #expect(CGRect(x: 1, y: 2, width: 2, height: 4).mid == CGPoint(x: 2, y: 4)) } - func testPrefix() { + @Test func prefix() { - XCTAssertEqual(-CGPoint(x: 2, y: 3), CGPoint(x: -2, y: -3)) - XCTAssertEqual(-CGSize(width: 2, height: 3), CGSize(width: -2, height: -3)) + #expect(-CGPoint(x: 2, y: 3) == CGPoint(x: -2, y: -3)) + #expect(-CGSize(width: 2, height: 3) == CGSize(width: -2, height: -3)) } - func testOffset() { + @Test func offset() { - XCTAssertEqual(CGPoint(x: 2, y: 3).offsetBy(dx: 4, dy: 5), CGPoint(x: 6, y: 8)) - XCTAssertEqual(CGPoint(x: 2, y: 3).offset(by: -CGPoint(x: 2, y: 3)), .zero) - XCTAssertEqual(CGPoint(x: 2, y: 3).offset(by: -CGSize(width: 2, height: 3)), .zero) + #expect(CGPoint(x: 2, y: 3).offsetBy(dx: 4, dy: 5) == CGPoint(x: 6, y: 8)) + #expect(CGPoint(x: 2, y: 3).offset(by: -CGPoint(x: 2, y: 3)) == .zero) + #expect(CGPoint(x: 2, y: 3).offset(by: -CGSize(width: 2, height: 3)) == .zero) } } diff --git a/Tests/IncompatibleCharacterTests.swift b/Tests/IncompatibleCharacterTests.swift index d86a8aa8c..0c59097c4 100644 --- a/Tests/IncompatibleCharacterTests.swift +++ b/Tests/IncompatibleCharacterTests.swift @@ -24,61 +24,62 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class IncompatibleCharacterTests: XCTestCase { +struct IncompatibleCharacterTests { - func testIncompatibleCharacterScan() throws { + @Test func scanIncompatibleCharacter() throws { let string = "abc\\ \n ¥ \n ~" let incompatibles = try string.charactersIncompatible(with: .plainShiftJIS) - XCTAssertEqual(incompatibles.count, 2) + #expect(incompatibles.count == 2) - let backslash = try XCTUnwrap(incompatibles.first) + let backslash = try #require(incompatibles.first) - XCTAssertEqual(backslash.value.character, "\\") - XCTAssertEqual(backslash.value.converted, "＼") - XCTAssertEqual(backslash.location, 3) + #expect(backslash.value.character == "\\") + #expect(backslash.value.converted == "＼") + #expect(backslash.location == 3) let tilde = incompatibles[1] - XCTAssertEqual(tilde.value.character, "~") - XCTAssertEqual(tilde.value.converted, "?") - XCTAssertEqual(tilde.location, 11) + #expect(tilde.value.character == "~") + #expect(tilde.value.converted == "?") + #expect(tilde.location == 11) } - func testSequentialIncompatibleCharactersScan() throws { + @Test func scanSequentialIncompatibleCharacters() throws { let string = "~~" let incompatibles = try string.charactersIncompatible(with: .plainShiftJIS) - XCTAssertEqual(incompatibles.count, 2) + #expect(incompatibles.count == 2) let tilde = incompatibles[1] - XCTAssertEqual(tilde.value.character, "~") - XCTAssertEqual(tilde.value.converted, "?") - XCTAssertEqual(tilde.location, 1) + #expect(tilde.value.character == "~") + #expect(tilde.value.converted == "?") + #expect(tilde.location == 1) } - func testIncompatibleCharacterScanWithLengthShift() throws { + @Test func scanIncompatibleCharacterWithLengthShift() throws { let string = "family 👨‍👨‍👦 with 🐕" let incompatibles = try string.charactersIncompatible(with: .japaneseEUC) - XCTAssertEqual(incompatibles.count, 2) + #expect(incompatibles.count == 2) - XCTAssertEqual(incompatibles[0].value.character, "👨‍👨‍👦") - XCTAssertEqual(incompatibles[0].value.converted, "????????") - XCTAssertEqual(incompatibles[0].location, 7) + #expect(incompatibles[0].value.character == "👨‍👨‍👦") + #expect(incompatibles[0].value.converted == "????????") + #expect(incompatibles[0].location == 7) - XCTAssertEqual(incompatibles[1].value.character, "🐕") - XCTAssertEqual(incompatibles[1].value.converted, "??") - XCTAssertEqual(incompatibles[1].location, 21) + #expect(incompatibles[1].value.character == "🐕") + #expect(incompatibles[1].value.converted == "??") + #expect(incompatibles[1].location == 21) } } diff --git a/Tests/LineEndingScannerTests.swift b/Tests/LineEndingScannerTests.swift index c0575c7c7..4daa85ce6 100644 --- a/Tests/LineEndingScannerTests.swift +++ b/Tests/LineEndingScannerTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,56 +23,42 @@ // limitations under the License. // -import XCTest +import AppKit +import Testing @testable import CotEditor -final class LineEndingScannerTests: XCTestCase { +struct LineEndingScannerTests { - func testScanner() { + @Test func scan() { let storage = NSTextStorage(string: "dog\ncat\r\ncow") let scanner = LineEndingScanner(textStorage: storage, lineEnding: .lf) storage.replaceCharacters(in: NSRange(0..<3), with: "dog\u{85}cow") - // test async line ending scan - let expectation = self.expectation(description: "didScanLineEndings") - let observer = scanner.$inconsistentLineEndings - .sink { lineEndings in - XCTAssertEqual(lineEndings, [ValueRange(value: .nel, range: NSRange(location: 3, length: 1)), - ValueRange(value: .crlf, range: NSRange(location: 11, length: 2))]) - expectation.fulfill() - } - self.wait(for: [expectation], timeout: .zero) - - observer.cancel() + // test line ending scan + #expect(scanner.inconsistentLineEndings == + [ValueRange(value: .nel, range: NSRange(location: 3, length: 1)), + ValueRange(value: .crlf, range: NSRange(location: 11, length: 2))]) } - func testEmpty() { + @Test func empty() { let storage = NSTextStorage(string: "\r") let scanner = LineEndingScanner(textStorage: storage, lineEnding: .lf) - XCTAssertEqual(scanner.inconsistentLineEndings, [ValueRange(value: .cr, range: NSRange(location: 0, length: 1))]) + #expect(scanner.inconsistentLineEndings == [ValueRange(value: .cr, range: NSRange(location: 0, length: 1))]) // test scanRange does not expand to the out of range storage.replaceCharacters(in: NSRange(0..<1), with: "") - // test async line ending scan - let expectation = self.expectation(description: "didScanLineEndings") - let observer = scanner.$inconsistentLineEndings - .sink { lineEndings in - XCTAssert(lineEndings.isEmpty) - expectation.fulfill() - } - self.wait(for: [expectation], timeout: .zero) - - observer.cancel() + // test line ending scan + #expect(scanner.inconsistentLineEndings.isEmpty) } - func testCRLFEditing() { + @Test func editCRLF() { let storage = NSTextStorage(string: "dog\ncat\r\ncow") let scanner = LineEndingScanner(textStorage: storage, lineEnding: .lf) @@ -82,72 +68,64 @@ final class LineEndingScannerTests: XCTestCase { // remove \n after \r (CRLF -> CR) storage.replaceCharacters(in: NSRange(9..<10), with: "") - // test async line ending scan - let expectation = self.expectation(description: "didScanLineEndings") - let observer = scanner.$inconsistentLineEndings - .sink { lineEndings in - XCTAssertEqual(lineEndings, [ValueRange(value: .crlf, range: NSRange(location: 3, length: 2)), - ValueRange(value: .cr, range: NSRange(location: 8, length: 1))]) - expectation.fulfill() - } - self.wait(for: [expectation], timeout: .zero) - - observer.cancel() + // test line ending scan + #expect(scanner.inconsistentLineEndings == + [ValueRange(value: .crlf, range: NSRange(location: 3, length: 2)), + ValueRange(value: .cr, range: NSRange(location: 8, length: 1))]) } - func testDetection() { + @Test func detect() { let storage = NSTextStorage() let scanner = LineEndingScanner(textStorage: storage, lineEnding: .lf) - XCTAssertNil(scanner.majorLineEnding) + #expect(scanner.majorLineEnding == nil) storage.string = "a" - XCTAssertNil(scanner.majorLineEnding) + #expect(scanner.majorLineEnding == nil) storage.string = "\n" - XCTAssertEqual(scanner.majorLineEnding, .lf) + #expect(scanner.majorLineEnding == .lf) storage.string = "\r" - XCTAssertEqual(scanner.majorLineEnding, .cr) + #expect(scanner.majorLineEnding == .cr) storage.string = "\r\n" - XCTAssertEqual(scanner.majorLineEnding, .crlf) + #expect(scanner.majorLineEnding == .crlf) storage.string = "\u{85}" - XCTAssertEqual(scanner.majorLineEnding, .nel) + #expect(scanner.majorLineEnding == .nel) storage.string = "abc\u{2029}def" - XCTAssertEqual(scanner.majorLineEnding, .paragraphSeparator) + #expect(scanner.majorLineEnding == .paragraphSeparator) storage.string = "\rfoo\r\nbar\nbuz\u{2029}moin\r\n" - XCTAssertEqual(scanner.majorLineEnding, .crlf) // most used new line must be detected + #expect(scanner.majorLineEnding == .crlf) // most used new line must be detected } - func testLineNumberCalculation() { + @Test func calculateLineNumber() { let storage = NSTextStorage(string: "dog \n\n cat \n cow \n") let scanner = LineEndingScanner(textStorage: storage, lineEnding: .lf) - XCTAssertEqual(scanner.lineNumber(at: 0), 1) - XCTAssertEqual(scanner.lineNumber(at: 1), 1) - XCTAssertEqual(scanner.lineNumber(at: 4), 1) - XCTAssertEqual(scanner.lineNumber(at: 5), 2) - XCTAssertEqual(scanner.lineNumber(at: 6), 3) - XCTAssertEqual(scanner.lineNumber(at: 11), 3) - XCTAssertEqual(scanner.lineNumber(at: 12), 4) - XCTAssertEqual(scanner.lineNumber(at: 17), 4) - XCTAssertEqual(scanner.lineNumber(at: 18), 5) + #expect(scanner.lineNumber(at: 0) == 1) + #expect(scanner.lineNumber(at: 1) == 1) + #expect(scanner.lineNumber(at: 4) == 1) + #expect(scanner.lineNumber(at: 5) == 2) + #expect(scanner.lineNumber(at: 6) == 3) + #expect(scanner.lineNumber(at: 11) == 3) + #expect(scanner.lineNumber(at: 12) == 4) + #expect(scanner.lineNumber(at: 17) == 4) + #expect(scanner.lineNumber(at: 18) == 5) for _ in 0..<20 { storage.string = String(" 🐶 \n 🐱 \n 🐮 \n".shuffled()) for index in (0..] = [ @@ -59,16 +60,16 @@ final class LineEndingTests: XCTestCase { .init(value: .crlf, location: 25), ] - XCTAssert("".lineEndingRanges().isEmpty) - XCTAssert("abc".lineEndingRanges().isEmpty) - XCTAssertEqual(string.lineEndingRanges(), expected) + #expect("".lineEndingRanges().isEmpty) + #expect("abc".lineEndingRanges().isEmpty) + #expect(string.lineEndingRanges() == expected) } - func testReplacement() { + @Test func replace() { - XCTAssertEqual("foo\r\nbar\n".replacingLineEndings(with: .cr), "foo\rbar\r") - XCTAssertEqual("foo\u{c}bar\n".replacingLineEndings(with: .cr), "foo\u{c}bar\r") + #expect("foo\r\nbar\n".replacingLineEndings(with: .cr) == "foo\rbar\r") + #expect("foo\u{c}bar\n".replacingLineEndings(with: .cr) == "foo\u{c}bar\r") } } diff --git a/Tests/LineRangeCacheableTests.swift b/Tests/LineRangeCacheableTests.swift index bdde6787a..fe67701ce 100644 --- a/Tests/LineRangeCacheableTests.swift +++ b/Tests/LineRangeCacheableTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2023 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,29 +23,30 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class LineRangeCacheableTests: XCTestCase { +struct LineRangeCacheableTests { private let repeatCount = 20 - func testLineNumberCalculation() { + @Test func calculateLineNumber() { let lineString = LineString("dog \n\n cat \n cow \n") - XCTAssertEqual(lineString.lineNumber(at: 0), 1) - XCTAssertEqual(lineString.lineNumber(at: 1), 1) - XCTAssertEqual(lineString.lineNumber(at: 4), 1) - XCTAssertEqual(lineString.lineNumber(at: 5), 2) - XCTAssertEqual(lineString.lineNumber(at: 6), 3) - XCTAssertEqual(lineString.lineNumber(at: 11), 3) - XCTAssertEqual(lineString.lineNumber(at: 12), 4) - XCTAssertEqual(lineString.lineNumber(at: 17), 4) - XCTAssertEqual(lineString.lineNumber(at: 18), 5) + #expect(lineString.lineNumber(at: 0) == 1) + #expect(lineString.lineNumber(at: 1) == 1) + #expect(lineString.lineNumber(at: 4) == 1) + #expect(lineString.lineNumber(at: 5) == 2) + #expect(lineString.lineNumber(at: 6) == 3) + #expect(lineString.lineNumber(at: 11) == 3) + #expect(lineString.lineNumber(at: 12) == 4) + #expect(lineString.lineNumber(at: 17) == 4) + #expect(lineString.lineNumber(at: 18) == 5) let lineString2 = LineString("dog \n\n cat \n cow ") - XCTAssertEqual(lineString2.lineNumber(at: 17), 4) + #expect(lineString2.lineNumber(at: 17) == 4) for _ in 0.. Only the `]` at the first position will be evaluated as a character. let character = RegularExpressionSyntaxType.character - XCTAssertEqual(character.ranges(in: "[abc]"), [NSRange(location: 1, length: 3)]) - XCTAssertEqual(character.ranges(in: "\\[a[a]"), [NSRange(location: 0, length: 2), NSRange(location: 4, length: 1)]) - XCTAssertEqual(character.ranges(in: "[a\\]]"), [NSRange(location: 2, length: 2), NSRange(location: 1, length: 3)]) - XCTAssertEqual(character.ranges(in: "[]]"), [NSRange(location: 1, length: 1)]) - XCTAssertEqual(character.ranges(in: "[a]]"), [NSRange(location: 1, length: 1)]) - XCTAssertEqual(character.ranges(in: "[]a]"), [NSRange(location: 1, length: 2)]) - XCTAssertEqual(character.ranges(in: "[a]b]"), [NSRange(location: 1, length: 1)]) + #expect(character.ranges(in: "[abc]") == [NSRange(location: 1, length: 3)]) + #expect(character.ranges(in: "\\[a[a]") == [NSRange(location: 0, length: 2), NSRange(location: 4, length: 1)]) + #expect(character.ranges(in: "[a\\]]") == [NSRange(location: 2, length: 2), NSRange(location: 1, length: 3)]) + #expect(character.ranges(in: "[]]") == [NSRange(location: 1, length: 1)]) + #expect(character.ranges(in: "[a]]") == [NSRange(location: 1, length: 1)]) + #expect(character.ranges(in: "[]a]") == [NSRange(location: 1, length: 2)]) + #expect(character.ranges(in: "[a]b]") == [NSRange(location: 1, length: 1)]) - XCTAssertEqual(character.ranges(in: "[a] [b]"), [NSRange(location: 1, length: 1), - NSRange(location: 5, length: 1)]) + #expect(character.ranges(in: "[a] [b]") == [NSRange(location: 1, length: 1), + NSRange(location: 5, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^a]"), [NSRange(location: 2, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^^]"), [NSRange(location: 2, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^]]"), [NSRange(location: 2, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^]]]"), [NSRange(location: 2, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^a]]"), [NSRange(location: 2, length: 1)]) - XCTAssertEqual(character.ranges(in: "[^]a]"), [NSRange(location: 2, length: 2)]) - XCTAssertEqual(character.ranges(in: "[^a]b]"), [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^a]") == [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^^]") == [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^]]") == [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^]]]") == [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^a]]") == [NSRange(location: 2, length: 1)]) + #expect(character.ranges(in: "[^]a]") == [NSRange(location: 2, length: 2)]) + #expect(character.ranges(in: "[^a]b]") == [NSRange(location: 2, length: 1)]) // just containing ranges for `\[` - XCTAssertEqual(character.ranges(in: "(?<=\\[)a]"), [NSRange(location: 4, length: 2)]) + #expect(character.ranges(in: "(?<=\\[)a]") == [NSRange(location: 4, length: 2)]) + } + + @Test func highlightSymbol() { let symbol = RegularExpressionSyntaxType.symbol - XCTAssertEqual(symbol.ranges(in: "[abc]"), [NSRange(location: 0, length: 5)]) - XCTAssertEqual(symbol.ranges(in: "\\[a[a]"), [NSRange(location: 3, length: 3)]) - XCTAssertEqual(symbol.ranges(in: "[a\\]]"), [NSRange(location: 0, length: 5)]) - XCTAssertEqual(symbol.ranges(in: "[]]"), [NSRange(location: 0, length: 3)]) - XCTAssertEqual(symbol.ranges(in: "[a]]"), [NSRange(location: 0, length: 3)]) - XCTAssertEqual(symbol.ranges(in: "[]a]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[a]b]"), [NSRange(location: 0, length: 3)]) + #expect(symbol.ranges(in: "[abc]") == [NSRange(location: 0, length: 5)]) + #expect(symbol.ranges(in: "\\[a[a]") == [NSRange(location: 3, length: 3)]) + #expect(symbol.ranges(in: "[a\\]]") == [NSRange(location: 0, length: 5)]) + #expect(symbol.ranges(in: "[]]") == [NSRange(location: 0, length: 3)]) + #expect(symbol.ranges(in: "[a]]") == [NSRange(location: 0, length: 3)]) + #expect(symbol.ranges(in: "[]a]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[a]b]") == [NSRange(location: 0, length: 3)]) - XCTAssertEqual(symbol.ranges(in: "[a] [b]"), [NSRange(location: 0, length: 3), - NSRange(location: 4, length: 3)]) + #expect(symbol.ranges(in: "[a] [b]") == [NSRange(location: 0, length: 3), + NSRange(location: 4, length: 3)]) - XCTAssertEqual(symbol.ranges(in: "[^a]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[^^]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[^]]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[^]]]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[^a]]"), [NSRange(location: 0, length: 4)]) - XCTAssertEqual(symbol.ranges(in: "[^]a]"), [NSRange(location: 0, length: 5)]) - XCTAssertEqual(symbol.ranges(in: "[^a]b]"), [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^a]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^^]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^]]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^]]]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^a]]") == [NSRange(location: 0, length: 4)]) + #expect(symbol.ranges(in: "[^]a]") == [NSRange(location: 0, length: 5)]) + #expect(symbol.ranges(in: "[^a]b]") == [NSRange(location: 0, length: 4)]) // just containing ranges for `(?<=`, `(` and `)` - XCTAssertEqual(symbol.ranges(in: "(?<=\\[)a]"), [NSRange(location: 0, length: 4), - NSRange(location: 0, length: 1), - NSRange(location: 6, length: 1)]) + #expect(symbol.ranges(in: "(?<=\\[)a]") == [NSRange(location: 0, length: 4), + NSRange(location: 0, length: 1), + NSRange(location: 6, length: 1)]) } } diff --git a/Tests/ShortcutTests.swift b/Tests/ShortcutTests.swift deleted file mode 100644 index 28e53b96c..000000000 --- a/Tests/ShortcutTests.swift +++ /dev/null @@ -1,117 +0,0 @@ -// -// ShortcutTests.swift -// Tests -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2016-06-04. -// -// --------------------------------------------------------------------------- -// -// © 2016-2023 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import XCTest -@testable import CotEditor - -final class ShortcutTests: XCTestCase { - - func testEquivalent() { - - XCTAssertEqual(Shortcut("A", modifiers: [.control]), - Shortcut("a", modifiers: [.control, .shift])) - - XCTAssertEqual(Shortcut(keySpecChars: "^A"), - Shortcut(keySpecChars: "^$a")) - } - - - func testKeySpecCharsCreation() { - - XCTAssertNil(Shortcut("", modifiers: [])) - XCTAssertEqual(Shortcut("a", modifiers: [.control, .shift])?.keySpecChars, "^$a") - XCTAssertEqual(Shortcut("b", modifiers: [.command, .option])?.keySpecChars, "~@b") - XCTAssertEqual(Shortcut("A", modifiers: [.control])?.keySpecChars, "^$a") // uppercase for Shift key - XCTAssertEqual(Shortcut("a", modifiers: [.control, .shift])?.keySpecChars, "^$a") - - XCTAssertEqual(Shortcut("a", modifiers: [])?.keySpecChars, "a") - XCTAssertEqual(Shortcut("a", modifiers: [])?.isValid, false) - XCTAssertNil(Shortcut("", modifiers: [.control, .shift])) - XCTAssertEqual(Shortcut("a", modifiers: [.control, .shift])?.isValid, true) - XCTAssertEqual(Shortcut("ab", modifiers: [.control, .shift])?.isValid, false) - } - - - func testStringToShortcut() throws { - - let shortcut = try XCTUnwrap(Shortcut(keySpecChars: "^$a")) - - XCTAssertEqual(shortcut.keyEquivalent, "a") - XCTAssertEqual(shortcut.modifiers, [.control, .shift]) - XCTAssert(shortcut.isValid) - } - - - func testShortcutWithFnKey() throws { - - let shortcut = try XCTUnwrap(Shortcut("a", modifiers: [.function])) - - XCTAssertFalse(shortcut.isValid) - XCTAssertEqual(shortcut.keyEquivalent, "a") - XCTAssertEqual(shortcut.modifiers, [.function]) - XCTAssert(shortcut.symbol == "fn A" || shortcut.symbol == "🌐︎ A") - XCTAssertEqual(shortcut.keySpecChars, "a", "The fn key should be ignored.") - - let symbolName = try XCTUnwrap(shortcut.modifierSymbolNames.first) - XCTAssertNotNil(NSImage(systemSymbolName: symbolName, accessibilityDescription: nil)) - } - - - func testMenuItemShortcut() { - - let menuItem = NSMenuItem(title: "", action: nil, keyEquivalent: "C") - menuItem.keyEquivalentModifierMask = [.command] - - let shortcut = Shortcut(menuItem.keyEquivalent, modifiers: menuItem.keyEquivalentModifierMask) - - XCTAssertEqual(shortcut?.symbol, "⇧ ⌘ C") - XCTAssertEqual(shortcut, menuItem.shortcut) - } - - - func testShortcutSymbols() throws { - - // test modifier symbols - XCTAssertNil(Shortcut(keySpecChars: "")) - XCTAssertEqual(Shortcut(keySpecChars: "^$a")?.symbol, "^ ⇧ A") - XCTAssertEqual(Shortcut(keySpecChars: "~@b")?.symbol, "⌥ ⌘ B") - - // test unprintable keys - let f10 = try XCTUnwrap(String(NSEvent.SpecialKey.f10.unicodeScalar)) - XCTAssertEqual(Shortcut(keySpecChars: "@" + f10)?.symbol, "⌘ F10") - - let delete = try XCTUnwrap(UnicodeScalar(NSDeleteCharacter).flatMap(String.init)) - XCTAssertEqual(Shortcut(keySpecChars: "@" + delete)?.symbol, "⌘ ⌫") - - // test creation - let deleteForward = try XCTUnwrap(String(NSEvent.SpecialKey.deleteForward.unicodeScalar)) - XCTAssertNil(Shortcut(symbolRepresentation: "")) - XCTAssertEqual(Shortcut(symbolRepresentation: "^ ⇧ A")?.keySpecChars, "^$a") - XCTAssertEqual(Shortcut(symbolRepresentation: "⌥ ⌘ B")?.keySpecChars, "~@b") - XCTAssertEqual(Shortcut(symbolRepresentation: "⌘ F10")?.keySpecChars, "@" + f10) - XCTAssertEqual(Shortcut(symbolRepresentation: "⌘ ⌦")?.keySpecChars, "@" + deleteForward) - } -} diff --git a/Tests/SnippetTests.swift b/Tests/SnippetTests.swift index 543fd3aaa..1a6b5cb32 100644 --- a/Tests/SnippetTests.swift +++ b/Tests/SnippetTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,22 +23,23 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class SnippetTests: XCTestCase { +struct SnippetTests { - func testSimpleSnippet() { + @Test func simpleSnippet() { let snippet = Snippet(name: "", format: "

    <<>><<>>

    ") let (string, selections) = snippet.insertion(selectedString: "abc") - XCTAssertEqual(string, "

    abc

    ") - XCTAssertEqual(selections, [NSRange(location: 7, length: 0)]) + #expect(string == "

    abc

    ") + #expect(selections == [NSRange(location: 7, length: 0)]) } - func testMultipleLines() { + @Test func multipleLines() { let format = """
      @@ -55,9 +56,9 @@ final class SnippetTests: XCTestCase {
    """ - XCTAssertEqual(string, expectedString) - XCTAssertEqual(selections, [NSRange(location: 13, length: 0), - NSRange(location: 27, length: 0)]) + #expect(string == expectedString) + #expect(selections == [NSRange(location: 13, length: 0), + NSRange(location: 27, length: 0)]) let (indentedString, indentedSelections) = snippet.insertion(selectedString: "", indent: " ") @@ -67,13 +68,13 @@ final class SnippetTests: XCTestCase {
  • """ - XCTAssertEqual(indentedString, expectedIndentString) - XCTAssertEqual(indentedSelections, [NSRange(location: 17, length: 0), - NSRange(location: 35, length: 0)]) + #expect(indentedString == expectedIndentString) + #expect(indentedSelections == [NSRange(location: 17, length: 0), + NSRange(location: 35, length: 0)]) } - func testMultipleInsertions() { + @Test func multipleInsertions() { let string = """ aaa @@ -95,7 +96,7 @@ final class SnippetTests: XCTestCase { let expectedSelections = [NSRange(location: 11, length: 0), NSRange(location: 21, length: 0), NSRange(location: 33, length: 0)] - XCTAssertEqual(strings, expectedStrings) - XCTAssertEqual(selections, expectedSelections) + #expect(strings == expectedStrings) + #expect(selections == expectedSelections) } } diff --git a/Tests/StringCollectionTests.swift b/Tests/StringCollectionTests.swift index a0ff057a2..5d7ae33c7 100644 --- a/Tests/StringCollectionTests.swift +++ b/Tests/StringCollectionTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2020 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,21 +24,21 @@ // limitations under the License. // -import XCTest +import Testing @testable import CotEditor -final class StringCollectionTests: XCTestCase { +struct StringCollectionTests { - func testAvailableNameCreation() { + @Test func createAvailableNames() { let names = ["foo", "foo 3", "foo copy 3", "foo 4", "foo 7"] let copy = "copy" - XCTAssertEqual(names.createAvailableName(for: "foo"), "foo 2") - XCTAssertEqual(names.createAvailableName(for: "foo 3"), "foo 5") + #expect(names.createAvailableName(for: "foo") == "foo 2") + #expect(names.createAvailableName(for: "foo 3") == "foo 5") - XCTAssertEqual(names.createAvailableName(for: "foo", suffix: copy), "foo copy") - XCTAssertEqual(names.createAvailableName(for: "foo 3", suffix: copy), "foo 3 copy") - XCTAssertEqual(names.createAvailableName(for: "foo copy 3", suffix: copy), "foo copy 4") + #expect(names.createAvailableName(for: "foo", suffix: copy) == "foo copy") + #expect(names.createAvailableName(for: "foo 3", suffix: copy) == "foo 3 copy") + #expect(names.createAvailableName(for: "foo copy 3", suffix: copy) == "foo copy 4") } } diff --git a/Tests/StringCommentingTests.swift b/Tests/StringCommentingTests.swift index 594d141b5..647b7ac31 100644 --- a/Tests/StringCommentingTests.swift +++ b/Tests/StringCommentingTests.swift @@ -24,166 +24,178 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class StringCommentingTests: XCTestCase { +struct StringCommentingTests { // MARK: String extension Tests - func testInlineCommentOut() { + @Test func inlineCommentOut() { - XCTAssertEqual("foo".inlineCommentOut(delimiter: "//", ranges: []), []) + #expect("foo".inlineCommentOut(delimiter: "//", ranges: []).isEmpty) - XCTAssertEqual("foo".inlineCommentOut(delimiter: "//", ranges: [NSRange(0..<0)]), - [.init(string: "//", location: 0, forward: true)]) - XCTAssertEqual("foo".inlineCommentOut(delimiter: "//", ranges: [NSRange(1..<2)]), - [.init(string: "//", location: 1, forward: true)]) + #expect("foo".inlineCommentOut(delimiter: "//", ranges: [NSRange(0..<0)]) == + [.init(string: "//", location: 0, forward: true)]) + #expect("foo".inlineCommentOut(delimiter: "//", ranges: [NSRange(1..<2)]) == + [.init(string: "//", location: 1, forward: true)]) } - func testBlockCommentOut() { + @Test func blockCommentOut() { - XCTAssertEqual("foo".blockCommentOut(delimiters: Pair("<-", "->"), ranges: []), []) + #expect("foo".blockCommentOut(delimiters: Pair("<-", "->"), ranges: []).isEmpty) - XCTAssertEqual("foo".blockCommentOut(delimiters: Pair("<-", "->"), ranges: [NSRange(0..<0)]), - [.init(string: "<-", location: 0, forward: true), .init(string: "->", location: 0, forward: false)]) + #expect("foo".blockCommentOut(delimiters: Pair("<-", "->"), ranges: [NSRange(0..<0)]) == + [.init(string: "<-", location: 0, forward: true), .init(string: "->", location: 0, forward: false)]) } - func testInlineUncomment() { + @Test func inlineUncomment() { - XCTAssertEqual("foo".rangesOfInlineDelimiter("//", ranges: []), []) - XCTAssertEqual("foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<0)]), []) + #expect("foo".rangesOfInlineDelimiter("//", ranges: [])?.isEmpty == true) + #expect("foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<0)])?.isEmpty == true) - XCTAssertEqual("//foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<5)]), [NSRange(0..<2)]) - XCTAssertEqual("// foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<5)]), [NSRange(0..<2)]) + #expect("//foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<5)]) == [NSRange(0..<2)]) + #expect("// foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<5)]) == [NSRange(0..<2)]) - XCTAssertEqual(" //foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<7)]), [NSRange(2..<4)]) + #expect(" //foo".rangesOfInlineDelimiter("//", ranges: [NSRange(0..<7)]) == [NSRange(2..<4)]) } - func testBlockUncomment() { + @Test func blockUncomment() { - XCTAssertEqual("foo".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: []), []) - XCTAssertEqual("foo".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<0)]), []) + #expect("foo".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [])?.isEmpty == true) + #expect("foo".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<0)])?.isEmpty == true) - XCTAssertEqual("<-foo->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<7)]), [NSRange(0..<2), NSRange(5..<7)]) - XCTAssertEqual("<- foo ->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<9)]), [NSRange(0..<2), NSRange(7..<9)]) + #expect("<-foo->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<7)]) == [NSRange(0..<2), NSRange(5..<7)]) + #expect("<- foo ->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<9)]) == [NSRange(0..<2), NSRange(7..<9)]) - XCTAssertEqual(" <-foo-> ".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<9)]), [NSRange(1..<3), NSRange(6..<8)]) - XCTAssertNil(" <-foo-> ".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(1..<7)])) + #expect(" <-foo-> ".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<9)]) == [NSRange(1..<3), NSRange(6..<8)]) + #expect(" <-foo-> ".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(1..<7)]) == nil) // ok, this is currently in spec, but not a good one... - XCTAssertEqual("<-foo-><-bar->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<14)]), [NSRange(0..<2), NSRange(12..<14)]) + #expect("<-foo-><-bar->".rangesOfBlockDelimiters(Pair("<-", "->"), ranges: [NSRange(0..<14)]) == [NSRange(0..<2), NSRange(12..<14)]) } - // MARK: TextView extension Tests - @MainActor func testTextViewInlineComment() { + @Test func textViewInlineComment() throws { - let textView = CommentingTextView() + var editor = Editor(string: "foo\nbar", selectedRanges: [NSRange(0..<3), NSRange(4..<7)]) - textView.string = "foo\nbar" - textView.selectedRanges = [NSRange(0..<3), NSRange(4..<7)] as [NSValue] - textView.commentOut(types: .inline, fromLineHead: true) - XCTAssertEqual(textView.string, "//foo\n//bar") - XCTAssertEqual(textView.selectedRanges, [NSRange(0..<5), NSRange(6..<11)] as [NSValue]) - XCTAssertTrue(textView.canUncomment(partly: false)) - textView.uncomment() - XCTAssertEqual(textView.string, "foo\nbar") - XCTAssertEqual(textView.selectedRanges, [NSRange(0..<3), NSRange(4..<7)] as [NSValue]) + editor.commentOut(types: .inline, fromLineHead: true) + #expect(editor.string == "//foo\n//bar") + #expect(editor.selectedRanges == [NSRange(0..<5), NSRange(6..<11)]) + #expect(editor.canUncomment(partly: false)) + editor.uncomment() + #expect(editor.string == "foo\nbar") + #expect(editor.selectedRanges == [NSRange(0..<3), NSRange(4..<7)]) - textView.selectedRanges = [NSRange(1..<1)] as [NSValue] - textView.insertionLocations = [5] - textView.commentOut(types: .inline, fromLineHead: true) - XCTAssertEqual(textView.string, "//foo\n//bar") - XCTAssertEqual(textView.rangesForUserTextChange, [NSRange(3..<3), NSRange(9..<9)] as [NSValue]) - XCTAssertTrue(textView.canUncomment(partly: false)) - textView.uncomment() - XCTAssertEqual(textView.string, "foo\nbar") - XCTAssertEqual(textView.rangesForUserTextChange, [NSRange(1..<1), NSRange(5..<5)] as [NSValue]) + editor.selectedRanges = [NSRange(1..<1), NSRange(5..<5)] + editor.commentOut(types: .inline, fromLineHead: true) + #expect(editor.string == "//foo\n//bar") + #expect(editor.selectedRanges == [NSRange(3..<3), NSRange(9..<9)]) + #expect(editor.canUncomment(partly: false)) + editor.uncomment() + #expect(editor.string == "foo\nbar") + #expect(editor.selectedRanges == [NSRange(1..<1), NSRange(5..<5)]) } - @MainActor func testTextViewBlockComment() { + @Test func textViewBlockComment() { - let textView = CommentingTextView() + var editor = Editor(string: "foo\nbar", selectedRanges: [NSRange(0..<3), NSRange(4..<7)]) - textView.string = "foo\nbar" - textView.selectedRanges = [NSRange(0..<3), NSRange(4..<7)] as [NSValue] - textView.commentOut(types: .block, fromLineHead: true) - XCTAssertEqual(textView.string, "<-foo->\n<-bar->") - XCTAssertEqual(textView.selectedRanges, [NSRange(0..<7), NSRange(8..<15)] as [NSValue]) - XCTAssertTrue(textView.canUncomment(partly: false)) - textView.uncomment() - XCTAssertEqual(textView.string, "foo\nbar") - XCTAssertEqual(textView.selectedRanges, [NSRange(0..<3), NSRange(4..<7)] as [NSValue]) + editor.commentOut(types: .block, fromLineHead: true) + #expect(editor.string == "<-foo->\n<-bar->") + #expect(editor.selectedRanges == [NSRange(0..<7), NSRange(8..<15)]) + #expect(editor.canUncomment(partly: false)) + editor.uncomment() + #expect(editor.string == "foo\nbar") + #expect(editor.selectedRanges == [NSRange(0..<3), NSRange(4..<7)]) - textView.selectedRanges = [NSRange(1..<1)] as [NSValue] - textView.insertionLocations = [5] - textView.commentOut(types: .block, fromLineHead: true) - XCTAssertEqual(textView.string, "<-foo->\n<-bar->") - XCTAssertEqual(textView.rangesForUserTextChange, [NSRange(3..<3), NSRange(11..<11)] as [NSValue]) - XCTAssertTrue(textView.canUncomment(partly: false)) - textView.uncomment() - XCTAssertEqual(textView.string, "foo\nbar") - XCTAssertEqual(textView.rangesForUserTextChange, [NSRange(1..<1), NSRange(5..<5)] as [NSValue]) + editor.selectedRanges = [NSRange(1..<1), NSRange(5..<5)] + editor.commentOut(types: .block, fromLineHead: true) + #expect(editor.string == "<-foo->\n<-bar->") + #expect(editor.selectedRanges == [NSRange(3..<3), NSRange(11..<11)]) + #expect(editor.canUncomment(partly: false)) + editor.uncomment() + #expect(editor.string == "foo\nbar") + #expect(editor.selectedRanges == [NSRange(1..<1), NSRange(5..<5)]) } - @MainActor func testIncompatibility() { + @Test func checkIncompatibility() { - let textView = CommentingTextView() - - textView.string = """ + let string = """ // foo // // foo bar """ - textView.selectedRange = textView.string.nsRange - XCTAssertTrue(textView.canUncomment(partly: false)) - XCTAssertTrue(textView.canUncomment(partly: true)) + let editor = Editor(string: string, selectedRanges: [string.nsRange]) - textView.string = """ + #expect(editor.canUncomment(partly: false)) + #expect(editor.canUncomment(partly: true)) + } + + + @Test func checkPartialIncompatibility() { + + let string = """ // foo // foo bar """ - textView.selectedRange = textView.string.nsRange - XCTAssertFalse(textView.canUncomment(partly: false)) - XCTAssertTrue(textView.canUncomment(partly: true)) + let editor = Editor(string: string, selectedRanges: [string.nsRange]) + + #expect(!editor.canUncomment(partly: false)) + #expect(editor.canUncomment(partly: true)) } } - -private final class CommentingTextView: NSTextView, Commenting, MultiCursorEditing { +/// TextView mock +private struct Editor { - // Commenting - var commentDelimiters = Syntax.Comment(inline: "//", blockBegin: "<-", blockEnd: "->") + let delimiters = Syntax.Comment(inline: "//", blockBegin: "<-", blockEnd: "->") - // MultiCursorEditing - var insertionLocations: [Int] = [] - var selectionOrigins: [Int] = [] - var insertionPointTimer: (any DispatchSourceTimer)? - var insertionPointOn: Bool = false - var isPerformingRectangularSelection: Bool = false + var string: String + var selectedRanges: [NSRange] = [] - @available(macOS 14, *) - var insertionIndicators: [NSTextInsertionIndicator] { - get { [] } - set { _ = newValue } + + mutating func commentOut(types: CommentTypes, fromLineHead: Bool) { + + guard let content = self.string.commentOut(types: types, delimiters: self.delimiters, fromLineHead: true, in: self.selectedRanges) else { return } + + self.edit(with: content) } - override var rangesForUserTextChange: [NSValue]? { + mutating func uncomment() { - let selectedRanges = self.selectedRanges.map(\.rangeValue) - let insertionRanges = self.insertionLocations.map { NSRange(location: $0, length: 0) } + guard let content = self.string.uncomment(delimiters: self.delimiters, in: self.selectedRanges) else { return } - return (selectedRanges + insertionRanges).sorted(\.location) as [NSValue] + self.edit(with: content) + } + + + func canUncomment(partly: Bool) -> Bool { + + self.string.canUncomment(partly: partly, delimiters: self.delimiters, in: self.selectedRanges) + } + + + mutating func edit(with context: EditingContext) { + + let mutableString = NSMutableString(string: self.string) + for (string, range) in zip(context.strings, context.ranges).reversed() { + mutableString.replaceCharacters(in: range, with: string) + } + + self.string = mutableString as String + self.selectedRanges = context.selectedRanges ?? self.selectedRanges } } diff --git a/Tests/StringExtensionsTests.swift b/Tests/StringExtensionsTests.swift index 867b2bf8c..78ac9110e 100644 --- a/Tests/StringExtensionsTests.swift +++ b/Tests/StringExtensionsTests.swift @@ -24,364 +24,344 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class StringExtensionsTests: XCTestCase { +struct StringExtensionsTests { /// Tests if the U+FEFF omitting bug on Swift 5 still exists. - /// - /// - Bug: - func testFEFF() { + @Test(.bug("https://bugs.swift.org/browse/SR-10896")) func immutable() { + + #expect("abc".immutable == "abc") let bom = "\u{feff}" - - // -> Some of these test cases must fail if the bug fixed. - XCTAssertEqual(bom.count, 1) - XCTAssertEqual(("\(bom)abc").count, 4) - XCTAssertEqual(NSString(string: bom).length, 0) // correct: 1 - XCTAssertEqual(NSString(string: "\(bom)\(bom)").length, 1) // correct: 2 - XCTAssertEqual(NSString(string: "\(bom)abc").length, 3) // correct: 4 - XCTAssertEqual(NSString(string: "a\(bom)bc").length, 4) - let string = "\(bom)abc" - XCTAssertNotEqual(string.immutable, string) // -> This test must fail if the bug fixed. - - // Implicit NSString cast is fixed. - // -> However, still crashes when `string.immutable.enumerateSubstrings(in:)` - let middleIndex = string.index(string.startIndex, offsetBy: 2) - string.enumerateSubstrings(in: middleIndex.. abc """ - XCTAssertEqual(trimmed, expectedTrimmed) + #expect(trimmed == expectedTrimmed) - let trimmedIgnoringEmptyLines = try string.trim(ranges: string.rangesOfTrailingWhitespace(ignoresEmptyLines: true)) + let trimmedIgnoringEmptyLines = try string.trim(ranges: string.rangesOfTrailingWhitespace(ignoringEmptyLines: true)) let expectedTrimmedIgnoringEmptyLines = """ abc def @@ -409,21 +389,36 @@ final class StringExtensionsTests: XCTestCase { white space -> abc """ - XCTAssertEqual(trimmedIgnoringEmptyLines, expectedTrimmedIgnoringEmptyLines) + #expect(trimmedIgnoringEmptyLines == expectedTrimmedIgnoringEmptyLines) } - func testAbbreviatedMatch() { + @Test func abbreviatedMatch() throws { let string = "The fox jumps over the lazy dogcow." - XCTAssertNil(string.abbreviatedMatch(with: "quick")) + #expect(string.abbreviatedMatch(with: "quick") == nil) - XCTAssertEqual(string.abbreviatedMatch(with: "dogcow")?.score, 6) - XCTAssertEqual(string.abbreviatedMatch(with: "dogcow")?.ranges.count, 6) + let dogcow = try #require(string.abbreviatedMatch(with: "dogcow")) + #expect(dogcow.score == 6) + #expect(dogcow.ranges.count == 6) + #expect(dogcow.remaining.isEmpty) - XCTAssertEqual(string.abbreviatedMatch(with: "ow")?.score, 29) - XCTAssertEqual(string.abbreviatedMatch(with: "ow")?.ranges.count, 2) + let ow = try #require(string.abbreviatedMatch(with: "ow")) + #expect(ow.score == 29) + #expect(ow.ranges.count == 2) + #expect(ow.remaining.isEmpty) + + let lazyTanuki = try #require(string.abbreviatedMatch(with: "lazy tanuki")) + #expect(lazyTanuki.score == 5) + #expect(lazyTanuki.ranges.count == 5) + #expect(lazyTanuki.remaining == "tanuki") + + #expect(string.abbreviatedMatchedRanges(with: "lazy tanuki") == nil) + #expect(string.abbreviatedMatchedRanges(with: "lazy tanuki", incomplete: true)?.count == 5) + + #expect(string.abbreviatedMatchedRanges(with: "lazy w")?.count == 6) + #expect(string.abbreviatedMatchedRanges(with: "lazy w", incomplete: true)?.count == 6) } } @@ -434,7 +429,7 @@ private extension String { func trim(ranges: [NSRange]) throws -> String { try ranges.reversed() - .map { try XCTUnwrap(Range($0, in: self)) } + .map { try #require(Range($0, in: self)) } .reduce(self) { $0.replacingCharacters(in: $1, with: "") } } } diff --git a/Tests/StringIndentationTests.swift b/Tests/StringIndentationTests.swift index 89b4b84b9..c9b80a6f4 100644 --- a/Tests/StringIndentationTests.swift +++ b/Tests/StringIndentationTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2015-2023 1024jp +// © 2015-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,71 +24,72 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class StringIndentationTests: XCTestCase { +struct StringIndentationTests { // MARK: Indentation Style Detection Tests - func testIndentStyleDetection() { + @Test func detectIndentStyle() { let string = "\t\tfoo\tbar" - XCTAssertNil(string.detectedIndentStyle) + #expect(string.detectedIndentStyle == nil) } // MARK: Indentation Style Standardization Tests - func testIndentStyleStandardizationToTab() { + @Test func standardizeIndentStyleToTab() { let string = " foo bar\n " // spaces to tab - XCTAssertEqual(string.standardizingIndent(to: .tab, tabWidth: 2), "\t\t foo bar\n\t") - XCTAssertEqual(string.standardizingIndent(to: .space, tabWidth: 2), string) + #expect(string.standardizingIndent(to: .tab, tabWidth: 2) == "\t\t foo bar\n\t") + #expect(string.standardizingIndent(to: .space, tabWidth: 2) == string) } - func testIndentStyleStandardizationToSpace() { + @Test func standardizeIndentStyleToSpace() { let string = "\t\tfoo\tbar" - XCTAssertEqual(string.standardizingIndent(to: .space, tabWidth: 2), " foo\tbar") - XCTAssertEqual(string.standardizingIndent(to: .tab, tabWidth: 2), string) + #expect(string.standardizingIndent(to: .space, tabWidth: 2) == " foo\tbar") + #expect(string.standardizingIndent(to: .tab, tabWidth: 2) == string) } // MARK: Other Tests - func testIndentLevelDetection() { + @Test func detectIndentLevel() { - XCTAssertEqual(" foo".indentLevel(at: 0, tabWidth: 4), 1) - XCTAssertEqual(" foo".indentLevel(at: 4, tabWidth: 2), 2) - XCTAssertEqual("\tfoo".indentLevel(at: 4, tabWidth: 2), 1) + #expect(" foo".indentLevel(at: 0, tabWidth: 4) == 1) + #expect(" foo".indentLevel(at: 4, tabWidth: 2) == 2) + #expect("\tfoo".indentLevel(at: 4, tabWidth: 2) == 1) // tab-space mix - XCTAssertEqual(" \t foo".indentLevel(at: 4, tabWidth: 2), 2) - XCTAssertEqual(" \t foo".indentLevel(at: 4, tabWidth: 2), 3) + #expect(" \t foo".indentLevel(at: 4, tabWidth: 2) == 2) + #expect(" \t foo".indentLevel(at: 4, tabWidth: 2) == 3) // multiline - XCTAssertEqual(" foo\n bar".indentLevel(at: 10, tabWidth: 2), 1) + #expect(" foo\n bar".indentLevel(at: 10, tabWidth: 2) == 1) } - func testSoftTabDeletion() { + @Test func deleteSoftTab() { let string = " foo\n bar " - XCTAssertNil(string.rangeForSoftTabDeletion(in: NSRange(0..<0), tabWidth: 2)) - XCTAssertNil(string.rangeForSoftTabDeletion(in: NSRange(4..<5), tabWidth: 2)) - XCTAssertNil(string.rangeForSoftTabDeletion(in: NSRange(6..<6), tabWidth: 2)) - XCTAssertEqual(string.rangeForSoftTabDeletion(in: NSRange(5..<5), tabWidth: 2), NSRange(4..<5)) - XCTAssertEqual(string.rangeForSoftTabDeletion(in: NSRange(4..<4), tabWidth: 2), NSRange(2..<4)) - XCTAssertNil(string.rangeForSoftTabDeletion(in: NSRange(10..<10), tabWidth: 2)) - XCTAssertEqual(string.rangeForSoftTabDeletion(in: NSRange(11..<11), tabWidth: 2), NSRange(9..<11)) - XCTAssertNil(string.rangeForSoftTabDeletion(in: NSRange(16..<16), tabWidth: 2)) + #expect(string.rangeForSoftTabDeletion(in: NSRange(0..<0), tabWidth: 2) == nil) + #expect(string.rangeForSoftTabDeletion(in: NSRange(4..<5), tabWidth: 2) == nil) + #expect(string.rangeForSoftTabDeletion(in: NSRange(6..<6), tabWidth: 2) == nil) + #expect(string.rangeForSoftTabDeletion(in: NSRange(5..<5), tabWidth: 2) == NSRange(4..<5)) + #expect(string.rangeForSoftTabDeletion(in: NSRange(4..<4), tabWidth: 2) == NSRange(2..<4)) + #expect(string.rangeForSoftTabDeletion(in: NSRange(10..<10), tabWidth: 2) == nil) + #expect(string.rangeForSoftTabDeletion(in: NSRange(11..<11), tabWidth: 2) == NSRange(9..<11)) + #expect(string.rangeForSoftTabDeletion(in: NSRange(16..<16), tabWidth: 2) == nil) } } diff --git a/Tests/StringLineProcessingTests.swift b/Tests/StringLineProcessingTests.swift index e732a781a..429a98ee4 100644 --- a/Tests/StringLineProcessingTests.swift +++ b/Tests/StringLineProcessingTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2022 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,12 +23,13 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class StringLineProcessingTests: XCTestCase { +struct StringLineProcessingTests { - func testMoveLineUp() { + @Test func moveLineUp() throws { let string = """ aa @@ -37,29 +38,28 @@ final class StringLineProcessingTests: XCTestCase { d eee """ - var info: String.EditingInfo? + var context: EditingContext - info = string.moveLineUp(in: [NSRange(4, 1)]) - XCTAssertEqual(info?.strings, ["bbbb\naa\n"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 8)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(1, 1)]) + context = try #require(string.moveLineUp(in: [NSRange(4, 1)])) + #expect(context.strings == ["bbbb\naa\n"]) + #expect(context.ranges == [NSRange(0, 8)]) + #expect(context.selectedRanges == [NSRange(1, 1)]) - info = string.moveLineUp(in: [NSRange(4, 1), NSRange(6, 0)]) - XCTAssertEqual(info?.strings, ["bbbb\naa\n"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 8)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(1, 1), NSRange(3, 0)]) + context = try #require(string.moveLineUp(in: [NSRange(4, 1), NSRange(6, 0)])) + #expect(context.strings == ["bbbb\naa\n"]) + #expect(context.ranges == [NSRange(0, 8)]) + #expect(context.selectedRanges == [NSRange(1, 1), NSRange(3, 0)]) - info = string.moveLineUp(in: [NSRange(4, 1), NSRange(9, 0), NSRange(15, 1)]) - XCTAssertEqual(info?.strings, ["bbbb\nccc\naa\neee\nd"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 17)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(1, 1), NSRange(6, 0), NSRange(13, 1)]) + context = try #require(string.moveLineUp(in: [NSRange(4, 1), NSRange(9, 0), NSRange(15, 1)])) + #expect(context.strings == ["bbbb\nccc\naa\neee\nd"]) + #expect(context.ranges == [NSRange(0, 17)]) + #expect(context.selectedRanges == [NSRange(1, 1), NSRange(6, 0), NSRange(13, 1)]) - info = string.moveLineUp(in: [NSRange(2, 1)]) - XCTAssertNil(info) + #expect(string.moveLineUp(in: [NSRange(2, 1)]) == nil) } - func testMoveLineDown() { + @Test func moveLineDown() throws { let string = """ aa @@ -68,77 +68,74 @@ final class StringLineProcessingTests: XCTestCase { d eee """ - var info: String.EditingInfo? + var context: EditingContext - info = string.moveLineDown(in: [NSRange(4, 1)]) - XCTAssertEqual(info?.strings, ["aa\nccc\nbbbb\n"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 12)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(8, 1)]) + context = try #require(string.moveLineDown(in: [NSRange(4, 1)])) + #expect(context.strings == ["aa\nccc\nbbbb\n"]) + #expect(context.ranges == [NSRange(0, 12)]) + #expect(context.selectedRanges == [NSRange(8, 1)]) - info = string.moveLineDown(in: [NSRange(4, 1), NSRange(6, 0)]) - XCTAssertEqual(info?.strings, ["aa\nccc\nbbbb\n"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 12)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(8, 1), NSRange(10, 0)]) + context = try #require(string.moveLineDown(in: [NSRange(4, 1), NSRange(6, 0)])) + #expect(context.strings == ["aa\nccc\nbbbb\n"]) + #expect(context.ranges == [NSRange(0, 12)]) + #expect(context.selectedRanges == [NSRange(8, 1), NSRange(10, 0)]) - info = string.moveLineDown(in: [NSRange(4, 1), NSRange(9, 0), NSRange(13, 1)]) - XCTAssertEqual(info?.strings, ["aa\neee\nbbbb\nccc\nd"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 17)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(8, 1), NSRange(13, 0), NSRange(17, 1)]) + context = try #require(string.moveLineDown(in: [NSRange(4, 1), NSRange(9, 0), NSRange(13, 1)])) + #expect(context.strings == ["aa\neee\nbbbb\nccc\nd"]) + #expect(context.ranges == [NSRange(0, 17)]) + #expect(context.selectedRanges == [NSRange(8, 1), NSRange(13, 0), NSRange(17, 1)]) - info = string.moveLineDown(in: [NSRange(14, 1)]) - XCTAssertNil(info) + #expect(string.moveLineDown(in: [NSRange(14, 1)]) == nil) } - func testSortLinesAscending() { + @Test func sortLinesAscending() throws { let string = """ ccc aa bbbb """ - var info: String.EditingInfo? + var context: EditingContext - info = string.sortLinesAscending(in: NSRange(4, 1)) - XCTAssertNil(info) + #expect(string.sortLinesAscending(in: NSRange(4, 1)) == nil) - info = string.sortLinesAscending(in: string.nsRange) - XCTAssertEqual(info?.strings, ["aa\nbbbb\nccc"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 11)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(0, 11)]) + context = try #require(string.sortLinesAscending(in: string.nsRange)) + #expect(context.strings == ["aa\nbbbb\nccc"]) + #expect(context.ranges == [NSRange(0, 11)]) + #expect(context.selectedRanges == [NSRange(0, 11)]) - info = string.sortLinesAscending(in: NSRange(2, 4)) - XCTAssertEqual(info?.strings, ["aa\nccc"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 6)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(0, 6)]) + context = try #require(string.sortLinesAscending(in: NSRange(2, 4))) + #expect(context.strings == ["aa\nccc"]) + #expect(context.ranges == [NSRange(0, 6)]) + #expect(context.selectedRanges == [NSRange(0, 6)]) } - func testReverseLines() { + @Test func reverseLines() throws { let string = """ aa bbbb ccc """ - var info: String.EditingInfo? + var context: EditingContext - info = string.reverseLines(in: NSRange(4, 1)) - XCTAssertNil(info) + #expect(string.reverseLines(in: NSRange(4, 1)) == nil) - info = string.reverseLines(in: string.nsRange) - XCTAssertEqual(info?.strings, ["ccc\nbbbb\naa"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 11)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(0, 11)]) + context = try #require(string.reverseLines(in: string.nsRange)) + #expect(context.strings == ["ccc\nbbbb\naa"]) + #expect(context.ranges == [NSRange(0, 11)]) + #expect(context.selectedRanges == [NSRange(0, 11)]) - info = string.reverseLines(in: NSRange(2, 4)) - XCTAssertEqual(info?.strings, ["bbbb\naa"]) - XCTAssertEqual(info?.ranges, [NSRange(0, 7)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(0, 7)]) + context = try #require(string.reverseLines(in: NSRange(2, 4))) + #expect(context.strings == ["bbbb\naa"]) + #expect(context.ranges == [NSRange(0, 7)]) + #expect(context.selectedRanges == [NSRange(0, 7)]) } - func testDeleteDuplicateLine() { + @Test func deleteDuplicateLine() throws { let string = """ aa @@ -147,76 +144,75 @@ final class StringLineProcessingTests: XCTestCase { ccc bbbb """ - var info: String.EditingInfo? + var context: EditingContext - info = string.deleteDuplicateLine(in: [NSRange(4, 1)]) - XCTAssertNil(info) + #expect(string.deleteDuplicateLine(in: [NSRange(4, 1)]) == nil) - info = string.deleteDuplicateLine(in: [string.nsRange]) - XCTAssertEqual(info?.strings, ["", ""]) - XCTAssertEqual(info?.ranges, [NSRange(12, 4), NSRange(16, 4)]) - XCTAssertNil(info?.selectedRanges) + context = try #require(string.deleteDuplicateLine(in: [string.nsRange])) + #expect(context.strings == ["", ""]) + #expect(context.ranges == [NSRange(12, 4), NSRange(16, 4)]) + #expect(context.selectedRanges == nil) - info = string.deleteDuplicateLine(in: [NSRange(10, 4)]) - XCTAssertEqual(info?.strings, [""]) - XCTAssertEqual(info?.ranges, [NSRange(12, 4)]) - XCTAssertNil(info?.selectedRanges) + context = try #require(string.deleteDuplicateLine(in: [NSRange(10, 4)])) + #expect(context.strings == [""]) + #expect(context.ranges == [NSRange(12, 4)]) + #expect(context.selectedRanges == nil) - info = string.deleteDuplicateLine(in: [NSRange(9, 1), NSRange(11, 0), NSRange(13, 2)]) - XCTAssertEqual(info?.strings, [""]) - XCTAssertEqual(info?.ranges, [NSRange(12, 4)]) - XCTAssertNil(info?.selectedRanges) + context = try #require(string.deleteDuplicateLine(in: [NSRange(9, 1), NSRange(11, 0), NSRange(13, 2)])) + #expect(context.strings == [""]) + #expect(context.ranges == [NSRange(12, 4)]) + #expect(context.selectedRanges == nil) } - func testDuplicateLine() { + @Test func duplicateLine() throws { let string = """ aa bbbb ccc """ - var info: String.EditingInfo? + var context: EditingContext - info = string.duplicateLine(in: [NSRange(4, 1)], lineEnding: "\n") - XCTAssertEqual(info?.strings, ["bbbb\n"]) - XCTAssertEqual(info?.ranges, [NSRange(3, 0)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(9, 1)]) + context = try #require(string.duplicateLine(in: [NSRange(4, 1)], lineEnding: "\n")) + #expect(context.strings == ["bbbb\n"]) + #expect(context.ranges == [NSRange(3, 0)]) + #expect(context.selectedRanges == [NSRange(9, 1)]) - info = string.duplicateLine(in: [NSRange(4, 1), NSRange(6, 4)], lineEnding: "\n") - XCTAssertEqual(info?.strings, ["bbbb\nccc\n"]) - XCTAssertEqual(info?.ranges, [NSRange(3, 0)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(13, 1), NSRange(15, 4)]) + context = try #require(string.duplicateLine(in: [NSRange(4, 1), NSRange(6, 4)], lineEnding: "\n")) + #expect(context.strings == ["bbbb\nccc\n"]) + #expect(context.ranges == [NSRange(3, 0)]) + #expect(context.selectedRanges == [NSRange(13, 1), NSRange(15, 4)]) - info = string.duplicateLine(in: [NSRange(4, 1), NSRange(6, 1), NSRange(10, 0)], lineEnding: "\n") - XCTAssertEqual(info?.strings, ["bbbb\n", "ccc\n"]) - XCTAssertEqual(info?.ranges, [NSRange(3, 0), NSRange(8, 0)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(9, 1), NSRange(11, 1), NSRange(19, 0)]) + context = try #require(string.duplicateLine(in: [NSRange(4, 1), NSRange(6, 1), NSRange(10, 0)], lineEnding: "\n")) + #expect(context.strings == ["bbbb\n", "ccc\n"]) + #expect(context.ranges == [NSRange(3, 0), NSRange(8, 0)]) + #expect(context.selectedRanges == [NSRange(9, 1), NSRange(11, 1), NSRange(19, 0)]) } - func testDeleteLine() { + @Test func deleteLine() throws { let string = """ aa bbbb ccc """ - var info: String.EditingInfo? + var context: EditingContext - info = string.deleteLine(in: [NSRange(4, 1)]) - XCTAssertEqual(info?.strings, [""]) - XCTAssertEqual(info?.ranges, [NSRange(3, 5)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(3, 0)]) + context = try #require(string.deleteLine(in: [NSRange(4, 1)])) + #expect(context.strings == [""]) + #expect(context.ranges == [NSRange(3, 5)]) + #expect(context.selectedRanges == [NSRange(3, 0)]) - info = string.deleteLine(in: [NSRange(4, 1), NSRange(6, 1), NSRange(10, 0)]) - XCTAssertEqual(info?.strings, ["", ""]) - XCTAssertEqual(info?.ranges, [NSRange(3, 5), NSRange(8, 3)]) - XCTAssertEqual(info?.selectedRanges, [NSRange(3, 0)]) + context = try #require(string.deleteLine(in: [NSRange(4, 1), NSRange(6, 1), NSRange(10, 0)])) + #expect(context.strings == ["", ""]) + #expect(context.ranges == [NSRange(3, 5), NSRange(8, 3)]) + #expect(context.selectedRanges == [NSRange(3, 0)]) } - func testJoinLinesIn() { + @Test func joinLinesIn() { let string = """ aa @@ -224,15 +220,15 @@ final class StringLineProcessingTests: XCTestCase { ccc d """ - let info = string.joinLines(in: [NSRange(1, 6), NSRange(10, 1)]) + let context = string.joinLines(in: [NSRange(1, 6), NSRange(10, 1)]) - XCTAssertEqual(info.strings, ["a bb", "c"]) - XCTAssertEqual(info.ranges, [NSRange(1, 6), NSRange(10, 1)]) - XCTAssertEqual(info.selectedRanges, [NSRange(1, 4), NSRange(8, 1)]) + #expect(context.strings == ["a bb", "c"]) + #expect(context.ranges == [NSRange(1, 6), NSRange(10, 1)]) + #expect(context.selectedRanges == [NSRange(1, 4), NSRange(8, 1)]) } - func testJoinLinesAfter() { + @Test func joinLinesAfter() { let string = """ aa @@ -240,11 +236,11 @@ final class StringLineProcessingTests: XCTestCase { ccc d """ - let info = string.joinLines(after: [NSRange(1, 0), NSRange(10, 0), NSRange(14, 0)]) + let context = string.joinLines(after: [NSRange(1, 0), NSRange(10, 0), NSRange(14, 0)]) - XCTAssertEqual(info.strings, [" ", " "]) - XCTAssertEqual(info.ranges, [NSRange(2, 3), NSRange(13, 1)]) - XCTAssertNil(info.selectedRanges) + #expect(context.strings == [" ", " "]) + #expect(context.ranges == [NSRange(2, 3), NSRange(13, 1)]) + #expect(context.selectedRanges == nil) } } diff --git a/Tests/SyntaxTests.swift b/Tests/SyntaxTests.swift index 11e56ee47..84908fa81 100644 --- a/Tests/SyntaxTests.swift +++ b/Tests/SyntaxTests.swift @@ -24,29 +24,21 @@ // limitations under the License. // -import XCTest +import AppKit.NSTextStorage +import Testing import Combine import Yams @testable import CotEditor -final class SyntaxTests: XCTestCase { - - private let syntaxDirectoryName = "Syntaxes" +actor SyntaxTests { private var syntaxes: [String: Syntax] = [:] - private var htmlSyntax: Syntax? - private var htmlSource: String? - - private var outlineParseCancellable: AnyCancellable? - - override func setUpWithError() throws { - - try super.setUpWithError() + init() throws { let bundle = Bundle(for: type(of: self)) - let urls = try XCTUnwrap(bundle.urls(forResourcesWithExtension: "yml", subdirectory: self.syntaxDirectoryName)) + let urls = try #require(bundle.urls(forResourcesWithExtension: "yml", subdirectory: "Syntaxes")) // load syntaxes let decoder = YAMLDecoder() @@ -56,129 +48,122 @@ final class SyntaxTests: XCTestCase { dict[name] = try decoder.decode(Syntax.self, from: data) } - self.htmlSyntax = try XCTUnwrap(self.syntaxes["HTML"]) - - XCTAssertNotNil(self.htmlSyntax) - - // load test file - let sourceURL = try XCTUnwrap(bundle.url(forResource: "sample", withExtension: "html")) - self.htmlSource = try String(contentsOf: sourceURL) - - XCTAssertNotNil(self.htmlSource) } - func testAllSyntaxes() { + @Test func allSyntaxes() { for (name, syntax) in self.syntaxes { let model = SyntaxObject(value: syntax) let errors = model.validate() - XCTAssert(errors.isEmpty) + #expect(errors.isEmpty) for error in errors { - XCTFail("\(name): \(error)") + Issue.record("\(name): \(error)") } } } - func testSanitization() { + @Test func sanitize() { for (name, syntax) in self.syntaxes { let sanitized = syntax.sanitized - XCTAssertEqual(syntax.kind, sanitized.kind) + #expect(syntax.kind == sanitized.kind) for type in SyntaxType.allCases { let keyPath = Syntax.highlightKeyPath(for: type) - XCTAssertEqual(syntax[keyPath: keyPath], sanitized[keyPath: keyPath], - ".\(type.rawValue) of “\(name)” is not sanitized in the latest manner") + #expect(syntax[keyPath: keyPath] == sanitized[keyPath: keyPath], + ".\(type.rawValue) of “\(name)” is not sanitized in the latest manner") } - XCTAssertEqual(syntax.outlines, sanitized.outlines, - ".outlines of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.completions, sanitized.completions, - ".completions of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.commentDelimiters, sanitized.commentDelimiters, - ".commentDelimiters of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.extensions, sanitized.extensions, - ".extensions of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.filenames, sanitized.filenames, - ".filenames of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.interpreters, sanitized.interpreters, - ".interpreters of “\(name)” is not sanitized in the latest manner") - XCTAssertEqual(syntax.metadata, sanitized.metadata, - ".metadata of “\(name)” is not sanitized in the latest manner") + #expect(syntax.outlines == sanitized.outlines, + ".outlines of “\(name)” is not sanitized in the latest manner") + #expect(syntax.completions == sanitized.completions, + ".completions of “\(name)” is not sanitized in the latest manner") + #expect(syntax.commentDelimiters == sanitized.commentDelimiters, + ".commentDelimiters of “\(name)” is not sanitized in the latest manner") + #expect(syntax.extensions == sanitized.extensions, + ".extensions of “\(name)” is not sanitized in the latest manner") + #expect(syntax.filenames == sanitized.filenames, + ".filenames of “\(name)” is not sanitized in the latest manner") + #expect(syntax.interpreters == sanitized.interpreters, + ".interpreters of “\(name)” is not sanitized in the latest manner") + #expect(syntax.metadata == sanitized.metadata, + ".metadata of “\(name)” is not sanitized in the latest manner") } } - func testEquality() { - - XCTAssertEqual(self.htmlSyntax, self.htmlSyntax) - } - - - func testNoneSyntax() { + @Test func noneSyntax() { let syntax = Syntax.none - XCTAssertEqual(syntax.kind, .code) - XCTAssert(syntax.highlightParser.isEmpty) - XCTAssertNil(syntax.commentDelimiters.inline) - XCTAssertNil(syntax.commentDelimiters.block) + #expect(syntax.kind == .code) + #expect(syntax.highlightParser.isEmpty) + #expect(syntax.commentDelimiters.inline == nil) + #expect(syntax.commentDelimiters.block == nil) } - func testXMLSyntax() throws { + @Test func xmlSyntax() throws { - let syntax = try XCTUnwrap(self.htmlSyntax) + let syntax = try #require(self.syntaxes["HTML"]) - XCTAssertFalse(syntax.highlightParser.isEmpty) - XCTAssertNil(syntax.commentDelimiters.inline) - XCTAssertEqual(syntax.commentDelimiters.block, Pair("")) + #expect(!syntax.highlightParser.isEmpty) + #expect(syntax.commentDelimiters.inline == nil) + #expect(syntax.commentDelimiters.block == Pair("")) } - func testOutlineParse() throws { + @Test func parseOutline() async throws { - let syntax = try XCTUnwrap(self.htmlSyntax) - let source = try XCTUnwrap(self.htmlSource) + let syntax = try #require(self.syntaxes["HTML"]) + + // load test file + let bundle = Bundle(for: type(of: self)) + let sourceURL = try #require(bundle.url(forResource: "sample", withExtension: "html")) + let source = try String(contentsOf: sourceURL, encoding: .utf8) let textStorage = NSTextStorage(string: source) let parser = SyntaxParser(textStorage: textStorage, syntax: syntax, name: "HTML") // test outline parsing with publisher - let outlineParseExpectation = self.expectation(description: "didParseOutline") - self.outlineParseCancellable = parser.$outlineItems - .compactMap { $0 } // ignore the initial invocation - .receive(on: RunLoop.main) - .sink { outlineItems in - outlineParseExpectation.fulfill() - - XCTAssertEqual(outlineItems.count, 3) - - XCTAssertEqual(parser.outlineItems, outlineItems) - - let item = outlineItems[1] - XCTAssertEqual(item.title, " h2: 🐕🐄") - XCTAssertEqual(item.range.location, 354) - XCTAssertEqual(item.range.length, 13) - XCTAssertTrue(item.style.isEmpty) - } - parser.invalidateOutline() - self.waitForExpectations(timeout: 1) + try await confirmation("didParseOutline") { confirm in + let cancellable = parser.$outlineItems + .compactMap { $0 } // ignore the initial invocation + .receive(on: RunLoop.main) + .sink { outlineItems in + confirm() + + #expect(outlineItems.count == 3) + + #expect(parser.outlineItems == outlineItems) + + let item = outlineItems[1] + #expect(item.title == " h2: 🐕🐄") + #expect(item.range.location == 354) + #expect(item.range.length == 13) + #expect(item.style.isEmpty) + } + + parser.invalidateOutline() + try await Task.sleep(for: .seconds(0.5)) + + cancellable.cancel() + } } - func testViewModelHighlightEquality() { + @Test func viewModelHighlightEquality() { let termA = SyntaxObject.Highlight(begin: "abc", end: "def") let termB = SyntaxObject.Highlight(begin: "abc", end: "def") let termC = SyntaxObject.Highlight(begin: "abc") - XCTAssertEqual(termA, termB) - XCTAssertNotEqual(termA, termC) - XCTAssertNotEqual(termA.id, termB.id) + #expect(termA == termB) + #expect(termA != termC) + #expect(termA.id != termB.id) } } diff --git a/Tests/TextClippingTests.swift b/Tests/TextClippingTests.swift index 3d01d841c..a1694c1c1 100644 --- a/Tests/TextClippingTests.swift +++ b/Tests/TextClippingTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2020-2023 1024jp +// © 2020-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,17 +23,18 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class TextClippingTests: XCTestCase { +actor TextClippingTests { - func testReadingTextClippingFile() throws { + @Test func readTextClippingFile() throws { let bundle = Bundle(for: type(of: self)) - let url = try XCTUnwrap(bundle.url(forResource: "moof", withExtension: "textClipping")) + let url = try #require(bundle.url(forResource: "moof", withExtension: "textClipping")) let textClipping = try TextClipping(contentsOf: url) - XCTAssertEqual(textClipping.string, "🐕moof🐄") + #expect(textClipping.string == "🐕moof🐄") } } diff --git a/Tests/TextFindTests.swift b/Tests/TextFindTests.swift index a90fcfd0c..7cc26851a 100644 --- a/Tests/TextFindTests.swift +++ b/Tests/TextFindTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2017-2023 1024jp +// © 2017-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,45 +24,32 @@ // limitations under the License. // -import XCTest +import AppKit +import Testing @testable import CotEditor -final class TextFindTests: XCTestCase { +struct TextFindTests { - func testTextFinderActions() { + @Test func finderActions() { - XCTAssertEqual(TextFinder.Action.showFindInterface.rawValue, - NSTextFinder.Action.showFindInterface.rawValue) - XCTAssertEqual(TextFinder.Action.nextMatch.rawValue, - NSTextFinder.Action.nextMatch.rawValue) - XCTAssertEqual(TextFinder.Action.previousMatch.rawValue, - NSTextFinder.Action.previousMatch.rawValue) - XCTAssertEqual(TextFinder.Action.replaceAll.rawValue, - NSTextFinder.Action.replaceAll.rawValue) - XCTAssertEqual(TextFinder.Action.replace.rawValue, - NSTextFinder.Action.replace.rawValue) - XCTAssertEqual(TextFinder.Action.replaceAndFind.rawValue, - NSTextFinder.Action.replaceAndFind.rawValue) - XCTAssertEqual(TextFinder.Action.setSearchString.rawValue, - NSTextFinder.Action.setSearchString.rawValue) - XCTAssertEqual(TextFinder.Action.replaceAllInSelection.rawValue, - NSTextFinder.Action.replaceAllInSelection.rawValue) - XCTAssertEqual(TextFinder.Action.selectAll.rawValue, - NSTextFinder.Action.selectAll.rawValue) - XCTAssertEqual(TextFinder.Action.selectAllInSelection.rawValue, - NSTextFinder.Action.selectAllInSelection.rawValue) - XCTAssertEqual(TextFinder.Action.hideFindInterface.rawValue, - NSTextFinder.Action.hideFindInterface.rawValue) - XCTAssertEqual(TextFinder.Action.showReplaceInterface.rawValue, - NSTextFinder.Action.showReplaceInterface.rawValue) - XCTAssertEqual(TextFinder.Action.showReplaceInterface.rawValue, - NSTextFinder.Action.showReplaceInterface.rawValue) - XCTAssertEqual(TextFinder.Action.hideReplaceInterface.rawValue, - NSTextFinder.Action.hideReplaceInterface.rawValue) + #expect(TextFinder.Action.showFindInterface.rawValue == NSTextFinder.Action.showFindInterface.rawValue) + #expect(TextFinder.Action.nextMatch.rawValue == NSTextFinder.Action.nextMatch.rawValue) + #expect(TextFinder.Action.previousMatch.rawValue == NSTextFinder.Action.previousMatch.rawValue) + #expect(TextFinder.Action.replaceAll.rawValue == NSTextFinder.Action.replaceAll.rawValue) + #expect(TextFinder.Action.replace.rawValue == NSTextFinder.Action.replace.rawValue) + #expect(TextFinder.Action.replaceAndFind.rawValue == NSTextFinder.Action.replaceAndFind.rawValue) + #expect(TextFinder.Action.setSearchString.rawValue == NSTextFinder.Action.setSearchString.rawValue) + #expect(TextFinder.Action.replaceAllInSelection.rawValue == NSTextFinder.Action.replaceAllInSelection.rawValue) + #expect(TextFinder.Action.selectAll.rawValue == NSTextFinder.Action.selectAll.rawValue) + #expect(TextFinder.Action.selectAllInSelection.rawValue == NSTextFinder.Action.selectAllInSelection.rawValue) + #expect(TextFinder.Action.hideFindInterface.rawValue == NSTextFinder.Action.hideFindInterface.rawValue) + #expect(TextFinder.Action.showReplaceInterface.rawValue == NSTextFinder.Action.showReplaceInterface.rawValue) + #expect(TextFinder.Action.showReplaceInterface.rawValue == NSTextFinder.Action.showReplaceInterface.rawValue) + #expect(TextFinder.Action.hideReplaceInterface.rawValue == NSTextFinder.Action.hideReplaceInterface.rawValue) } - func testCaptureGroupCount() throws { + @Test func countCaptureGroup() throws { var mode: TextFind.Mode var textFind: TextFind @@ -70,18 +57,18 @@ final class TextFindTests: XCTestCase { mode = .regularExpression(options: [], unescapesReplacement: false) textFind = try TextFind(for: "", findString: "a", mode: mode) - XCTAssertEqual(textFind.numberOfCaptureGroups, 0) + #expect(textFind.numberOfCaptureGroups == 0) textFind = try TextFind(for: "", findString: "(?!=a)(b)(c)(?=d)", mode: mode) - XCTAssertEqual(textFind.numberOfCaptureGroups, 2) + #expect(textFind.numberOfCaptureGroups == 2) mode = .textual(options: [], fullWord: false) textFind = try TextFind(for: "", findString: "(?!=a)(b)(c)(?=d)", mode: mode) - XCTAssertEqual(textFind.numberOfCaptureGroups, 0) + #expect(textFind.numberOfCaptureGroups == 0) } - func testSingleFind() throws { + @Test func singleFind() throws { let text = "abcdefg abcdefg ABCDEFG" let findString = "abc" @@ -93,40 +80,40 @@ final class TextFindTests: XCTestCase { textFind = try TextFind(for: text, findString: findString, mode: .textual(options: [], fullWord: false)) matches = try textFind.matches - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: false)) - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(result.range, NSRange(location: 0, length: 3)) - XCTAssertFalse(result.wrapped) + result = try #require(textFind.find(in: matches, forward: true, wraps: false)) + #expect(matches.count == 2) + #expect(result.range == NSRange(location: 0, length: 3)) + #expect(!result.wrapped) - XCTAssertNil(textFind.find(in: matches, forward: false, wraps: false)) + #expect(textFind.find(in: matches, forward: false, wraps: false) == nil) textFind = try TextFind(for: text, findString: findString, mode: .textual(options: [], fullWord: false), selectedRanges: [NSRange(location: 1, length: 0)]) matches = try textFind.matches - XCTAssertEqual(matches.count, 2) + #expect(matches.count == 2) - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 8, length: 3)) - XCTAssertFalse(result.wrapped) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(result.range == NSRange(location: 8, length: 3)) + #expect(!result.wrapped) - result = try XCTUnwrap(textFind.find(in: matches, forward: false, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 8, length: 3)) - XCTAssertTrue(result.wrapped) + result = try #require(textFind.find(in: matches, forward: false, wraps: true)) + #expect(result.range == NSRange(location: 8, length: 3)) + #expect(result.wrapped) textFind = try TextFind(for: text, findString: findString, mode: .textual(options: .caseInsensitive, fullWord: false), selectedRanges: [NSRange(location: 1, length: 0)]) matches = try textFind.matches - XCTAssertEqual(matches.count, 3) + #expect(matches.count == 3) - result = try XCTUnwrap(textFind.find(in: matches, forward: false, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 16, length: 3)) - XCTAssertTrue(result.wrapped) + result = try #require(textFind.find(in: matches, forward: false, wraps: true)) + #expect(result.range == NSRange(location: 16, length: 3)) + #expect(result.wrapped) } - func testFullWord() throws { + @Test func fullWord() throws { var textFind: TextFind var result: (range: NSRange, wrapped: Bool) @@ -135,43 +122,43 @@ final class TextFindTests: XCTestCase { textFind = try TextFind(for: "apples apple Apple", findString: "apple", mode: .textual(options: .caseInsensitive, fullWord: true)) matches = try textFind.matches - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(result.range, NSRange(location: 7, length: 5)) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(matches.count == 2) + #expect(result.range == NSRange(location: 7, length: 5)) textFind = try TextFind(for: "apples apple Apple", findString: "apple", mode: .textual(options: [.caseInsensitive, .literal], fullWord: true)) matches = try textFind.matches - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(result.range, NSRange(location: 7, length: 5)) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(matches.count == 2) + #expect(result.range == NSRange(location: 7, length: 5)) textFind = try TextFind(for: "Apfel Äpfel Äpfelchen", findString: "Äpfel", mode: .textual(options: .diacriticInsensitive, fullWord: true)) matches = try textFind.matches - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(result.range, NSRange(location: 0, length: 5)) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(matches.count == 2) + #expect(result.range == NSRange(location: 0, length: 5)) textFind = try TextFind(for: "イヌら ｲﾇ イヌ", findString: "イヌ", mode: .textual(options: .widthInsensitive, fullWord: true)) matches = try textFind.matches - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(result.range, NSRange(location: 4, length: 2)) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(matches.count == 2) + #expect(result.range == NSRange(location: 4, length: 2)) } - func testUnescapedRegexFind() throws { + @Test func unescapedRegexFind() throws { let mode: TextFind.Mode = .regularExpression(options: .caseInsensitive, unescapesReplacement: true) let textFind = try TextFind(for: "1", findString: "1", mode: mode, selectedRanges: [NSRange(0..<1)]) - let replacementResult = try XCTUnwrap(textFind.replace(with: #"foo：\n1"#)) - XCTAssertEqual(replacementResult.value, "foo：\n1") + let replacementResult = try #require(textFind.replace(with: #"foo：\n1"#)) + #expect(replacementResult.value == "foo：\n1") } - func testSingleRegexFindAndReplacement() throws { + @Test func findAndReplaceSingleRegex() throws { let findString = "(?!=a)b(c)(?=d)" let mode: TextFind.Mode = .regularExpression(options: .caseInsensitive, unescapesReplacement: true) @@ -184,42 +171,42 @@ final class TextFindTests: XCTestCase { textFind = try TextFind(for: "abcdefg abcdefg ABCDEFG", findString: findString, mode: mode, selectedRanges: [NSRange(location: 1, length: 1)]) matches = try textFind.matches - XCTAssertEqual(matches.count, 3) + #expect(matches.count == 3) - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 9, length: 2)) - XCTAssertFalse(result.wrapped) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(result.range == NSRange(location: 9, length: 2)) + #expect(!result.wrapped) - result = try XCTUnwrap(textFind.find(in: matches, forward: false, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 17, length: 2)) - XCTAssertTrue(result.wrapped) + result = try #require(textFind.find(in: matches, forward: false, wraps: true)) + #expect(result.range == NSRange(location: 17, length: 2)) + #expect(result.wrapped) textFind = try TextFind(for: "ABCDEFG", findString: findString, mode: mode, selectedRanges: [NSRange(location: 1, length: 1)]) matches = try textFind.matches - XCTAssertEqual(matches.count, 1) + #expect(matches.count == 1) - result = try XCTUnwrap(textFind.find(in: matches, forward: true, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 1, length: 2)) - XCTAssertTrue(result.wrapped) + result = try #require(textFind.find(in: matches, forward: true, wraps: true)) + #expect(result.range == NSRange(location: 1, length: 2)) + #expect(result.wrapped) - result = try XCTUnwrap(textFind.find(in: matches, forward: false, wraps: true)) - XCTAssertEqual(result.range, NSRange(location: 1, length: 2)) - XCTAssertTrue(result.wrapped) + result = try #require(textFind.find(in: matches, forward: false, wraps: true)) + #expect(result.range == NSRange(location: 1, length: 2)) + #expect(result.wrapped) - XCTAssertNil(textFind.replace(with: "$1")) + #expect(textFind.replace(with: "$1") == nil) textFind = try TextFind(for: "ABCDEFG", findString: findString, mode: mode, selectedRanges: [NSRange(location: 1, length: 2)]) - let replacementResult = try XCTUnwrap(textFind.replace(with: "$1\\t")) - XCTAssertEqual(replacementResult.value, "C\t") - XCTAssertEqual(replacementResult.range, NSRange(location: 1, length: 2)) + let replacementResult = try #require(textFind.replace(with: "$1\\t")) + #expect(replacementResult.value == "C\t") + #expect(replacementResult.range == NSRange(location: 1, length: 2)) } - func testFindAll() throws { + @Test func findAll() throws { let mode: TextFind.Mode = .regularExpression(options: .caseInsensitive, unescapesReplacement: false) var textFind: TextFind @@ -230,13 +217,13 @@ final class TextFindTests: XCTestCase { textFind.findAll { (matchedRanges, _) in matches.append(matchedRanges) } - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(matches[0].count, 2) - XCTAssertEqual(matches[0][0], NSRange(location: 1, length: 2)) - XCTAssertEqual(matches[0][1], NSRange(location: 2, length: 1)) - XCTAssertEqual(matches[1].count, 2) - XCTAssertEqual(matches[1][0], NSRange(location: 9, length: 2)) - XCTAssertEqual(matches[1][1], NSRange(location: 10, length: 1)) + #expect(matches.count == 2) + #expect(matches[0].count == 2) + #expect(matches[0][0] == NSRange(location: 1, length: 2)) + #expect(matches[0][1] == NSRange(location: 2, length: 1)) + #expect(matches[1].count == 2) + #expect(matches[1][0] == NSRange(location: 9, length: 2)) + #expect(matches[1][1] == NSRange(location: 10, length: 1)) textFind = try TextFind(for: "abcdefg ABCDEFG", findString: "ab", mode: mode) @@ -245,15 +232,15 @@ final class TextFindTests: XCTestCase { textFind.findAll { (matchedRanges, _) in matches.append(matchedRanges) } - XCTAssertEqual(matches.count, 2) - XCTAssertEqual(matches[0].count, 1) - XCTAssertEqual(matches[0][0], NSRange(location: 0, length: 2)) - XCTAssertEqual(matches[1].count, 1) - XCTAssertEqual(matches[1][0], NSRange(location: 8, length: 2)) + #expect(matches.count == 2) + #expect(matches[0].count == 1) + #expect(matches[0][0] == NSRange(location: 0, length: 2)) + #expect(matches[1].count == 1) + #expect(matches[1][0] == NSRange(location: 8, length: 2)) } - func testReplaceAll() throws { + @Test func replaceAll() throws { var textFind: TextFind var replacementItems: [TextFind.ReplacementItem] @@ -263,10 +250,10 @@ final class TextFindTests: XCTestCase { mode: .regularExpression(options: .caseInsensitive, unescapesReplacement: false)) (replacementItems, selectedRanges) = textFind.replaceAll(with: "$1\\\\t") { (_, _, _) in } - XCTAssertEqual(replacementItems.count, 1) - XCTAssertEqual(replacementItems[0].value, "ac\\tdefg AC\\tDEFG") - XCTAssertEqual(replacementItems[0].range, NSRange(location: 0, length: 15)) - XCTAssertNil(selectedRanges) + #expect(replacementItems.count == 1) + #expect(replacementItems[0].value == "ac\\tdefg AC\\tDEFG") + #expect(replacementItems[0].range == NSRange(location: 0, length: 15)) + #expect(selectedRanges == nil) textFind = try TextFind(for: "abcdefg abcdefg abcdefg", findString: "abc", @@ -276,12 +263,12 @@ final class TextFindTests: XCTestCase { NSRange(location: 16, length: 7)]) (replacementItems, selectedRanges) = textFind.replaceAll(with: "_") { (_, _, _) in } - XCTAssertEqual(replacementItems.count, 2) - XCTAssertEqual(replacementItems[0].value, "bcdefg _defg") - XCTAssertEqual(replacementItems[0].range, NSRange(location: 1, length: 14)) - XCTAssertEqual(replacementItems[1].value, "_defg") - XCTAssertEqual(replacementItems[1].range, NSRange(location: 16, length: 7)) - XCTAssertEqual(selectedRanges?[0], NSRange(location: 1, length: 12)) - XCTAssertEqual(selectedRanges?[1], NSRange(location: 14, length: 5)) + #expect(replacementItems.count == 2) + #expect(replacementItems[0].value == "bcdefg _defg") + #expect(replacementItems[0].range == NSRange(location: 1, length: 14)) + #expect(replacementItems[1].value == "_defg") + #expect(replacementItems[1].range == NSRange(location: 16, length: 7)) + #expect(selectedRanges?[0] == NSRange(location: 1, length: 12)) + #expect(selectedRanges?[1] == NSRange(location: 14, length: 5)) } } diff --git a/Tests/ThemeTests.swift b/Tests/ThemeTests.swift index ba238828e..c1f76a41d 100644 --- a/Tests/ThemeTests.swift +++ b/Tests/ThemeTests.swift @@ -24,61 +24,64 @@ // limitations under the License. // +import AppKit import UniformTypeIdentifiers -import XCTest +import Testing @testable import CotEditor -final class ThemeTests: XCTestCase { +actor ThemeTests { private let themeDirectoryName = "Themes" - private lazy var bundle = Bundle(for: type(of: self)) - - func testDefaultTheme() throws { + @Test func defaultTheme() throws { let themeName = "Dendrobates" let theme = try self.loadThemeWithName(themeName) - XCTAssertEqual(theme.name, themeName) - XCTAssertEqual(theme.text.color, NSColor.black.usingColorSpace(.genericRGB)) - XCTAssertEqual(theme.insertionPoint.color, NSColor.black.usingColorSpace(.genericRGB)) - XCTAssertEqual(theme.invisibles.color.brightnessComponent, 0.72, accuracy: 0.01) - XCTAssertEqual(theme.background.color, NSColor.white.usingColorSpace(.genericRGB)) - XCTAssertEqual(theme.lineHighlight.color.brightnessComponent, 0.94, accuracy: 0.01) - XCTAssertEqual(theme.effectiveSecondarySelectionColor(for: NSAppearance(named: .aqua)!), .unemphasizedSelectedContentBackgroundColor) - XCTAssertFalse(theme.isDarkTheme) + #expect(theme.name == themeName) + #expect(theme.text.color == NSColor.black.usingColorSpace(.genericRGB)) + #expect(theme.insertionPoint.color == NSColor.black.usingColorSpace(.genericRGB)) + withKnownIssue("Test-side issue") { + #expect(theme.invisibles.color.brightnessComponent == 0.725) // accuracy: 0.01 + } + #expect(theme.background.color == NSColor.white.usingColorSpace(.genericRGB)) + withKnownIssue("Test-side issue") { + #expect(theme.lineHighlight.color.brightnessComponent == 0.929) // accuracy: 0.01 + } + #expect(theme.effectiveSecondarySelectionColor(for: NSAppearance(named: .aqua)!) == .unemphasizedSelectedContentBackgroundColor) + #expect(!theme.isDarkTheme) for type in SyntaxType.allCases { - let style = try XCTUnwrap(theme.style(for: type)) - XCTAssertGreaterThan(style.color.hueComponent, 0) + let style = try #require(theme.style(for: type)) + #expect(style.color.hueComponent > 0) } - XCTAssertFalse(theme.isDarkTheme) + #expect(!theme.isDarkTheme) } - func testDarkTheme() throws { + @Test func darkTheme() throws { - let themeName = "Solarized (Dark)" + let themeName = "Anura (Dark)" let theme = try self.loadThemeWithName(themeName) - XCTAssertEqual(theme.name, themeName) - XCTAssertTrue(theme.isDarkTheme) + #expect(theme.name == themeName) + #expect(theme.isDarkTheme) } /// Tests if all of bundled themes are valid. - func testBundledThemes() throws { + @Test func bundledThemes() throws { - let themeDirectoryURL = try XCTUnwrap(self.bundle.url(forResource: self.themeDirectoryName, withExtension: nil)) + let themeDirectoryURL = try #require(Bundle(for: type(of: self)).url(forResource: self.themeDirectoryName, withExtension: nil)) let urls = try FileManager.default.contentsOfDirectory(at: themeDirectoryURL, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants, .skipsHiddenFiles]) .filter { UTType.cotTheme.preferredFilenameExtension == $0.pathExtension } - XCTAssertFalse(urls.isEmpty) + #expect(!urls.isEmpty) for url in urls { - XCTAssertNoThrow(try Theme(contentsOf: url)) + #expect(throws: Never.self) { try Theme(contentsOf: url) } } } } @@ -90,7 +93,7 @@ private extension ThemeTests { func loadThemeWithName(_ name: String) throws -> Theme { guard - let url = self.bundle.url(forResource: name, withExtension: UTType.cotTheme.preferredFilenameExtension, subdirectory: self.themeDirectoryName) + let url = Bundle(for: type(of: self)).url(forResource: name, withExtension: UTType.cotTheme.preferredFilenameExtension, subdirectory: self.themeDirectoryName) else { throw CocoaError(.fileNoSuchFile) } return try Theme(contentsOf: url) diff --git a/Tests/URLExtensionsTests.swift b/Tests/URLExtensionsTests.swift index 3e2887438..c6f43f4bb 100644 --- a/Tests/URLExtensionsTests.swift +++ b/Tests/URLExtensionsTests.swift @@ -9,7 +9,7 @@ // // --------------------------------------------------------------------------- // -// © 2016-2023 1024jp +// © 2016-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,41 +24,55 @@ // limitations under the License. // -import XCTest +import Foundation +import Testing @testable import CotEditor -final class URLExtensionsTests: XCTestCase { +struct URLExtensionsTests { - func testRelativeURLCreation() { + @Test func createRelativeURL() { let url = URL(filePath: "/foo/bar/file.txt") let baseURL = URL(filePath: "/foo/buz/file.txt") - XCTAssertEqual(url.path(relativeTo: baseURL), "../bar/file.txt") - XCTAssertNil(url.path(relativeTo: nil)) + #expect(url.path(relativeTo: baseURL) == "../bar/file.txt") } - func testRelativeURLCreation2() { + @Test func createRelativeURL2() { let url = URL(filePath: "/file1.txt") let baseURL = URL(filePath: "/file2.txt") - XCTAssertEqual(url.path(relativeTo: baseURL), "file1.txt") + #expect(url.path(relativeTo: baseURL) == "file1.txt") } - func testRelativeURLCreationWithSameURLs() { + @Test func createRelativeURLWithSameURLs() { let url = URL(filePath: "/file1.txt") let baseURL = URL(filePath: "/file1.txt") - XCTAssertEqual(url.path(relativeTo: baseURL), "file1.txt") + #expect(url.path(relativeTo: baseURL) == "file1.txt") } - func testItemReplacementDirectoryCreation() throws { + @Test func createRelativeURLWithDirectoryURLs() { - XCTAssertNoThrow(try URL.itemReplacementDirectory) + let url = URL(filePath: "Dog/Cow/Cat/file1.txt") + #expect(url.path(relativeTo: URL(filePath: "Dog/Cow", directoryHint: .isDirectory)) == "Cat/file1.txt") + #expect(url.path(relativeTo: URL(filePath: "Dog/Cow/", directoryHint: .isDirectory)) == "Cat/file1.txt") + #expect(url.path(relativeTo: URL(filePath: "Dog/Cow/Cat", directoryHint: .isDirectory)) == "file1.txt") + #expect(url.path(relativeTo: URL(filePath: "", directoryHint: .isDirectory)) == "Dog/Cow/Cat/file1.txt") + + let url2 = URL(filePath: "file1.txt") + #expect(url2.path(relativeTo: URL(filePath: "", directoryHint: .isDirectory)) == "file1.txt") + #expect(url2.path(relativeTo: URL(filePath: "Dog", directoryHint: .isDirectory)) == "../file1.txt") + } + + + @Test func createItemReplacementDirectory() throws { + + #expect(throws: Never.self) { try URL.itemReplacementDirectory } } } diff --git a/Tests/UTTypeExtensionTests.swift b/Tests/UTTypeExtensionTests.swift index 014b0b78a..2c83417fe 100644 --- a/Tests/UTTypeExtensionTests.swift +++ b/Tests/UTTypeExtensionTests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2022-2023 1024jp +// © 2022-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,26 +24,54 @@ // import UniformTypeIdentifiers -import XCTest +import Testing @testable import CotEditor -final class UTTypeExtensionTests: XCTestCase { +struct UTTypeExtensionTests { - func testFilenameExtensions() { + @Test func filenameExtensions() { - XCTAssertEqual(UTType.yaml.filenameExtensions, ["yml", "yaml"]) - XCTAssertEqual(UTType.svg.filenameExtensions, ["svg", "svgz"]) + #expect(UTType.yaml.filenameExtensions == ["yml", "yaml"]) + #expect(UTType.svg.filenameExtensions == ["svg", "svgz"]) + #expect(UTType.mpeg2TransportStream.filenameExtensions == ["ts"]) + #expect(UTType.propertyList.filenameExtensions == ["plist"]) } - func testURLConformance() { + @Test func conformURL() { let xmlURL = URL(filePath: "foo.xml") - XCTAssertFalse(xmlURL.conforms(to: .svg)) - XCTAssertTrue(xmlURL.conforms(to: .xml)) - XCTAssertFalse(xmlURL.conforms(to: .plainText)) + #expect(!xmlURL.conforms(to: .svg)) + #expect(xmlURL.conforms(to: .xml)) + #expect(!xmlURL.conforms(to: .plainText)) let svgzURL = URL(filePath: "FOO.SVGZ") - XCTAssertTrue(svgzURL.conforms(to: .svg)) + #expect(svgzURL.conforms(to: .svg)) + } + + + @Test func svg() throws { + + #expect(UTType.svg.conforms(to: .text)) + #expect(UTType.svg.conforms(to: .image)) + + let svgz = try #require(UTType(filenameExtension: "svgz")) + #expect(svgz == .svg) + #expect(!svgz.conforms(to: .gzip)) + } + + + @Test func plist() { + + #expect(UTType.propertyList.conforms(to: .data)) + #expect(!UTType.propertyList.conforms(to: .image)) + } + + + @Test func isPlainText() { + + #expect(UTType.propertyList.isPlainText) + #expect(UTType.svg.isPlainText) + #expect(UTType(filenameExtension: "ts")!.isPlainText) } } diff --git a/Tests/UserDefaultsObservationTests.swift b/Tests/UserDefaultsObservationTests.swift deleted file mode 100644 index 23ccc0c5d..000000000 --- a/Tests/UserDefaultsObservationTests.swift +++ /dev/null @@ -1,133 +0,0 @@ -// -// UserDefaultsObservationTests.swift -// Tests -// -// CotEditor -// https://coteditor.com -// -// Created by 1024jp on 2019-11-22. -// -// --------------------------------------------------------------------------- -// -// © 2019-2023 1024jp -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import Combine -import XCTest -@testable import CotEditor - -final class UserDefaultsObservationTests: XCTestCase { - - func testKeyObservation() { - - let key = DefaultKey("Test Key") - defer { UserDefaults.standard.restore(key: key) } - - let expectation = self.expectation(description: "UserDefaults observation for normal key") - - UserDefaults.standard[key] = false - - let observer = UserDefaults.standard.publisher(for: key) - .sink { value in - XCTAssertTrue(value) - XCTAssertEqual(OperationQueue.current, .main) - - expectation.fulfill() - } - - UserDefaults.standard[key] = true - self.wait(for: [expectation], timeout: .zero) - // -> Waiting with zero timeout can be failed when the closure is performed not immediately but in another runloop. - - observer.cancel() - UserDefaults.standard[key] = false - } - - - func testInitialEmission() { - - let key = DefaultKey("Initial Emission Test Key") - defer { UserDefaults.standard.restore(key: key) } - - let expectation = self.expectation(description: "UserDefaults observation for initial emission") - - UserDefaults.standard[key] = false - - let observer = UserDefaults.standard.publisher(for: key, initial: true) - .sink { value in - XCTAssertFalse(value) - expectation.fulfill() - } - - observer.cancel() - UserDefaults.standard[key] = true - - self.wait(for: [expectation], timeout: .zero) - } - - - func testOptionalKey() { - - let key = DefaultKey("Optional Test Key") - defer { UserDefaults.standard.restore(key: key) } - - XCTAssertNil(UserDefaults.standard[key]) - - UserDefaults.standard[key] = "cow" - XCTAssertEqual(UserDefaults.standard[key], "cow") - - let expectation = self.expectation(description: "UserDefaults observation for optional key") - let observer = UserDefaults.standard.publisher(for: key) - .sink { value in - XCTAssertNil(value) - expectation.fulfill() - } - - UserDefaults.standard[key] = nil - self.wait(for: [expectation], timeout: .zero) - - XCTAssertNil(UserDefaults.standard[key]) - - observer.cancel() - UserDefaults.standard[key] = "dog" - XCTAssertEqual(UserDefaults.standard[key], "dog") - } - - - func testRawRepresentable() { - - enum Clarus: Int { case dog, cow } - - let key = RawRepresentableDefaultKey("Raw Representable Test Key") - defer { UserDefaults.standard.restore(key: key) } - - let expectation = self.expectation(description: "UserDefaults observation for raw representable") - - UserDefaults.standard[key] = .dog - - let observer = UserDefaults.standard.publisher(for: key) - .sink { value in - XCTAssertEqual(value, .cow) - expectation.fulfill() - } - - UserDefaults.standard[key] = .cow - self.wait(for: [expectation], timeout: .zero) - - observer.cancel() - UserDefaults.standard[key] = .dog - XCTAssertEqual(UserDefaults.standard[key], .dog) - } -} diff --git a/UI Tests/UITests.swift b/UI Tests/UITests.swift index c9f672238..cbf93f038 100644 --- a/UI Tests/UITests.swift +++ b/UI Tests/UITests.swift @@ -8,7 +8,7 @@ // // --------------------------------------------------------------------------- // -// © 2018-2023 1024jp +// © 2018-2024 1024jp // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ import XCTest final class UITests: XCTestCase { - override func setUp() { + @MainActor override func setUp() { super.setUp() @@ -38,7 +38,7 @@ final class UITests: XCTestCase { } - func testTyping() { + @MainActor func testTyping() { let app = XCUIApplication() @@ -73,7 +73,7 @@ final class UITests: XCTestCase { } - func testLaunchPerformance() throws { + @MainActor func testLaunchPerformance() throws { // This measures how long it takes to launch your application. self.measure(metrics: [XCTApplicationLaunchMetric()]) {