Skip to content

Commit 2dd6b54

Browse files
thecoolwinterthecoolwinter
authored
Merge branch 'main' into lsp-install-ux
2 parents b7cfc9e + bdf21ac commit 2dd6b54

File tree

30 files changed

+270
-163
lines changed

30 files changed

+270
-163
lines changed

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@
629629
CLANG_WARN_UNREACHABLE_CODE = YES;
630630
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
631631
COPY_PHASE_STRIP = NO;
632-
CURRENT_PROJECT_VERSION = 46;
632+
CURRENT_PROJECT_VERSION = 47;
633633
DEAD_CODE_STRIPPING = YES;
634634
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
635635
ENABLE_NS_ASSERTIONS = NO;
@@ -669,7 +669,7 @@
669669
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
670670
CODE_SIGN_STYLE = Automatic;
671671
COMBINE_HIDPI_IMAGES = YES;
672-
CURRENT_PROJECT_VERSION = 46;
672+
CURRENT_PROJECT_VERSION = 47;
673673
DEAD_CODE_STRIPPING = YES;
674674
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
675675
DEVELOPMENT_TEAM = "";
@@ -706,7 +706,7 @@
706706
BUNDLE_LOADER = "$(TEST_HOST)";
707707
CODE_SIGN_STYLE = Automatic;
708708
COMBINE_HIDPI_IMAGES = YES;
709-
CURRENT_PROJECT_VERSION = 46;
709+
CURRENT_PROJECT_VERSION = 47;
710710
DEAD_CODE_STRIPPING = YES;
711711
DEVELOPMENT_TEAM = "";
712712
GENERATE_INFOPLIST_FILE = YES;
@@ -734,7 +734,7 @@
734734
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
735735
CODE_SIGN_STYLE = Automatic;
736736
COMBINE_HIDPI_IMAGES = YES;
737-
CURRENT_PROJECT_VERSION = 46;
737+
CURRENT_PROJECT_VERSION = 47;
738738
DEAD_CODE_STRIPPING = YES;
739739
DEVELOPMENT_TEAM = "";
740740
GENERATE_INFOPLIST_FILE = YES;
@@ -763,7 +763,7 @@
763763
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
764764
CODE_SIGN_STYLE = Automatic;
765765
COMBINE_HIDPI_IMAGES = YES;
766-
CURRENT_PROJECT_VERSION = 46;
766+
CURRENT_PROJECT_VERSION = 47;
767767
DEAD_CODE_STRIPPING = YES;
768768
DEVELOPMENT_TEAM = "";
769769
ENABLE_HARDENED_RUNTIME = YES;
@@ -826,7 +826,7 @@
826826
CLANG_WARN_UNREACHABLE_CODE = YES;
827827
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
828828
COPY_PHASE_STRIP = NO;
829-
CURRENT_PROJECT_VERSION = 46;
829+
CURRENT_PROJECT_VERSION = 47;
830830
DEAD_CODE_STRIPPING = YES;
831831
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
832832
ENABLE_NS_ASSERTIONS = NO;
@@ -866,7 +866,7 @@
866866
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
867867
CODE_SIGN_STYLE = Automatic;
868868
COMBINE_HIDPI_IMAGES = YES;
869-
CURRENT_PROJECT_VERSION = 46;
869+
CURRENT_PROJECT_VERSION = 47;
870870
DEAD_CODE_STRIPPING = YES;
871871
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
872872
DEVELOPMENT_TEAM = "";
@@ -903,7 +903,7 @@
903903
BUNDLE_LOADER = "$(TEST_HOST)";
904904
CODE_SIGN_STYLE = Automatic;
905905
COMBINE_HIDPI_IMAGES = YES;
906-
CURRENT_PROJECT_VERSION = 46;
906+
CURRENT_PROJECT_VERSION = 47;
907907
DEAD_CODE_STRIPPING = YES;
908908
DEVELOPMENT_TEAM = "";
909909
GENERATE_INFOPLIST_FILE = YES;
@@ -931,7 +931,7 @@
931931
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
932932
CODE_SIGN_STYLE = Automatic;
933933
COMBINE_HIDPI_IMAGES = YES;
934-
CURRENT_PROJECT_VERSION = 46;
934+
CURRENT_PROJECT_VERSION = 47;
935935
DEAD_CODE_STRIPPING = YES;
936936
DEVELOPMENT_TEAM = "";
937937
GENERATE_INFOPLIST_FILE = YES;
@@ -960,7 +960,7 @@
960960
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
961961
CODE_SIGN_STYLE = Automatic;
962962
COMBINE_HIDPI_IMAGES = YES;
963-
CURRENT_PROJECT_VERSION = 46;
963+
CURRENT_PROJECT_VERSION = 47;
964964
DEAD_CODE_STRIPPING = YES;
965965
DEVELOPMENT_TEAM = "";
966966
ENABLE_HARDENED_RUNTIME = YES;
@@ -995,7 +995,7 @@
995995
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
996996
CODE_SIGN_STYLE = Automatic;
997997
COMBINE_HIDPI_IMAGES = YES;
998-
CURRENT_PROJECT_VERSION = 46;
998+
CURRENT_PROJECT_VERSION = 47;
999999
DEAD_CODE_STRIPPING = YES;
10001000
DEVELOPMENT_TEAM = "";
10011001
ENABLE_HARDENED_RUNTIME = YES;
@@ -1030,7 +1030,7 @@
10301030
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
10311031
CODE_SIGN_STYLE = Automatic;
10321032
COMBINE_HIDPI_IMAGES = YES;
1033-
CURRENT_PROJECT_VERSION = 46;
1033+
CURRENT_PROJECT_VERSION = 47;
10341034
DEAD_CODE_STRIPPING = YES;
10351035
DEVELOPMENT_TEAM = "";
10361036
ENABLE_HARDENED_RUNTIME = YES;
@@ -1094,7 +1094,7 @@
10941094
CLANG_WARN_UNREACHABLE_CODE = YES;
10951095
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10961096
COPY_PHASE_STRIP = NO;
1097-
CURRENT_PROJECT_VERSION = 46;
1097+
CURRENT_PROJECT_VERSION = 47;
10981098
DEAD_CODE_STRIPPING = YES;
10991099
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11001100
ENABLE_NS_ASSERTIONS = NO;
@@ -1135,7 +1135,7 @@
11351135
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
11361136
CODE_SIGN_STYLE = Automatic;
11371137
COMBINE_HIDPI_IMAGES = YES;
1138-
CURRENT_PROJECT_VERSION = 46;
1138+
CURRENT_PROJECT_VERSION = 47;
11391139
DEAD_CODE_STRIPPING = YES;
11401140
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
11411141
DEVELOPMENT_TEAM = "";
@@ -1172,7 +1172,7 @@
11721172
BUNDLE_LOADER = "$(TEST_HOST)";
11731173
CODE_SIGN_STYLE = Automatic;
11741174
COMBINE_HIDPI_IMAGES = YES;
1175-
CURRENT_PROJECT_VERSION = 46;
1175+
CURRENT_PROJECT_VERSION = 47;
11761176
DEAD_CODE_STRIPPING = YES;
11771177
DEVELOPMENT_TEAM = "";
11781178
GENERATE_INFOPLIST_FILE = YES;
@@ -1200,7 +1200,7 @@
12001200
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12011201
CODE_SIGN_STYLE = Automatic;
12021202
COMBINE_HIDPI_IMAGES = YES;
1203-
CURRENT_PROJECT_VERSION = 46;
1203+
CURRENT_PROJECT_VERSION = 47;
12041204
DEAD_CODE_STRIPPING = YES;
12051205
DEVELOPMENT_TEAM = "";
12061206
GENERATE_INFOPLIST_FILE = YES;
@@ -1229,7 +1229,7 @@
12291229
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
12301230
CODE_SIGN_STYLE = Automatic;
12311231
COMBINE_HIDPI_IMAGES = YES;
1232-
CURRENT_PROJECT_VERSION = 46;
1232+
CURRENT_PROJECT_VERSION = 47;
12331233
DEAD_CODE_STRIPPING = YES;
12341234
DEVELOPMENT_TEAM = "";
12351235
ENABLE_HARDENED_RUNTIME = YES;
@@ -1292,7 +1292,7 @@
12921292
CLANG_WARN_UNREACHABLE_CODE = YES;
12931293
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12941294
COPY_PHASE_STRIP = NO;
1295-
CURRENT_PROJECT_VERSION = 46;
1295+
CURRENT_PROJECT_VERSION = 47;
12961296
DEAD_CODE_STRIPPING = YES;
12971297
DEBUG_INFORMATION_FORMAT = dwarf;
12981298
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1364,7 +1364,7 @@
13641364
CLANG_WARN_UNREACHABLE_CODE = YES;
13651365
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
13661366
COPY_PHASE_STRIP = NO;
1367-
CURRENT_PROJECT_VERSION = 46;
1367+
CURRENT_PROJECT_VERSION = 47;
13681368
DEAD_CODE_STRIPPING = YES;
13691369
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13701370
ENABLE_NS_ASSERTIONS = NO;
@@ -1403,7 +1403,7 @@
14031403
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
14041404
CODE_SIGN_STYLE = Automatic;
14051405
COMBINE_HIDPI_IMAGES = YES;
1406-
CURRENT_PROJECT_VERSION = 46;
1406+
CURRENT_PROJECT_VERSION = 47;
14071407
DEAD_CODE_STRIPPING = YES;
14081408
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14091409
DEVELOPMENT_TEAM = "";
@@ -1444,7 +1444,7 @@
14441444
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
14451445
CODE_SIGN_STYLE = Automatic;
14461446
COMBINE_HIDPI_IMAGES = YES;
1447-
CURRENT_PROJECT_VERSION = 46;
1447+
CURRENT_PROJECT_VERSION = 47;
14481448
DEAD_CODE_STRIPPING = YES;
14491449
DEVELOPMENT_ASSET_PATHS = "\"CodeEdit/Preview Content\"";
14501450
DEVELOPMENT_TEAM = "";
@@ -1481,7 +1481,7 @@
14811481
BUNDLE_LOADER = "$(TEST_HOST)";
14821482
CODE_SIGN_STYLE = Automatic;
14831483
COMBINE_HIDPI_IMAGES = YES;
1484-
CURRENT_PROJECT_VERSION = 46;
1484+
CURRENT_PROJECT_VERSION = 47;
14851485
DEAD_CODE_STRIPPING = YES;
14861486
DEVELOPMENT_TEAM = "";
14871487
GENERATE_INFOPLIST_FILE = YES;
@@ -1508,7 +1508,7 @@
15081508
BUNDLE_LOADER = "$(TEST_HOST)";
15091509
CODE_SIGN_STYLE = Automatic;
15101510
COMBINE_HIDPI_IMAGES = YES;
1511-
CURRENT_PROJECT_VERSION = 46;
1511+
CURRENT_PROJECT_VERSION = 47;
15121512
DEAD_CODE_STRIPPING = YES;
15131513
DEVELOPMENT_TEAM = "";
15141514
GENERATE_INFOPLIST_FILE = YES;
@@ -1536,7 +1536,7 @@
15361536
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15371537
CODE_SIGN_STYLE = Automatic;
15381538
COMBINE_HIDPI_IMAGES = YES;
1539-
CURRENT_PROJECT_VERSION = 46;
1539+
CURRENT_PROJECT_VERSION = 47;
15401540
DEAD_CODE_STRIPPING = YES;
15411541
DEVELOPMENT_TEAM = "";
15421542
GENERATE_INFOPLIST_FILE = YES;
@@ -1565,7 +1565,7 @@
15651565
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
15661566
CODE_SIGN_STYLE = Automatic;
15671567
COMBINE_HIDPI_IMAGES = YES;
1568-
CURRENT_PROJECT_VERSION = 46;
1568+
CURRENT_PROJECT_VERSION = 47;
15691569
DEAD_CODE_STRIPPING = YES;
15701570
DEVELOPMENT_TEAM = "";
15711571
GENERATE_INFOPLIST_FILE = YES;
@@ -1783,7 +1783,7 @@
17831783
repositoryURL = "https://github.com/CodeEditApp/CodeEditSourceEditor";
17841784
requirement = {
17851785
kind = exactVersion;
1786-
version = 0.14.1;
1786+
version = 0.15.1;
17871787
};
17881788
};
17891789
6C85BB3E2C2105ED00EB5DEF /* XCRemoteSwiftPackageReference "CodeEditKit" */ = {

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

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

‎CodeEdit/AppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
270270
TaskNotificationHandler.postTask(action: .create, model: task)
271271
}
272272

