Squashed commit of the following:

commit 38b6b6f9c9f84d3ed00a2ef1e3d49d07096b398b
Author: Amy <[email protected]>
Date:   Mon Jun 24 05:23:29 2024 -0400

    update themes

    delete old, add neutral, default to neutral

commit 2d8bda1132da77ef69bf980ce95603913bc09d83
Author: Amy <[email protected]>
Date:   Mon Jun 24 04:34:50 2024 -0400

    don't assume stable document order

    im sure this was fine but it wasn't actually guaranteed

commit 59ac3f934ebad0b4d8d5b93128d410ab9037df20
Author: Amy <[email protected]>
Date:   Mon Jun 24 04:30:27 2024 -0400

    simplify transient documents

    revert most of previous commit because im dumb and there's a much easier way to do this

commit 4c985ab9b19853b0d6f4a017b47e61d6a9263286
Author: Amy <[email protected]>
Date:   Mon Jun 24 04:20:58 2024 -0400

    add transient document logic

commit 2f271f63ca6c7ed9b7c55c7ccc57f27edf25bcd0
Author: Amy <[email protected]>
Date:   Mon Jun 24 04:19:50 2024 -0400

    simplify sticky header hack

    we can directly hook the container rather than traversing to it from the subview

commit 09f3c851d43a6560faf6c5d0d28d1799e23e197f
Author: Amy <[email protected]>
Date:   Mon Jun 24 04:19:19 2024 -0400

    squish ThemeMapping into Settings

    no reason to have a distinct class. also, guess what, tweak the colors

Author: asentientbot

Delegate.m

@@ -44,9 +44,9 @@ -(void)addSeparatorTo:(NSMenu*)menu
 -(void)applicationWillFinishLaunching:(NSNotification*)note
 {
 	BOOL firstRun=![NSUserDefaults.standardUserDefaults boolForKey:@"launched"];
-	[NSUserDefaults.standardUserDefaults setBool:true forKey:@"launched"];
 	if(firstRun)
 	{
+		[NSUserDefaults.standardUserDefaults setBool:true forKey:@"launched"];
 		Settings.reset;
 	}
 

Document.m

@@ -1,7 +1,31 @@
 @implementation Document
 
++(void)closeTransientIfNeeded
+{
+	NSArray<Document*>* documents=NSDocumentController.sharedDocumentController.documents;
+	if(documents.count!=2)
+	{
+		return;
+	}
+	
+	for(Document* document in documents)
+	{
+		if(document.fileURL||document.documentEdited)
+		{
+			continue;
+		}
+		
+		[document.windowControllers.firstObject.window performClose:nil];
+	}
+}
+
 -(void)makeWindowControllers
 {
+	if(self.fileURL)
+	{
+		Document.closeTransientIfNeeded;
+	}
+	
 	[self addWindowController:WindowController.alloc.init.autorelease];
 	[self loadWithURL:self.fileURL type:self.fileType];
 }
@@ -42,7 +66,6 @@ -(BOOL)writeSafelyToURL:(NSURL*)url ofType:(NSString*)type forSaveOperation:(NSS
 	if(!self.fileURL)
 	{
 		// TODO: a tiny bit weird. maybe we can skip this by moving a bit "later" in the save process.
-		// also, we should be able to do TextEdit-style "transient" untitled documents now
 
 		NSString* newType=[NSDocumentController.sharedDocumentController typeForContentsOfURL:url error:nil];
 		[self loadWithURL:url type:newType];

Settings.m

@@ -68,6 +68,12 @@ +(void)setCurrentThemeName:(NSString*)name
 		}
 	}
 
+	if(!matched)
+	{
+		alert(@"theme missing");
+		return;
+	}
+	
 	setXcodeTheme(matched);
 }
 
@@ -100,40 +106,96 @@ +(CGRect)projectRect
 	return [Settings rectWithPrefix:@"project"];
 }
 
