Skip to content

Commit 293e7ab

Browse files
Merge branch 'main' into feat/lsp-semantic-highlighter
2 parents b4aead1 + 3d64ff1 commit 293e7ab

32 files changed

+315
-209
lines changed

.all-contributorsrc

+9
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,15 @@
785785
"contributions": [
786786
"bug"
787787
]
788+
},
789+
{
790+
"login": "pro100filipp",
791+
"name": "Filipp Kuznetsov",
792+
"avatar_url": "https://avatars.githubusercontent.com/u/12880697?v=4",
793+
"profile": "https://github.com/pro100filipp",
794+
"contributions": [
795+
"code"
796+
]
788797
}
789798
],
790799
"contributorsPerLine": 7,

.github/workflows/CI-release-notes.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Deploy Website on Release Note Changes
22

33
on:
4+
workflow_dispatch:
45
release:
56
types: [created, edited, deleted]
67

.github/workflows/pre-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Build CodeEdit
4949
env:
5050
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
51-
run: xcodebuild -scheme CodeEdit -configuration Pre -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive
51+
run: xcodebuild -scheme CodeEdit -configuration Pre -derivedDataPath "$RUNNER_TEMP/DerivedData" -archivePath "$RUNNER_TEMP/CodeEdit.xcarchive" -skipPackagePluginValidation DEVELOPMENT_TEAM=$APPLE_TEAM_ID archive | xcpretty
5252

5353
############################
5454
# Sign

CodeEdit.xcodeproj/project.pbxproj

