Skip to content

Commit 539d9d3

Browse files
lukepistrollukepistrol
committed
Merge branch 'main' into fix/hover-welcome-window-glitch
2 parents 707052d + 51afc73 commit 539d9d3

9 files changed

Lines changed: 42 additions & 25 deletions

File tree

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,15 @@
491491
"code",
492492
"bug"
493493
]
494+
},
495+
{
496+
"login": "neilZon",
497+
"name": "Neilzon Viloria",
498+
"avatar_url": "https://avatars.githubusercontent.com/u/46465568?v=4",
499+
"profile": "https://github.com/neilZon",
500+
"contributions": [
501+
"bug"
502+
]
494503
}
495504
],
496505
"contributorsPerLine": 7,

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2890,7 +2890,7 @@
28902890
CLANG_WARN_UNREACHABLE_CODE = YES;
28912891
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
28922892
COPY_PHASE_STRIP = NO;
2893-
CURRENT_PROJECT_VERSION = 17;
2893+
CURRENT_PROJECT_VERSION = 18;
28942894
DEAD_CODE_STRIPPING = YES;
28952895
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
28962896
ENABLE_NS_ASSERTIONS = NO;
@@ -2959,7 +2959,7 @@
29592959
BUNDLE_LOADER = "$(TEST_HOST)";
29602960
CODE_SIGN_STYLE = Automatic;
29612961
COMBINE_HIDPI_IMAGES = YES;
2962-
CURRENT_PROJECT_VERSION = 17;
2962+
CURRENT_PROJECT_VERSION = 18;
29632963
DEAD_CODE_STRIPPING = YES;
29642964
DEVELOPMENT_TEAM = "";
29652965
GENERATE_INFOPLIST_FILE = YES;
@@ -2986,7 +2986,7 @@
29862986
CLANG_ENABLE_MODULES = YES;
29872987
CODE_SIGN_STYLE = Automatic;
29882988
COMBINE_HIDPI_IMAGES = YES;
2989-
CURRENT_PROJECT_VERSION = 17;
2989+
CURRENT_PROJECT_VERSION = 18;
29902990
DEAD_CODE_STRIPPING = YES;
29912991
DEVELOPMENT_TEAM = "";
29922992
GENERATE_INFOPLIST_FILE = YES;
@@ -3015,7 +3015,7 @@
30153015
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
30163016
CODE_SIGN_STYLE = Automatic;
30173017
COMBINE_HIDPI_IMAGES = YES;
3018-
CURRENT_PROJECT_VERSION = 17;
3018+
CURRENT_PROJECT_VERSION = 18;
30193019
DEAD_CODE_STRIPPING = YES;
30203020
DEVELOPMENT_TEAM = "";
30213021
ENABLE_HARDENED_RUNTIME = YES;
@@ -3075,7 +3075,7 @@
30753075
CLANG_WARN_UNREACHABLE_CODE = YES;
30763076
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
30773077
COPY_PHASE_STRIP = NO;
3078-
CURRENT_PROJECT_VERSION = 17;
3078+
CURRENT_PROJECT_VERSION = 18;
30793079
DEAD_CODE_STRIPPING = YES;
30803080
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
30813081
ENABLE_NS_ASSERTIONS = NO;
@@ -3144,7 +3144,7 @@
31443144
BUNDLE_LOADER = "$(TEST_HOST)";
31453145
CODE_SIGN_STYLE = Automatic;
31463146
COMBINE_HIDPI_IMAGES = YES;
3147-
CURRENT_PROJECT_VERSION = 17;
3147+
CURRENT_PROJECT_VERSION = 18;
31483148
DEAD_CODE_STRIPPING = YES;
31493149
DEVELOPMENT_TEAM = "";
31503150
GENERATE_INFOPLIST_FILE = YES;
@@ -3171,7 +3171,7 @@
31713171
CLANG_ENABLE_MODULES = YES;
31723172
CODE_SIGN_STYLE = Automatic;
31733173
COMBINE_HIDPI_IMAGES = YES;
3174-
CURRENT_PROJECT_VERSION = 17;
3174+
CURRENT_PROJECT_VERSION = 18;
31753175
DEAD_CODE_STRIPPING = YES;
31763176
DEVELOPMENT_TEAM = "";
31773177
GENERATE_INFOPLIST_FILE = YES;
@@ -3200,7 +3200,7 @@
32003200
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
32013201
CODE_SIGN_STYLE = Automatic;
32023202
COMBINE_HIDPI_IMAGES = YES;
3203-
CURRENT_PROJECT_VERSION = 17;
3203+
CURRENT_PROJECT_VERSION = 18;
32043204
DEAD_CODE_STRIPPING = YES;
32053205
DEVELOPMENT_TEAM = "";
32063206
ENABLE_HARDENED_RUNTIME = YES;
@@ -3233,7 +3233,7 @@
32333233
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
32343234
CODE_SIGN_STYLE = Automatic;
32353235
COMBINE_HIDPI_IMAGES = YES;
3236-
CURRENT_PROJECT_VERSION = 17;
3236+
CURRENT_PROJECT_VERSION = 18;
32373237
DEAD_CODE_STRIPPING = YES;
32383238
DEVELOPMENT_TEAM = "";
32393239
ENABLE_HARDENED_RUNTIME = YES;
@@ -3266,7 +3266,7 @@
32663266
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
32673267
CODE_SIGN_STYLE = Automatic;
32683268
COMBINE_HIDPI_IMAGES = YES;
3269-
CURRENT_PROJECT_VERSION = 17;
3269+
CURRENT_PROJECT_VERSION = 18;
32703270
DEAD_CODE_STRIPPING = YES;
32713271
DEVELOPMENT_TEAM = "";
32723272
ENABLE_HARDENED_RUNTIME = YES;
@@ -3326,7 +3326,7 @@
33263326
CLANG_WARN_UNREACHABLE_CODE = YES;
33273327
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
33283328
COPY_PHASE_STRIP = NO;
3329-
CURRENT_PROJECT_VERSION = 17;
3329+
CURRENT_PROJECT_VERSION = 18;
33303330
DEAD_CODE_STRIPPING = YES;
33313331
DEBUG_INFORMATION_FORMAT = dwarf;
33323332
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3394,7 +3394,7 @@
33943394
CLANG_WARN_UNREACHABLE_CODE = YES;
33953395
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
33963396
COPY_PHASE_STRIP = NO;
3397-
CURRENT_PROJECT_VERSION = 17;
3397+
CURRENT_PROJECT_VERSION = 18;
33983398
DEAD_CODE_STRIPPING = YES;
33993399
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
34003400
ENABLE_NS_ASSERTIONS = NO;
@@ -3497,7 +3497,7 @@
34973497
BUNDLE_LOADER = "$(TEST_HOST)";
34983498
CODE_SIGN_STYLE = Automatic;
34993499
COMBINE_HIDPI_IMAGES = YES;
3500-
CURRENT_PROJECT_VERSION = 17;
3500+
CURRENT_PROJECT_VERSION = 18;
35013501
DEAD_CODE_STRIPPING = YES;
35023502
DEVELOPMENT_TEAM = "";
35033503
GENERATE_INFOPLIST_FILE = YES;
@@ -3524,7 +3524,7 @@
35243524
BUNDLE_LOADER = "$(TEST_HOST)";
35253525
CODE_SIGN_STYLE = Automatic;
35263526
COMBINE_HIDPI_IMAGES = YES;
3527-
CURRENT_PROJECT_VERSION = 17;
3527+
CURRENT_PROJECT_VERSION = 18;
35283528
DEAD_CODE_STRIPPING = YES;
35293529
DEVELOPMENT_TEAM = "";
35303530
GENERATE_INFOPLIST_FILE = YES;
@@ -3551,7 +3551,7 @@
35513551
CLANG_ENABLE_MODULES = YES;
35523552
CODE_SIGN_STYLE = Automatic;
35533553
COMBINE_HIDPI_IMAGES = YES;
3554-
CURRENT_PROJECT_VERSION = 17;
3554+
CURRENT_PROJECT_VERSION = 18;
35553555
DEAD_CODE_STRIPPING = YES;
35563556
DEVELOPMENT_TEAM = "";
35573557
GENERATE_INFOPLIST_FILE = YES;
@@ -3580,7 +3580,7 @@
35803580
CLANG_ENABLE_MODULES = YES;
35813581
CODE_SIGN_STYLE = Automatic;
35823582
COMBINE_HIDPI_IMAGES = YES;
3583-
CURRENT_PROJECT_VERSION = 17;
3583+
CURRENT_PROJECT_VERSION = 18;
35843584
DEAD_CODE_STRIPPING = YES;
35853585
DEVELOPMENT_TEAM = "";
35863586
GENERATE_INFOPLIST_FILE = YES;