-+(NSString*)themeNameWithSuffix:(NSString*)suffix
++(void)saveThemeWithName:(NSString*)name backgroundColor:(NSString*)backgroundColor highlightColor:(NSString*)highlightColor selectionColor:(NSString*)selectionColor defaultFont:(NSString*)defaultFont defaultColor:(NSString*)defaultColor commentFont:(NSString*)commentFont commentColor:(NSString*)commentColor preprocessorFont:(NSString*)preprocessorFont preprocessorColor:(NSString*)preprocessorColor classFont:(NSString*)classFont classColor:(NSString*)classColor functionFont:(NSString*)functionFont functionColor:(NSString*)functionColor keywordFont:(NSString*)keywordFont keywordColor:(NSString*)keywordColor stringFont:(NSString*)stringFont stringColor:(NSString*)stringColor numberFont:(NSString*)numberFont numberColor:(NSString*)numberColor
+{
+	NSString* basePath=[getXcodeSystemThemesPath() stringByAppendingPathComponent:@"Default (Light).xccolortheme"];
+	NSData* baseData=[NSData dataWithContentsOfFile:basePath];
+	if(!baseData)
+	{
+		alertAbort(@"base theme missing");
+	}
+	
+	NSMutableDictionary* custom=[NSPropertyListSerialization propertyListWithData:baseData options:NSPropertyListMutableContainers format:nil error:nil];
+	if(!custom)
+	{
+		alertAbort(@"base theme broken");
+	}
+	
+	custom[XcodeThemeBackgroundKey]=backgroundColor;
+	custom[XcodeThemeHighlightKey]=highlightColor;
+	custom[XcodeThemeSelectionKey]=selectionColor;
+	custom[XcodeThemeCursorKey]=defaultColor;
+	custom[XcodeThemeInvisiblesKey]=commentColor;
+	
+	NSMutableDictionary* innerFonts=custom[XcodeThemeFontsKey];
+	NSMutableDictionary* innerColors=custom[XcodeThemeColorsKey];
+	for(NSString* key in innerColors.allKeys)
+	{
+		NSString* font=defaultFont;
+		NSString* color=defaultColor;
+		
+		if([XcodeThemeCommentKeys containsObject:key])
+		{
+			font=commentFont;
+			color=commentColor;
+		}
+		else if([XcodeThemePreprocessorKeys containsObject:key])
+		{
+			font=preprocessorFont;
+			color=preprocessorColor;
+		}
+		else if([XcodeThemeClassKeys containsObject:key])
+		{
+			font=classFont;
+			color=classColor;
+		}
+		else if([XcodeThemeFunctionKeys containsObject:key])
+		{
+			font=functionFont;
+			color=functionColor;
+		}
+		else if([XcodeThemeKeywordKeys containsObject:key])
+		{
+			font=keywordFont;
+			color=keywordColor;
+		}
+		else if([XcodeThemeStringKeys containsObject:key])
+		{
+			font=stringFont;
+			color=stringColor;
+		}
+		else if([XcodeThemeNumberKeys containsObject:key])
+		{
+			font=numberFont;
+			color=numberColor;
+		}
+		
+		innerFonts[key]=font;
+		innerColors[key]=[color stringByAppendingString:@" 1"];
+	}
+	
+	NSString* customPath=[getXcodeUserThemesPath() stringByAppendingPathComponent:[name stringByAppendingString:@".xccolortheme"]];
+	[NSFileManager.defaultManager createDirectoryAtPath:customPath.stringByDeletingLastPathComponent withIntermediateDirectories:true attributes:nil error:nil];
+	
+	NSData* customData=[NSPropertyListSerialization dataWithPropertyList:custom format:NSPropertyListXMLFormat_v1_0 options:0 error:nil];
+	if(![customData writeToFile:customPath atomically:true])
+	{
+		alertAbort(@"theme write failed");
+	}
+}
+
++(NSString*)simpleThemeNameWithSuffix:(NSString*)suffix
 {
 	return [NSString stringWithFormat:@"%@ %@",getAppName(),suffix];
 }
 
