Skip to content

Commit 2ea7da6

Browse files
committed
Fix parsing when no current context set
Signed-off-by: Hasan Turken <[email protected]>
1 parent b41205e commit 2ea7da6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

KubeContext/Config.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct Config: Codable {
1313
var APIVersion: String?
1414
var Clusters: [ClusterElement]
1515
var Contexts: [ContextElement]
16-
var CurrentContext: String
16+
var CurrentContext: String?
1717
var Extensions: [String:String]?
1818
var Kind: String?
1919
var Preferences: Preferences?

KubeContext/Kubernetes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let contextChangedCallback: (EonilFSEventsEvent) -> () = {_ in
2828
}
2929

3030
func showContextName() throws {
31-
let currContext: String = try (k8s.getConfig()?.CurrentContext)!
31+
let currContext: String = try (k8s.getConfig()?.CurrentContext) ?? ""
3232
if k8s.shouldShowContextName {
3333
statusBarButton.title = currContext.truncated(limit: 20, position: String.TruncationPosition.middle, leader: "...")
3434
} else {

KubeContext/MenuManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class MenuManager: NSObject, NSMenuDelegate {
145145

146146
let currentContextTextItem = NSMenuItem(title: "", action: #selector(logClick(_:)), keyEquivalent: "")
147147
currentContextTextItem.target = self
148-
let currentContextText = NSAttributedString.init(string: currentContext.wrap(limit: 32), attributes: [NSAttributedString.Key.paragraphStyle: centerParagraphStyle])
148+
let currentContextText = NSAttributedString.init(string: currentContext?.wrap(limit: 32) ?? "", attributes: [NSAttributedString.Key.paragraphStyle: centerParagraphStyle])
149149
currentContextTextItem.attributedTitle = currentContextText
150150
menu.addItem(currentContextTextItem)
151151

0 commit comments

Comments
 (0)