‎CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/AccountSelectionDialog.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ struct AccountSelectionDialog: View {
4343
openAccountDialog.toggle()
4444
}
4545
Button("Continue") {
46-
openAccountDialog.toggle()
4746
openGitLogin.toggle()
4847
}
4948
.sheet(isPresented: $openGitLogin, content: {
@@ -65,13 +64,13 @@ struct AccountSelectionDialog: View {
6564
case "bitbucketServer":
6665
implementationNeeded
6766
case "github":
68-
GitHubLoginView(dismissDialog: $openGitLogin)
67+
GitHubLoginView(dismissDialog: $openGitLogin, dismissParentDialog: $openAccountDialog)
6968
case "githubEnterprise":
70-
GitHubEnterpriseLoginView(dismissDialog: $openGitLogin)
69+
GitHubEnterpriseLoginView(dismissDialog: $openGitLogin, dismissParentDialog: $openAccountDialog)
7170
case "gitlab":
72-
GitLabLoginView(dismissDialog: $openGitLogin)
71+
GitLabLoginView(dismissDialog: $openGitLogin, dismissParentDialog: $openAccountDialog)
7372
case "gitlabSelfHosted":
74-
GitLabHostedLoginView(dismissDialog: $openGitLogin)
73+
GitLabHostedLoginView(dismissDialog: $openGitLogin, dismissParentDialog: $openAccountDialog)
7574
default:
7675
implementationNeeded
7776
}

‎CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Github/GitHubEnterpriseLoginView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ struct GitHubEnterpriseLoginView: View {
1616
@Environment(\.openURL) var createToken
1717

1818
@Binding var dismissDialog: Bool
19+
@Binding var dismissParentDialog: Bool
1920

2021
@StateObject
2122
private var prefs: AppPreferencesModel = .shared
@@ -103,6 +104,7 @@ struct GitHubEnterpriseLoginView: View {
103104
)
104105
keychain.set(accountToken, forKey: "github_\(accountName)_enterprise")
105106
dismissDialog = false
107+
dismissParentDialog = false
106108
}
107109
case .failure(let error):
108110
print(error)

‎CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Github/GitHubLoginView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct GitHubLoginView: View {
1717
private let keychain = CodeEditKeychain()
1818

1919
@Binding var dismissDialog: Bool
20+
@Binding var dismissParentDialog: Bool
2021

2122
@StateObject
2223
private var prefs: AppPreferencesModel = .shared
@@ -126,6 +127,7 @@ struct GitHubLoginView: View {
126127
)
127128
keychain.set(accountToken, forKey: "github_\(accountName)")
128129
dismissDialog.toggle()
130+
dismissParentDialog.toggle()
129131
}
130132
case .failure(let error):
131133
print(error)

‎CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitLabHostedLoginView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ struct GitLabHostedLoginView: View {
1515
@Environment(\.openURL) var createToken
1616

1717
@Binding var dismissDialog: Bool
18+
@Binding var dismissParentDialog: Bool
1819

1920
@StateObject
2021
private var prefs: AppPreferencesModel = .shared
@@ -99,6 +100,7 @@ struct GitLabHostedLoginView: View {
99100
)
100101
keychain.set(accountToken, forKey: "gitlab_\(gitAccountName)_hosted")
101102
dismissDialog = false
103+
dismissParentDialog = false
102104
}
103105
case .failure(let error):
104106
print(error)

‎CodeEdit/Features/AppPreferences/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitLabLoginView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct GitLabLoginView: View {
1717
private let keychain = CodeEditKeychain()
1818

1919
@Binding var dismissDialog: Bool
20+
@Binding var dismissParentDialog: Bool
2021

2122
@StateObject
2223
private var prefs: AppPreferencesModel = .shared
@@ -94,6 +95,7 @@ struct GitLabLoginView: View {
9495
)
9596
keychain.set(accountToken, forKey: "gitlab_\(accountName)")
9697
dismissDialog = false
98+
dismissParentDialog = false
9799
}
98100
case .failure(let error):
99101
print(error)

‎CodeEdit/Features/Documents/Controllers/CodeEditSplitViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ final class CodeEditSplitViewController: NSSplitViewController {
3939
fatalError("init(coder:) has not been implemented")
4040
}
4141

42-
override func viewWillAppear() {
43-
super.viewWillAppear()
44-
splitView.setPosition(.snapWidth, ofDividerAt: .zero)
45-
}
42+
// TODO: Set user preferences width if it is not the snap width
43+
// override func viewWillAppear() {
44+
// super.viewWillAppear()
45+
// }
4646

4747
// MARK: - NSSplitViewDelegate
4848

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ Be part of the next revolution in code editing by contributing to the project. T
142142
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bombardier200"><img src="https://avatars.githubusercontent.com/u/25121427?v=4?s=100" width="100px;" alt="bombardier200"/><br /><sub><b>bombardier200</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=bombardier200" title="Code">💻</a></td>
143143
<td align="center" valign="top" width="14.28%"><a href="https://github.com/yapryntsev"><img src="https://avatars.githubusercontent.com/u/18378212?v=4?s=100" width="100px;" alt="Alex Yapryntsev"/><br /><sub><b>Alex Yapryntsev</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=yapryntsev" title="Code">💻</a></td>
144144
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Code-DJ"><img src="https://avatars.githubusercontent.com/u/8212554?v=4?s=100" width="100px;" alt="Code-DJ"/><br /><sub><b>Code-DJ</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/commits?author=Code-DJ" title="Code">💻</a> <a href="https://github.com/CodeEditApp/CodeEdit/issues?q=author%3ACode-DJ" title="Bug reports">🐛</a></td>
145+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/neilZon"><img src="https://avatars.githubusercontent.com/u/46465568?v=4?s=100" width="100px;" alt="Neilzon Viloria"/><br /><sub><b>Neilzon Viloria</b></sub></a><br /><a href="https://github.com/CodeEditApp/CodeEdit/issues?q=author%3AneilZon" title="Bug reports">🐛</a></td>
145146
</tr>
146147
</tbody>
147148
</table>

0 commit comments

Comments
 (0)