-+(void)saveThemeWithSuffix:(NSString*)suffix background:(NSString*)backgroundColor highlight:(NSString*)highlightColor selection:(NSString*)selectionColor normal:(NSString*)normalColor meta:(NSString*)metaColor type:(NSString*)typeColor keyword:(NSString*)keywordColor string:(NSString*)stringColor number:(NSString*)numberColor
++(void)saveSimpleThemeWithSuffix:(NSString*)suffix background:(NSString*)backgroundColor highlight:(NSString*)highlightColor selection:(NSString*)selectionColor normal:(NSString*)normalColor meta:(NSString*)metaColor type:(NSString*)typeColor keyword:(NSString*)keywordColor string:(NSString*)stringColor number:(NSString*)numberColor
 {
-	ThemeMapping* theme=ThemeMapping.alloc.init.autorelease;
-	
 	NSString* regular=@"SFMono-Regular - 13.0";
 	NSString* italic=@"SFMono-RegularItalic - 13.0";
 	NSString* bold=@"SFMono-Bold - 13.0";
 
-	theme.defaultFont=regular;
-	theme.defaultColor=normalColor;
-	theme.backgroundColor=backgroundColor;
-	theme.highlightColor=highlightColor;
-	theme.selectionColor=selectionColor;
-	theme.commentFont=italic;
-	theme.commentColor=metaColor;
-	theme.preprocessorFont=regular;
-	theme.preprocessorColor=metaColor;
-	theme.classFont=bold;
-	theme.classColor=typeColor;
-	theme.functionFont=regular;
-	theme.functionColor=typeColor;
-	theme.keywordFont=bold;
-	theme.keywordColor=keywordColor;
-	theme.stringFont=bold;
-	theme.stringColor=stringColor;
-	theme.numberFont=bold;
-	theme.numberColor=numberColor;
-	
-	[theme saveWithName:[Settings themeNameWithSuffix:suffix]];
+	[Settings saveThemeWithName:[Settings simpleThemeNameWithSuffix:suffix] backgroundColor:backgroundColor highlightColor:highlightColor selectionColor:selectionColor defaultFont:regular defaultColor:normalColor commentFont:italic commentColor:metaColor preprocessorFont:regular preprocessorColor:metaColor classFont:bold classColor:typeColor functionFont:regular functionColor:typeColor keywordFont:bold keywordColor:keywordColor stringFont:bold stringColor:stringColor numberFont:bold numberColor:numberColor];
 }
 
 +(void)reset
@@ -143,11 +205,13 @@ +(void)reset
 		mapping.reset;
 	}
 