+40-43
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 6C81916A29B41DD300B75C92 /* DequeModule */; };
2929
6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB3F2C2105ED00EB5DEF /* CodeEditKit */; };
3030
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */ = {isa = PBXBuildFile; productRef = 6C85BB432C210EFD00EB5DEF /* SwiftUIIntrospect */; };
31-
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */; };
3231
6CAAF68A29BC9C2300A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
3332
6CAAF69229BCC71C00A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
3433
6CAAF69429BCD78600A1F48A /* (null) in Sources */ = {isa = PBXBuildFile; };
@@ -185,7 +184,6 @@
185184
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
186185
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
187186
6CB94D032CA1205100E8651C /* AsyncAlgorithms in Frameworks */,
188-
6C9DB9E42D55656300ACD86E /* CodeEditSourceEditor in Frameworks */,
189187
);
190188
runOnlyForDeploymentPostprocessing = 0;
191189
};
@@ -319,7 +317,6 @@
319317
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
320318
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
321319
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
322-
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */,
323320
);
324321
productName = CodeEdit;
325322
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -380,7 +377,7 @@
380377
attributes = {
381378
BuildIndependentTargetsInParallel = 1;
382379
LastSwiftUpdateCheck = 1330;
383-
LastUpgradeCheck = 1540;
380+
LastUpgradeCheck = 1620;
384381
TargetAttributes = {
385382
2BE487EB28245162003F3F64 = {
386383
CreatedOnToolsVersion = 13.3.1;
@@ -422,7 +419,7 @@
422419
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
423420
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
424421
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
425-
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
422+
6CFE18222DA59C9F00A7B796 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
426423
);
427424
preferredProjectObjectVersion = 55;
428425
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -577,6 +574,7 @@
577574
baseConfigurationReferenceRelativePath = Alpha.xcconfig;
578575
buildSettings = {
579576
ALWAYS_SEARCH_USER_PATHS = NO;
577+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
580578
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
581579
CLANG_ANALYZER_NONNULL = YES;
582580
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -608,7 +606,7 @@
608606
CLANG_WARN_UNREACHABLE_CODE = YES;
609607
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
610608
COPY_PHASE_STRIP = NO;
611-
CURRENT_PROJECT_VERSION = 44;
609+
CURRENT_PROJECT_VERSION = 45;
612610
DEAD_CODE_STRIPPING = YES;
613611
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
614612
ENABLE_NS_ASSERTIONS = NO;
@@ -648,7 +646,7 @@
648646
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
649647
CODE_SIGN_STYLE = Automatic;
650648
COMBINE_HIDPI_IMAGES = YES;
651-
CURRENT_PROJECT_VERSION = 44;
649+
CURRENT_PROJECT_VERSION = 45;
652650
DEAD_CODE_STRIPPING = YES;
653651
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
654652
DEVELOPMENT_TEAM = "";
@@ -684,7 +682,7 @@
684682
BUNDLE_LOADER = "$(TEST_HOST)";
685683
CODE_SIGN_STYLE = Automatic;
686684
COMBINE_HIDPI_IMAGES = YES;
687-
CURRENT_PROJECT_VERSION = 44;
685+
CURRENT_PROJECT_VERSION = 45;
688686
DEAD_CODE_STRIPPING = YES;
689687
DEVELOPMENT_TEAM = "";
690688
GENERATE_INFOPLIST_FILE = YES;
@@ -712,7 +710,7 @@
712710
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
713711
CODE_SIGN_STYLE = Automatic;
714712
COMBINE_HIDPI_IMAGES = YES;
715-
CURRENT_PROJECT_VERSION = 44;
713+
CURRENT_PROJECT_VERSION = 45;
716714
DEAD_CODE_STRIPPING = YES;
717715
DEVELOPMENT_TEAM = "";
718716
GENERATE_INFOPLIST_FILE = YES;
@@ -741,7 +739,7 @@
741739
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
742740
CODE_SIGN_STYLE = Automatic;
743741
COMBINE_HIDPI_IMAGES = YES;
744-
CURRENT_PROJECT_VERSION = 44;
742+
CURRENT_PROJECT_VERSION = 45;
745743
DEAD_CODE_STRIPPING = YES;
746744
DEVELOPMENT_TEAM = "";
747745
ENABLE_HARDENED_RUNTIME = YES;
@@ -771,6 +769,7 @@
771769
baseConfigurationReferenceRelativePath = Beta.xcconfig;
772770
buildSettings = {
773771
ALWAYS_SEARCH_USER_PATHS = NO;
772+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
774773
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
775774
CLANG_ANALYZER_NONNULL = YES;
776775
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -802,7 +801,7 @@
802801
CLANG_WARN_UNREACHABLE_CODE = YES;
803802
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
804803
COPY_PHASE_STRIP = NO;
805-
CURRENT_PROJECT_VERSION = 44;
804+
CURRENT_PROJECT_VERSION = 45;
806805
DEAD_CODE_STRIPPING = YES;
807806
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
808807
ENABLE_NS_ASSERTIONS = NO;
@@ -842,7 +841,7 @@
842841
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
843842
CODE_SIGN_STYLE = Automatic;
844843
COMBINE_HIDPI_IMAGES = YES;
845-
CURRENT_PROJECT_VERSION = 44;
844+
CURRENT_PROJECT_VERSION = 45;
846845
DEAD_CODE_STRIPPING = YES;
847846
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
848847
DEVELOPMENT_TEAM = "";
@@ -878,7 +877,7 @@
878877
BUNDLE_LOADER = "$(TEST_HOST)";
879878
CODE_SIGN_STYLE = Automatic;
880879
COMBINE_HIDPI_IMAGES = YES;
881-
CURRENT_PROJECT_VERSION = 44;
880+
CURRENT_PROJECT_VERSION = 45;
882881
DEAD_CODE_STRIPPING = YES;
883882
DEVELOPMENT_TEAM = "";
884883
GENERATE_INFOPLIST_FILE = YES;
@@ -906,7 +905,7 @@
906905
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
907906
CODE_SIGN_STYLE = Automatic;
908907
COMBINE_HIDPI_IMAGES = YES;
909-
CURRENT_PROJECT_VERSION = 44;
908+
CURRENT_PROJECT_VERSION = 45;
910909
DEAD_CODE_STRIPPING = YES;
911910
DEVELOPMENT_TEAM = "";
912911
GENERATE_INFOPLIST_FILE = YES;
@@ -935,7 +934,7 @@
935934
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
936935
CODE_SIGN_STYLE = Automatic;
937936
COMBINE_HIDPI_IMAGES = YES;
938-
CURRENT_PROJECT_VERSION = 44;
937+
CURRENT_PROJECT_VERSION = 45;
939938
DEAD_CODE_STRIPPING = YES;
940939
DEVELOPMENT_TEAM = "";
941940
ENABLE_HARDENED_RUNTIME = YES;
@@ -969,7 +968,7 @@
969968
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
970969
CODE_SIGN_STYLE = Automatic;
971970
COMBINE_HIDPI_IMAGES = YES;
972-
CURRENT_PROJECT_VERSION = 44;
971+
CURRENT_PROJECT_VERSION = 45;
973972
DEAD_CODE_STRIPPING = YES;
974973
DEVELOPMENT_TEAM = "";
975974
ENABLE_HARDENED_RUNTIME = YES;
@@ -1003,7 +1002,7 @@
10031002
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
10041003
CODE_SIGN_STYLE = Automatic;
10051004
COMBINE_HIDPI_IMAGES = YES;
1006-
CURRENT_PROJECT_VERSION = 44;
1005+
CURRENT_PROJECT_VERSION = 45;
10071006
DEAD_CODE_STRIPPING = YES;
10081007
DEVELOPMENT_TEAM = "";
10091008
ENABLE_HARDENED_RUNTIME = YES;
@@ -1033,6 +1032,7 @@
10331032
baseConfigurationReferenceRelativePath = Alpha.xcconfig;
10341033
buildSettings = {
10351034
ALWAYS_SEARCH_USER_PATHS = NO;
1035+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
10361036
CE_APPICON_NAME = AppIconPre;
10371037
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
10381038
CLANG_ANALYZER_NONNULL = YES;
@@ -1065,7 +1065,7 @@
10651065
CLANG_WARN_UNREACHABLE_CODE = YES;
10661066
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10671067
COPY_PHASE_STRIP = NO;
1068-
CURRENT_PROJECT_VERSION = 44;
1068+
CURRENT_PROJECT_VERSION = 45;
10691069
DEAD_CODE_STRIPPING = YES;
10701070
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10711071
ENABLE_NS_ASSERTIONS = NO;
@@ -1106,7 +1106,7 @@
11061106
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11071107
CODE_SIGN_STYLE = Automatic;
11081108
COMBINE_HIDPI_IMAGES = YES;
1109-
CURRENT_PROJECT_VERSION = 44;
1109+
CURRENT_PROJECT_VERSION = 45;
11101110
DEAD_CODE_STRIPPING = YES;
11111111
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11121112
DEVELOPMENT_TEAM = "";
@@ -1142,7 +1142,7 @@
11421142
BUNDLE_LOADER = "$(TEST_HOST)";
11431143
CODE_SIGN_STYLE = Automatic;
11441144
COMBINE_HIDPI_IMAGES = YES;
1145-
CURRENT_PROJECT_VERSION = 44;
1145+
CURRENT_PROJECT_VERSION = 45;
11461146
DEAD_CODE_STRIPPING = YES;
11471147
DEVELOPMENT_TEAM = "";
11481148
GENERATE_INFOPLIST_FILE = YES;
@@ -1170,7 +1170,7 @@
11701170
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11711171
CODE_SIGN_STYLE = Automatic;
11721172
COMBINE_HIDPI_IMAGES = YES;
1173-
CURRENT_PROJECT_VERSION = 44;
1173+
CURRENT_PROJECT_VERSION = 45;
11741174
DEAD_CODE_STRIPPING = YES;
11751175
DEVELOPMENT_TEAM = "";
11761176
GENERATE_INFOPLIST_FILE = YES;
@@ -1199,7 +1199,7 @@
11991199
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12001200
CODE_SIGN_STYLE = Automatic;
12011201
COMBINE_HIDPI_IMAGES = YES;
1202-
CURRENT_PROJECT_VERSION = 44;
1202+
CURRENT_PROJECT_VERSION = 45;
12031203
DEAD_CODE_STRIPPING = YES;
12041204
DEVELOPMENT_TEAM = "";
12051205
ENABLE_HARDENED_RUNTIME = YES;
@@ -1229,6 +1229,7 @@
12291229
baseConfigurationReferenceRelativePath = Debug.xcconfig;
12301230
buildSettings = {
12311231
ALWAYS_SEARCH_USER_PATHS = NO;
1232+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
12321233
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
12331234
CLANG_ANALYZER_NONNULL = YES;
12341235
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1260,7 +1261,7 @@
12601261
CLANG_WARN_UNREACHABLE_CODE = YES;
12611262
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12621263
COPY_PHASE_STRIP = NO;
1263-
CURRENT_PROJECT_VERSION = 44;
1264+
CURRENT_PROJECT_VERSION = 45;
12641265
DEAD_CODE_STRIPPING = YES;
12651266
DEBUG_INFORMATION_FORMAT = dwarf;
12661267
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1300,6 +1301,7 @@
13001301
baseConfigurationReferenceRelativePath = Release.xcconfig;
13011302
buildSettings = {
13021303
ALWAYS_SEARCH_USER_PATHS = NO;
1304+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
13031305
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
13041306
CLANG_ANALYZER_NONNULL = YES;
13051307
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1331,7 +1333,7 @@
13311333
CLANG_WARN_UNREACHABLE_CODE = YES;
13321334
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13331335
COPY_PHASE_STRIP = NO;
1334-
CURRENT_PROJECT_VERSION = 44;
1336+
CURRENT_PROJECT_VERSION = 45;
13351337
DEAD_CODE_STRIPPING = YES;
13361338
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13371339
ENABLE_NS_ASSERTIONS = NO;
@@ -1370,7 +1372,7 @@
13701372
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
13711373
CODE_SIGN_STYLE = Automatic;
13721374
COMBINE_HIDPI_IMAGES = YES;
1373-
CURRENT_PROJECT_VERSION = 44;
1375+
CURRENT_PROJECT_VERSION = 45;
13741376
DEAD_CODE_STRIPPING = YES;
13751377
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
13761378
DEVELOPMENT_TEAM = "";
@@ -1410,7 +1412,7 @@
14101412
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
14111413
CODE_SIGN_STYLE = Automatic;
14121414
COMBINE_HIDPI_IMAGES = YES;
1413-
CURRENT_PROJECT_VERSION = 44;
1415+
CURRENT_PROJECT_VERSION = 45;
14141416
DEAD_CODE_STRIPPING = YES;
14151417
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14161418
DEVELOPMENT_TEAM = "";
@@ -1446,7 +1448,7 @@
14461448
BUNDLE_LOADER = "$(TEST_HOST)";
14471449
CODE_SIGN_STYLE = Automatic;
14481450
COMBINE_HIDPI_IMAGES = YES;
1449-
CURRENT_PROJECT_VERSION = 44;
1451+
CURRENT_PROJECT_VERSION = 45;
14501452
DEAD_CODE_STRIPPING = YES;
14511453
DEVELOPMENT_TEAM = "";
14521454
GENERATE_INFOPLIST_FILE = YES;
@@ -1473,7 +1475,7 @@
14731475
BUNDLE_LOADER = "$(TEST_HOST)";
14741476
CODE_SIGN_STYLE = Automatic;
14751477
COMBINE_HIDPI_IMAGES = YES;
1476-
CURRENT_PROJECT_VERSION = 44;
1478+
CURRENT_PROJECT_VERSION = 45;
14771479
DEAD_CODE_STRIPPING = YES;
14781480
DEVELOPMENT_TEAM = "";
14791481
GENERATE_INFOPLIST_FILE = YES;
@@ -1501,7 +1503,7 @@
15011503
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15021504
CODE_SIGN_STYLE = Automatic;
15031505
COMBINE_HIDPI_IMAGES = YES;
1504-
CURRENT_PROJECT_VERSION = 44;
1506+
CURRENT_PROJECT_VERSION = 45;
15051507
DEAD_CODE_STRIPPING = YES;
15061508
DEVELOPMENT_TEAM = "";
15071509
GENERATE_INFOPLIST_FILE = YES;
@@ -1530,7 +1532,7 @@
15301532
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15311533
CODE_SIGN_STYLE = Automatic;
15321534
COMBINE_HIDPI_IMAGES = YES;
1533-
CURRENT_PROJECT_VERSION = 44;
1535+
CURRENT_PROJECT_VERSION = 45;
15341536
DEAD_CODE_STRIPPING = YES;
15351537
DEVELOPMENT_TEAM = "";
15361538
GENERATE_INFOPLIST_FILE = YES;
@@ -1735,14 +1737,6 @@
17351737
minimumVersion = 1.2.0;
17361738
};
17371739
};
1738-
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
1739-
isa = XCRemoteSwiftPackageReference;
1740-
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
1741-
requirement = {
1742-
kind = upToNextMajorVersion;
1743-
minimumVersion = 0.10.0;
1744-
};
1745-
};
17461740
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */ = {
17471741
isa = XCRemoteSwiftPackageReference;
17481742
repositoryURL = "https://github.com/apple/swift-async-algorithms.git";
@@ -1751,6 +1745,14 @@
17511745
version = 1.0.1;
17521746
};
17531747
};
1748+
6CFE18222DA59C9F00A7B796 /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */ = {
1749+
isa = XCRemoteSwiftPackageReference;
1750+
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
1751+
requirement = {
1752+
kind = upToNextMajorVersion;
1753+
minimumVersion = 0.11.0;
1754+
};
1755+
};
17541756
/* End XCRemoteSwiftPackageReference section */
17551757

17561758
/* Begin XCSwiftPackageProductDependency section */
@@ -1836,11 +1838,6 @@
18361838
package = 6C85BB422C210EFD00EB5DEF /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
18371839
productName = SwiftUIIntrospect;
18381840
};
1839-
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */ = {
1840-
isa = XCSwiftPackageProductDependency;
1841-
package = 6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */;
1842-
productName = CodeEditSourceEditor;
1843-
};
18441841
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */ = {
18451842
isa = XCSwiftPackageProductDependency;
18461843
productName = CodeEditSourceEditor;

0 commit comments

Comments
 (0)