Skip to content

Commit 7104044

Browse files
FastestMolassesFastestMolasses
authored
Merge branch 'main' into lsp-install
2 parents 6831368 + 422b7bf commit 7104044

File tree

71 files changed

+1785
-1256
lines changed

Some content is hidden

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

71 files changed

+1785
-1256
lines changed

‎.all-contributorsrc‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -794,6 +794,52 @@
794794
"contributions": [
795795
"code"
796796
]
797+
},
798+
{
799+
"login": "rustemd02",
800+
"name": "rustemd02",
801+
"avatar_url": "https://avatars.githubusercontent.com/u/11714456?v=4",
802+
"profile": "https://github.com/rustemd02",
803+
"contributions": [
804+
"bug",
805+
"code"
806+
]
807+
},
808+
{
809+
"login": "SimonKudsk",
810+
"name": "Simon Kudsk",
811+
"avatar_url": "https://avatars.githubusercontent.com/u/10168417?v=4",
812+
"profile": "https://github.com/SimonKudsk",
813+
"contributions": [
814+
"code"
815+
]
816+
},
817+
{
818+
"login": "Syrux64",
819+
"name": "Surya",
820+
"avatar_url": "https://avatars.githubusercontent.com/u/118998822?v=4",
821+
"profile": "https://github.com/Syrux64",
822+
"contributions": [
823+
"code"
824+
]
825+
},
826+
{
827+
"login": "georgetchelidze",
828+
"name": "George Tchelidze",
829+
"avatar_url": "https://avatars.githubusercontent.com/u/96194129?v=4",
830+
"profile": "https://github.com/georgetchelidze",
831+
"contributions": [
832+
"code"
833+
]
834+
},
835+
{
836+
"login": "zhrispineda",
837+
"name": "Chris Pineda",
838+
"avatar_url": "https://avatars.githubusercontent.com/u/148818634?v=4",
839+
"profile": "http://zhr.is",
840+
"contributions": [
841+
"code"
842+
]
797843
}
798844
],
799845
"contributorsPerLine": 7,

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
583E529C29361BAB001AB554 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 583E529B29361BAB001AB554 /* SnapshotTesting */; };
1818
58F2EB03292FB2B0004A9BDE /* Documentation.docc in Sources */ = {isa = PBXBuildFile; fileRef = 58F2EACE292FB2B0004A9BDE /* Documentation.docc */; };
1919
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 58F2EB1D292FB954004A9BDE /* Sparkle */; };
20+
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5E4485602DF600D9008BBE69 /* AboutWindow */; };
21+
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */ = {isa = PBXBuildFile; productRef = 5EACE6212DF4BF08005E08B8 /* WelcomeWindow */; };
2022
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0617D52BDB4432008C9C42 /* LogStream */; };
2123
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0824A02C5C0C9700A0751E /* SwiftTerm */; };
2224
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */ = {isa = PBXBuildFile; productRef = 6C147C4429A329350089B630 /* OrderedCollections */; };
@@ -176,13 +178,15 @@
176178
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
177179
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
178180
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
181+
5E4485612DF600D9008BBE69 /* AboutWindow in Frameworks */,
179182
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
180183
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
181184
6C85BB442C210EFD00EB5DEF /* SwiftUIIntrospect in Frameworks */,
182185
6CB446402B6DFF3A00539ED0 /* CodeEditSourceEditor in Frameworks */,
183186
6C73A6D32D4F1E550012D95C /* CodeEditSourceEditor in Frameworks */,
184187
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
185188
30CB64942C16CA9100CC8A9E /* LanguageClient in Frameworks */,
189+
5EACE6222DF4BF08005E08B8 /* WelcomeWindow in Frameworks */,
186190
6C6BD6F829CD14D100235D17 /* CodeEditKit in Frameworks */,
187191
6C0824A12C5C0C9700A0751E /* SwiftTerm in Frameworks */,
188192
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */,
@@ -321,6 +325,9 @@
321325
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
322326
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
323327
30818CB42D4E563900967860 /* ZIPFoundation */,
328+
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
329+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */,
330+
5E4485602DF600D9008BBE69 /* AboutWindow */,
324331
);
325332
productName = CodeEdit;
326333
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -381,7 +388,7 @@
381388
attributes = {
382389
BuildIndependentTargetsInParallel = 1;
383390
LastSwiftUpdateCheck = 1330;
384-
LastUpgradeCheck = 1620;
391+
LastUpgradeCheck = 1640;
385392
TargetAttributes = {
386393
2BE487EB28245162003F3F64 = {
387394
CreatedOnToolsVersion = 13.3.1;
@@ -425,6 +432,8 @@
425432
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
426433
6CF368562DBBD274006A77FD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
427434
30ED7B722DD299E600ACC922 /* XCRemoteSwiftPackageReference "ZIPFoundation" */,
435+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */,
436+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */,
428437
);
429438
preferredProjectObjectVersion = 55;
430439
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -671,6 +680,7 @@
671680
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
672681
PRODUCT_NAME = "$(TARGET_NAME)";
673682
PROVISIONING_PROFILE_SPECIFIER = "";
683+
REGISTER_APP_GROUPS = YES;
674684
RUN_DOCUMENTATION_COMPILER = NO;
675685
SWIFT_EMIT_LOC_STRINGS = YES;
676686
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -762,6 +772,7 @@
762772
MARKETING_VERSION = 1.0;
763773
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
764774
PRODUCT_NAME = "$(TARGET_NAME)";
775+
REGISTER_APP_GROUPS = YES;
765776
SKIP_INSTALL = YES;
766777
SWIFT_EMIT_LOC_STRINGS = YES;
767778
SWIFT_VERSION = 5.0;
@@ -866,6 +877,7 @@
866877
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
867878
PRODUCT_NAME = "$(TARGET_NAME)";
868879
PROVISIONING_PROFILE_SPECIFIER = "";
880+
REGISTER_APP_GROUPS = YES;
869881
RUN_DOCUMENTATION_COMPILER = NO;
870882
SWIFT_EMIT_LOC_STRINGS = YES;
871883
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -957,6 +969,7 @@
957969
MARKETING_VERSION = 1.0;
958970
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
959971
PRODUCT_NAME = "$(TARGET_NAME)";
972+
REGISTER_APP_GROUPS = YES;
960973
SKIP_INSTALL = YES;
961974
SWIFT_EMIT_LOC_STRINGS = YES;
962975
SWIFT_VERSION = 5.0;
@@ -991,6 +1004,7 @@
9911004
MARKETING_VERSION = 1.0;
9921005
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
9931006
PRODUCT_NAME = "$(TARGET_NAME)";
1007+
REGISTER_APP_GROUPS = YES;
9941008
SKIP_INSTALL = YES;
9951009
SWIFT_EMIT_LOC_STRINGS = YES;
9961010
SWIFT_VERSION = 5.0;
@@ -1025,6 +1039,7 @@
10251039
MARKETING_VERSION = 1.0;
10261040
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
10271041
PRODUCT_NAME = "$(TARGET_NAME)";
1042+
REGISTER_APP_GROUPS = YES;
10281043
SKIP_INSTALL = YES;
10291044
SWIFT_EMIT_LOC_STRINGS = YES;
10301045
SWIFT_VERSION = 5.0;
@@ -1131,6 +1146,7 @@
11311146
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
11321147
PRODUCT_NAME = "$(TARGET_NAME)";
11331148
PROVISIONING_PROFILE_SPECIFIER = "";
1149+
REGISTER_APP_GROUPS = YES;
11341150
RUN_DOCUMENTATION_COMPILER = NO;
11351151
SWIFT_EMIT_LOC_STRINGS = YES;
11361152
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1222,6 +1238,7 @@
12221238
MARKETING_VERSION = 1.0;
12231239
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit.OpenWithCodeEdit;
12241240
PRODUCT_NAME = "$(TARGET_NAME)";
1241+
REGISTER_APP_GROUPS = YES;
12251242
SKIP_INSTALL = YES;
12261243
SWIFT_EMIT_LOC_STRINGS = YES;
12271244
SWIFT_VERSION = 5.0;
@@ -1397,6 +1414,7 @@
13971414
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
13981415
PRODUCT_NAME = "$(TARGET_NAME)";
13991416
PROVISIONING_PROFILE_SPECIFIER = "";
1417+
REGISTER_APP_GROUPS = YES;
14001418
RUN_DOCUMENTATION_COMPILER = NO;
14011419
SWIFT_EMIT_LOC_STRINGS = YES;
14021420
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1437,6 +1455,7 @@
14371455
PRODUCT_BUNDLE_IDENTIFIER = app.codeedit.CodeEdit;
14381456
PRODUCT_NAME = "$(TARGET_NAME)";
14391457
PROVISIONING_PROFILE_SPECIFIER = "";
1458+
REGISTER_APP_GROUPS = YES;
14401459
RUN_DOCUMENTATION_COMPILER = NO;
14411460
SWIFT_EMIT_LOC_STRINGS = YES;
14421461
SWIFT_OBJC_BRIDGING_HEADER = "";
@@ -1627,7 +1646,7 @@
16271646
repositoryURL = "https://github.com/CodeEditApp/CodeEditSymbols";
16281647
requirement = {
16291648
kind = exactVersion;
1630-
version = 0.2.2;
1649+
version = 0.2.3;
16311650
};
16321651
};
16331652
287136B1292A407E00E9F5F4 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */ = {
@@ -1702,6 +1721,22 @@
17021721
version = 2.3.0;
17031722
};
17041723
};
1724+
5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */ = {
1725+
isa = XCRemoteSwiftPackageReference;
1726+
repositoryURL = "https://github.com/CodeEditApp/AboutWindow";
1727+
requirement = {
1728+
kind = upToNextMajorVersion;
1729+
minimumVersion = 1.0.0;
1730+
};
1731+
};
1732+
5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */ = {
1733+
isa = XCRemoteSwiftPackageReference;
1734+
repositoryURL = "https://github.com/CodeEditApp/WelcomeWindow";
1735+
requirement = {
1736+
kind = upToNextMajorVersion;
1737+
minimumVersion = 1.0.0;
1738+
};
1739+
};
17051740
6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */ = {
17061741
isa = XCRemoteSwiftPackageReference;
17071742
repositoryURL = "https://github.com/Wouter01/LogStream";
@@ -1778,8 +1813,8 @@
17781813
isa = XCRemoteSwiftPackageReference;
17791814
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
17801815
requirement = {
1781-
kind = upToNextMajorVersion;
1782-
minimumVersion = 0.12.0;
1816+
kind = exactVersion;
1817+
version = 0.13.2;
17831818
};
17841819
};
17851820
/* End XCRemoteSwiftPackageReference section */
@@ -1815,6 +1850,16 @@
18151850
package = 58F2EB1C292FB954004A9BDE /* XCRemoteSwiftPackageReference "Sparkle" */;
18161851
productName = Sparkle;
18171852
};
1853+
5E4485602DF600D9008BBE69 /* AboutWindow */ = {
1854+
isa = XCSwiftPackageProductDependency;
1855+
package = 5E44855F2DF600D9008BBE69 /* XCRemoteSwiftPackageReference "AboutWindow" */;
1856+
productName = AboutWindow;
1857+
};
1858+
5EACE6212DF4BF08005E08B8 /* WelcomeWindow */ = {
1859+
isa = XCSwiftPackageProductDependency;
1860+
package = 5EACE6202DF4BF08005E08B8 /* XCRemoteSwiftPackageReference "WelcomeWindow" */;
1861+
productName = WelcomeWindow;
1862+
};
18181863
6C0617D52BDB4432008C9C42 /* LogStream */ = {
18191864
isa = XCSwiftPackageProductDependency;
18201865
package = 6C0617D42BDB4432008C9C42 /* XCRemoteSwiftPackageReference "LogStream" */;

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 27 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeEdit.xcodeproj/xcshareddata/xcschemes/CodeEdit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1620"
3+
LastUpgradeVersion = "1640"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CodeEdit/CodeEditApp.swift‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77

88
import SwiftUI
9+
import WelcomeWindow
10+
import AboutWindow
911

1012
@main
1113
struct CodeEditApp: App {
@@ -27,11 +29,32 @@ struct CodeEditApp: App {
2729

2830
var body: some Scene {
2931
Group {
30-
WelcomeWindow()
32+
WelcomeWindow(
33+
subtitleView: { WelcomeSubtitleView() },
34+
actions: { dismissWindow in
35+
NewFileButton(dismissWindow: dismissWindow)
36+
GitCloneButton(dismissWindow: dismissWindow)
37+
OpenFileOrFolderButton(dismissWindow: dismissWindow)
38+
},
39+
onDrop: { url, dismissWindow in
40+
Task { CodeEditDocumentController.shared.openDocument(at: url, onCompletion: { dismissWindow() }) }
41+
}
42+
)
3143

3244
ExtensionManagerWindow()
3345

34-
AboutWindow()
46+
AboutWindow(
47+
subtitleView: { AboutSubtitleView() },
48+
actions: {
49+
AboutButton(title: "Contributors", destination: {
50+
ContributorsView()
51+
})
52+
AboutButton(title: "Acknowledgements", destination: {
53+
AcknowledgementsView()
54+
})
55+
},
56+
footer: { AboutFooterView() }
57+
)
3558

3659
SettingsWindow()
3760
.commands {

0 commit comments

Comments
 (0)