-	[Settings saveThemeWithSuffix:@"Old" background:@"1 0.9 1" highlight:@"1 0.85 1" selection:@"1 0.75 1" normal:@"0.3 0.3 0.6" meta:@"0.6 0.5 0.8" type:@"0 0.5 0.4" keyword:@"0.8 0 1" string:@"0.85 0.5 0.8" number:@"0.3 0.6 1"];
-	[Settings saveThemeWithSuffix:@"Pink (Light)" background:@"1 0.75 1" highlight:@"1 0.7 1" selection:@"1 0.6 1" normal:@"0.3 0.2 0.5" meta:@"0.5 0.4 0.7" type:@"0.6 0.2 0.8" keyword:@"0.7 0.2 0.6" string:@"0.8 0.4 0.8" number:@"0.5 0.3 0.9"];
-	[Settings saveThemeWithSuffix:@"Pink (Dark)" background:@"0.1 0 0.1" highlight:@"0.15 0 0.15" selection:@"0.25 0 0.25" normal:@"0.5 0.4 0.5" meta:@"0.3 0.2 0.3" type:@"0.5 0.2 0.6" keyword:@"0.5 0.1 0.3" string:@"0.5 0.2 0.4" number:@"0.3 0.2 0.5"];
+	[Settings saveSimpleThemeWithSuffix:@"Pink (Light)" background:@"1 0.75 1" highlight:@"1 0.7 1" selection:@"1 0.6 1" normal:@"0.3 0.2 0.5" meta:@"0.5 0.4 0.7" type:@"0.6 0.2 0.8" keyword:@"0.7 0.2 0.5" string:@"0.8 0.4 0.8" number:@"0.5 0.4 0.9"];
+	[Settings saveSimpleThemeWithSuffix:@"Pink (Dark)" background:@"0.15 0 0.15" highlight:@"0.2 0 0.2" selection:@"0.3 0 0.3" normal:@"0.5 0.4 0.6" meta:@"0.3 0.2 0.4" type:@"0.5 0.2 0.7" keyword:@"0.5 0.1 0.3" string:@"0.5 0.2 0.5" number:@"0.3 0.2 0.7"];
+	
+	[Settings saveSimpleThemeWithSuffix:@"Neutral (Light)" background:@"1 1 1" highlight:@"0.95 0.95 1" selection:@"0.8 0.8 1" normal:@"0.3 0.3 0.6" meta:@"0.5 0.5 0.8" type:@"0.6 0.1 1" keyword:@"0.8 0.2 0.4" string:@"0.9 0.4 0.9" number:@"0.2 0.5 1"];
+	[Settings saveSimpleThemeWithSuffix:@"Neutral (Dark)" background:@"0.1 0.1 0.1" highlight:@"0.13 0.13 0.16" selection:@"0.25 0.25 0.4" normal:@"0.5 0.5 0.7" meta:@"0.3 0.3 0.5" type:@"0.5 0.3 0.7" keyword:@"0.6 0.2 0.3" string:@"0.6 0.3 0.6" number:@"0.2 0.3 0.6"];
 
-	[Settings setCurrentThemeName:[Settings themeNameWithSuffix:@"Pink (Light)"]];
+	[Settings setCurrentThemeName:[Settings simpleThemeNameWithSuffix:@"Neutral (Light)"]];
 }
 
 @end

ThemeMapping.h

@@ -35,9 +35,8 @@ void hackFakeHeaderLayout(NSView* self,SEL sel)
 {
 	hackRealHeaderLayout(self,sel);
 
-	NSView* container=self.superview.superview;
-	container.subviews[0].hidden=true;
-	container.layer.backgroundColor=getXcodeTheme().sourceTextBackgroundColor.CGColor;
+	self.subviews.firstObject.hidden=true;
+	self.layer.backgroundColor=getXcodeTheme().sourceTextBackgroundColor.CGColor;
 }
 
 @implementation WindowController
@@ -52,9 +51,9 @@ +(void)initialize
 
 	// TODO: uhh
 
-	if(NSClassFromString(@"_TtC12SourceEditor16StickyHeaderView"))
+	if(NSClassFromString(@"_TtC12SourceEditor21StickyHeaderStackView"))
 	{
-		swizzle(@"_TtC12SourceEditor16StickyHeaderView",@"layout",true,(IMP)hackFakeHeaderLayout,(IMP*)&hackRealHeaderLayout);
+		swizzle(@"_TtC12SourceEditor21StickyHeaderStackView",@"layout",true,(IMP)hackFakeHeaderLayout,(IMP*)&hackRealHeaderLayout);
 
 		swizzle(@"NSColor",@"shadowWithLevel:",true,(IMP)hackFakeShadow,NULL);
 		swizzle(@"NSColor",@"highlightWithLevel:",true,(IMP)hackFakeShadow,NULL);

ThemeMapping.m

@@ -8,14 +8,12 @@
 #import "Xcode.m"
 
 #import "SettingsMapping.h"
-#import "ThemeMapping.h"
 #import "Settings.h"
 #import "Document.h"
 #import "WindowController.h"
 #import "Delegate.h"
 
 #import "SettingsMapping.m"
-#import "ThemeMapping.m"
 #import "Settings.m"
 #import "Document.m"
 #import "WindowController.m"