273-
try await withTimeout(
274-
duration: .seconds(5.0),
273+
try? await withTimeout(
274+
duration: .seconds(2.0),
275275
onTimeout: {
276276
// Stop-gap measure to ensure we don't hang on CMD-Q
277277
await self.lspService.killAllServers()

‎CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,11 @@ final class CodeFileDocument: NSDocument, ObservableObject {
259259
// This blocks the presented item thread intentionally. If we don't wait, we'll receive more updates
260260
// that the file has changed and we'll end up dispatching multiple reads.
261261
// The presented item thread expects this operation to by synchronous anyways.
262-
DispatchQueue.main.asyncAndWait {
262+
263+
// https://github.com/CodeEditApp/CodeEdit/issues/2091
264+
// We can't use `.asyncAndWait` on Ventura as it seems the symbol is missing on that platform.
265+
// Could be just for x86 machines.
266+
DispatchQueue.main.sync {
263267
try? self.read(from: fileURL, ofType: fileType)
264268
}
265269
}
@@ -303,6 +307,16 @@ final class CodeFileDocument: NSDocument, ObservableObject {
303307
}
304308
}
305309

310+
override func fileNameExtension(
311+
forType typeName: String,
312+
saveOperation: NSDocument.SaveOperationType
313+
) -> String? {
314+
guard let fileTypeName = Self.fileTypeExtension[typeName] else {
315+
return super.fileNameExtension(forType: typeName, saveOperation: saveOperation)
316+
}
317+
return fileTypeName
318+
}
319+
306320
/// Determines the code language of the document.
307321
/// Use ``CodeFileDocument/language`` for the default value before using this. That property is used to override
308322
/// the file's language.
@@ -332,3 +346,10 @@ extension CodeFileDocument: LanguageServerDocument {
332346
fileURL?.lspURI
333347
}
334348
}
349+
350+
private extension CodeFileDocument {
351+
352+
static let fileTypeExtension: [String: String?] = [
353+
"public.make-source": nil
354+
]
355+
}

‎CodeEdit/Features/Documents/Controllers/CodeEditWindowController+Panels.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extension CodeEditWindowController {
8282
isCollapsed: { self.workspace?.utilityAreaModel?.isCollapsed ?? true },
8383
getPrevCollapsed: { self.prevUtilityAreaCollapsed },
8484
setPrevCollapsed: { self.prevUtilityAreaCollapsed = $0 },
85-
toggle: { CommandManager.shared.executeCommand("open.drawer") }
85+
toggle: { self.workspace?.utilityAreaModel?.togglePanel(animation: false) }
8686
),
8787
PanelDescriptor(
8888
isCollapsed: { self.toolbarCollapsed },

0 commit comments

Comments
 (0)