Skip to content

Commit 6ba4c6e

Browse files
thecoolwinterthecoolwinter
committed
Merge branch 'main' into lsp-install
2 parents 7104044 + 704da8a commit 6ba4c6e

File tree

50 files changed

+1535
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1535
-326
lines changed

‎.github/scripts/test_app.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ set -o pipefail && arch -"${ARCH}" xcodebuild \
1818
-scheme CodeEdit \
1919
-destination "platform=OS X,arch=${ARCH}" \
2020
-skipPackagePluginValidation \
21-
clean test | xcpretty
21+
clean test | xcbeautify --renderer github-actions

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; };
2323
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
2424
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
25+
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */; };
2526
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */; };
2627
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
2728
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F329CD142C00235D17 /* CollectionConcurrencyKit */; };
2829
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F729CD14D100235D17 /* CodeEditKit */; };
2930
6C6BD6F929CD14D100235D17 /* CodeEditKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 6C6BD6F729CD14D100235D17 /* CodeEditKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3031
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */; };
32+
6C76D6D42E15B91E00EF52C3 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */; };
3133
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 6C81916A29B41DD300B75C92 /* DequeModule */; };
3234
6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB3F2C2105ED00EB5DEF /* CodeEditKit */; };
3335
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB432C210EFD00EB5DEF /* SwiftUIIntrospect */; };
@@ -173,6 +175,8 @@
173175
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
174176
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
175177
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */,
178+
6C76D6D42E15B91E00EF52C3 /* CodeEditSourceEditor in Frameworks */,
179+
6C315FC82E05E33D0011BFC5 /* CodeEditSourceEditor in Frameworks */,
176180
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */,
177181
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */,
178182
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
@@ -328,6 +332,8 @@
328332
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
329333
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */,
330334
5E4485602DF600D9008BBE69 /* AboutWindow */,
335+
6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */,
336+
6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */,
331337
);
332338
productName = CodeEdit;
333339
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -430,10 +436,10 @@
430436
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
431437
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
432438
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
433-
6CF368562DBBD274006A77FD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
434439
30ED7B722DD299E600ACC922 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
435440
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
436441
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
442+
6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
437443
);
438444
preferredProjectObjectVersion = 55;
439445
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -620,7 +626,7 @@
620626
CLANG_WARN_UNREACHABLE_CODE = YES;
621627
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
622628
COPY_PHASE_STRIP = NO;
623-
CURRENT_PROJECT_VERSION = 45;
629+
CURRENT_PROJECT_VERSION = 46;
624630
DEAD_CODE_STRIPPING = YES;
625631
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
626632
ENABLE_NS_ASSERTIONS = NO;
@@ -660,7 +666,7 @@
660666
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
661667
CODE_SIGN_STYLE = Automatic;
662668
COMBINE_HIDPI_IMAGES = YES;
663-
CURRENT_PROJECT_VERSION = 45;
669+
CURRENT_PROJECT_VERSION = 46;
664670
DEAD_CODE_STRIPPING = YES;
665671
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
666672
DEVELOPMENT_TEAM = "";
@@ -697,7 +703,7 @@
697703
BUNDLE_LOADER = "$(TEST_HOST)";
698704
CODE_SIGN_STYLE = Automatic;
699705
COMBINE_HIDPI_IMAGES = YES;
700-
CURRENT_PROJECT_VERSION = 45;
706+
CURRENT_PROJECT_VERSION = 46;
701707
DEAD_CODE_STRIPPING = YES;
702708
DEVELOPMENT_TEAM = "";
703709
GENERATE_INFOPLIST_FILE = YES;
@@ -725,7 +731,7 @@
725731
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
726732
CODE_SIGN_STYLE = Automatic;
727733
COMBINE_HIDPI_IMAGES = YES;
728-
CURRENT_PROJECT_VERSION = 45;
734+
CURRENT_PROJECT_VERSION = 46;
729735
DEAD_CODE_STRIPPING = YES;
730736
DEVELOPMENT_TEAM = "";
731737
GENERATE_INFOPLIST_FILE = YES;
@@ -754,7 +760,7 @@
754760
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
755761
CODE_SIGN_STYLE = Automatic;
756762
COMBINE_HIDPI_IMAGES = YES;
757-
CURRENT_PROJECT_VERSION = 45;
763+
CURRENT_PROJECT_VERSION = 46;
758764
DEAD_CODE_STRIPPING = YES;
759765
DEVELOPMENT_TEAM = "";
760766
ENABLE_HARDENED_RUNTIME = YES;
@@ -817,7 +823,7 @@
817823
CLANG_WARN_UNREACHABLE_CODE = YES;
818824
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
819825
COPY_PHASE_STRIP = NO;
820-
CURRENT_PROJECT_VERSION = 45;
826+
CURRENT_PROJECT_VERSION = 46;
821827
DEAD_CODE_STRIPPING = YES;
822828
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
823829
ENABLE_NS_ASSERTIONS = NO;
@@ -857,7 +863,7 @@
857863
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
858864
CODE_SIGN_STYLE = Automatic;
859865
COMBINE_HIDPI_IMAGES = YES;
860-
CURRENT_PROJECT_VERSION = 45;
866+
CURRENT_PROJECT_VERSION = 46;
861867
DEAD_CODE_STRIPPING = YES;
862868
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
863869
DEVELOPMENT_TEAM = "";
@@ -894,7 +900,7 @@
894900
BUNDLE_LOADER = "$(TEST_HOST)";
895901
CODE_SIGN_STYLE = Automatic;
896902
COMBINE_HIDPI_IMAGES = YES;
897-
CURRENT_PROJECT_VERSION = 45;
903+
CURRENT_PROJECT_VERSION = 46;
898904
DEAD_CODE_STRIPPING = YES;
899905
DEVELOPMENT_TEAM = "";
900906
GENERATE_INFOPLIST_FILE = YES;
@@ -922,7 +928,7 @@
922928
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
923929
CODE_SIGN_STYLE = Automatic;
924930
COMBINE_HIDPI_IMAGES = YES;
925-
CURRENT_PROJECT_VERSION = 45;
931+
CURRENT_PROJECT_VERSION = 46;
926932
DEAD_CODE_STRIPPING = YES;
927933
DEVELOPMENT_TEAM = "";
928934
GENERATE_INFOPLIST_FILE = YES;
@@ -951,7 +957,7 @@
951957
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
952958
CODE_SIGN_STYLE = Automatic;
953959
COMBINE_HIDPI_IMAGES = YES;
954-
CURRENT_PROJECT_VERSION = 45;
960+
CURRENT_PROJECT_VERSION = 46;
955961
DEAD_CODE_STRIPPING = YES;
956962
DEVELOPMENT_TEAM = "";
957963
ENABLE_HARDENED_RUNTIME = YES;
@@ -986,7 +992,7 @@
986992
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
987993
CODE_SIGN_STYLE = Automatic;
988994
COMBINE_HIDPI_IMAGES = YES;
989-
CURRENT_PROJECT_VERSION = 45;
995+
CURRENT_PROJECT_VERSION = 46;
990996
DEAD_CODE_STRIPPING = YES;
991997
DEVELOPMENT_TEAM = "";
992998
ENABLE_HARDENED_RUNTIME = YES;
@@ -1021,7 +1027,7 @@
10211027
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
10221028
CODE_SIGN_STYLE = Automatic;
10231029
COMBINE_HIDPI_IMAGES = YES;
1024-
CURRENT_PROJECT_VERSION = 45;
1030+
CURRENT_PROJECT_VERSION = 46;
10251031
DEAD_CODE_STRIPPING = YES;
10261032
DEVELOPMENT_TEAM = "";
10271033
ENABLE_HARDENED_RUNTIME = YES;
@@ -1085,7 +1091,7 @@
10851091
CLANG_WARN_UNREACHABLE_CODE = YES;
10861092
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10871093
COPY_PHASE_STRIP = NO;
1088-
CURRENT_PROJECT_VERSION = 45;
1094+
CURRENT_PROJECT_VERSION = 46;
10891095
DEAD_CODE_STRIPPING = YES;
10901096
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10911097
ENABLE_NS_ASSERTIONS = NO;
@@ -1126,7 +1132,7 @@
11261132
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11271133
CODE_SIGN_STYLE = Automatic;
11281134
COMBINE_HIDPI_IMAGES = YES;
1129-
CURRENT_PROJECT_VERSION = 45;
1135+
CURRENT_PROJECT_VERSION = 46;
11301136
DEAD_CODE_STRIPPING = YES;
11311137
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11321138
DEVELOPMENT_TEAM = "";
@@ -1163,7 +1169,7 @@
11631169
BUNDLE_LOADER = "$(TEST_HOST)";
11641170
CODE_SIGN_STYLE = Automatic;
11651171
COMBINE_HIDPI_IMAGES = YES;
1166-
CURRENT_PROJECT_VERSION = 45;
1172+
CURRENT_PROJECT_VERSION = 46;
11671173
DEAD_CODE_STRIPPING = YES;
11681174
DEVELOPMENT_TEAM = "";
11691175
GENERATE_INFOPLIST_FILE = YES;
@@ -1191,7 +1197,7 @@
11911197
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11921198
CODE_SIGN_STYLE = Automatic;
11931199
COMBINE_HIDPI_IMAGES = YES;
1194-
CURRENT_PROJECT_VERSION = 45;
1200+
CURRENT_PROJECT_VERSION = 46;
11951201
DEAD_CODE_STRIPPING = YES;
11961202
DEVELOPMENT_TEAM = "";
11971203
GENERATE_INFOPLIST_FILE = YES;
@@ -1220,7 +1226,7 @@
12201226
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12211227
CODE_SIGN_STYLE = Automatic;
12221228
COMBINE_HIDPI_IMAGES = YES;
1223-
CURRENT_PROJECT_VERSION = 45;
1229+
CURRENT_PROJECT_VERSION = 46;
12241230
DEAD_CODE_STRIPPING = YES;
12251231
DEVELOPMENT_TEAM = "";
12261232
ENABLE_HARDENED_RUNTIME = YES;
@@ -1283,7 +1289,7 @@
12831289
CLANG_WARN_UNREACHABLE_CODE = YES;
12841290
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12851291
COPY_PHASE_STRIP = NO;
1286-
CURRENT_PROJECT_VERSION = 45;
1292+
CURRENT_PROJECT_VERSION = 46;
12871293
DEAD_CODE_STRIPPING = YES;
12881294
DEBUG_INFORMATION_FORMAT = dwarf;
12891295
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1355,7 +1361,7 @@
13551361
CLANG_WARN_UNREACHABLE_CODE = YES;
13561362
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13571363
COPY_PHASE_STRIP = NO;
1358-
CURRENT_PROJECT_VERSION = 45;
1364+
CURRENT_PROJECT_VERSION = 46;
13591365
DEAD_CODE_STRIPPING = YES;
13601366
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13611367
ENABLE_NS_ASSERTIONS = NO;
@@ -1394,7 +1400,7 @@
13941400
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
13951401
CODE_SIGN_STYLE = Automatic;
13961402
COMBINE_HIDPI_IMAGES = YES;
1397-
CURRENT_PROJECT_VERSION = 45;
1403+
CURRENT_PROJECT_VERSION = 46;
13981404
DEAD_CODE_STRIPPING = YES;
13991405
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14001406
DEVELOPMENT_TEAM = "";
@@ -1435,7 +1441,7 @@
14351441
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
14361442
CODE_SIGN_STYLE = Automatic;
14371443
COMBINE_HIDPI_IMAGES = YES;
1438-
CURRENT_PROJECT_VERSION = 45;
1444+
CURRENT_PROJECT_VERSION = 46;
14391445
DEAD_CODE_STRIPPING = YES;
14401446
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14411447
DEVELOPMENT_TEAM = "";
@@ -1472,7 +1478,7 @@
14721478
BUNDLE_LOADER = "$(TEST_HOST)";
14731479
CODE_SIGN_STYLE = Automatic;
14741480
COMBINE_HIDPI_IMAGES = YES;
1475-
CURRENT_PROJECT_VERSION = 45;
1481+
CURRENT_PROJECT_VERSION = 46;
14761482
DEAD_CODE_STRIPPING = YES;
14771483
DEVELOPMENT_TEAM = "";
14781484
GENERATE_INFOPLIST_FILE = YES;
@@ -1499,7 +1505,7 @@
14991505
BUNDLE_LOADER = "$(TEST_HOST)";
15001506
CODE_SIGN_STYLE = Automatic;
15011507
COMBINE_HIDPI_IMAGES = YES;
1502-
CURRENT_PROJECT_VERSION = 45;
1508+
CURRENT_PROJECT_VERSION = 46;
15031509
DEAD_CODE_STRIPPING = YES;
15041510
DEVELOPMENT_TEAM = "";
15051511
GENERATE_INFOPLIST_FILE = YES;
@@ -1527,7 +1533,7 @@
15271533
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15281534
CODE_SIGN_STYLE = Automatic;
15291535
COMBINE_HIDPI_IMAGES = YES;
1530-
CURRENT_PROJECT_VERSION = 45;
1536+
CURRENT_PROJECT_VERSION = 46;
15311537
DEAD_CODE_STRIPPING = YES;
15321538
DEVELOPMENT_TEAM = "";
15331539
GENERATE_INFOPLIST_FILE = YES;
@@ -1556,7 +1562,7 @@
15561562
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15571563
CODE_SIGN_STYLE = Automatic;
15581564
COMBINE_HIDPI_IMAGES = YES;
1559-
CURRENT_PROJECT_VERSION = 45;
1565+
CURRENT_PROJECT_VERSION = 46;
15601566
DEAD_CODE_STRIPPING = YES;
15611567
DEVELOPMENT_TEAM = "";
15621568
GENERATE_INFOPLIST_FILE = YES;
@@ -1662,7 +1668,7 @@
16621668
repositoryURL = "https://github.com/ChimeHQ/LanguageClient";
16631669
requirement = {
16641670
kind = upToNextMajorVersion;
1665-
minimumVersion = 0.8.0;
1671+
minimumVersion = 0.8.2;
16661672
};
16671673
};
16681674
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */ = {
@@ -1777,6 +1783,14 @@
17771783
minimumVersion = 0.2.0;
17781784
};
17791785
};
1786+
6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
1787+
isa = XCRemoteSwiftPackageReference;
1788+
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
1789+
requirement = {
1790+
kind = exactVersion;
1791+
version = 0.14.1;
1792+
};
1793+
};
17801794
6C85BB3E2C2105ED00EB5DEF /* XCRemoteSwiftPackageReference "CodeEditKit" */ = {
17811795
isa = XCRemoteSwiftPackageReference;
17821796
repositoryURL = "https://github.com/CodeEditApp/CodeEditKit";
@@ -1809,14 +1823,6 @@
18091823
version = 1.0.1;
18101824
};
18111825
};
1812-
6CF368562DBBD274006A77FD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
1813-
isa = XCRemoteSwiftPackageReference;
1814-
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
1815-
requirement = {
1816-
kind = exactVersion;
1817-
version = 0.13.2;
1818-
};
1819-
};
18201826
/* End XCRemoteSwiftPackageReference section */
18211827

18221828
/* Begin XCSwiftPackageProductDependency section */
@@ -1874,6 +1880,10 @@
18741880
package = 6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */;
18751881
productName = OrderedCollections;
18761882
};
1883+
6C315FC72E05E33D0011BFC5 /* CodeEditSourceEditor */ = {
1884+
isa = XCSwiftPackageProductDependency;
1885+
productName = CodeEditSourceEditor;
1886+
};
18771887
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */ = {
18781888
isa = XCSwiftPackageProductDependency;
18791889
package = 6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */;
@@ -1897,6 +1907,11 @@
18971907
isa = XCSwiftPackageProductDependency;
18981908
productName = CodeEditSourceEditor;
18991909
};
1910+
6C76D6D32E15B91E00EF52C3 /* CodeEditSourceEditor */ = {
1911+
isa = XCSwiftPackageProductDependency;
1912+
package = 6C76D6D22E15B91E00EF52C3 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
1913+
productName = CodeEditSourceEditor;
1914+
};
19001915
6C7B1C752A1D57CE005CBBFC /* SwiftLint */ = {
19011916
isa = XCSwiftPackageProductDependency;
19021917
package = 287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */;

0 commit comments

Comments
 (0)