Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autocomplete Implementation #1949

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Autocomplete Implementation #1949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ab126d5
Autocomplete Coordinator
FastestMolasses Oct 20, 2024
4d24153
Merge branch 'main' into itembox
FastestMolasses Dec 7, 2024
02fb3b5
ItemBox updates
FastestMolasses Dec 18, 2024
6f80528
Merge branch 'main' into itembox
FastestMolasses Dec 22, 2024
a2de090
Autocomplete updates
FastestMolasses Dec 22, 2024
a432688
Update cursor positioning
FastestMolasses Dec 23, 2024
e81ac20
UX updates
FastestMolasses Dec 27, 2024
8e29a0c
Added item filtering based on cursor position
FastestMolasses Dec 29, 2024
336cab0
Added CodeSuggestionEntry types to CESE
FastestMolasses Dec 30, 2024
48a7fd6
Remove completion example
FastestMolasses Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 27 additions & 18 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 55;
objectVersion = 70;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -64,6 +64,8 @@
3000516A2BBD3A8200A98562 /* ServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300051692BBD3A8200A98562 /* ServiceType.swift */; };
3000516C2BBD3A9500A98562 /* ServiceWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3000516B2BBD3A9500A98562 /* ServiceWrapper.swift */; };
3026F50F2AC006C80061227E /* InspectorAreaViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3026F50E2AC006C80061227E /* InspectorAreaViewModel.swift */; };
3046374E2CB15FA900180667 /* AutoCompleteCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3046374D2CB15F9200180667 /* AutoCompleteCoordinator.swift */; };
3048523D2D182DA6000CD5CF /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */; };
30AB4EBB2BF718A100ED4431 /* DeveloperSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30AB4EBA2BF718A100ED4431 /* DeveloperSettings.swift */; };
30AB4EBD2BF71CA800ED4431 /* DeveloperSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30AB4EBC2BF71CA800ED4431 /* DeveloperSettingsView.swift */; };
30AB4EC22BF7253200ED4431 /* KeyValueTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30AB4EC12BF7253200ED4431 /* KeyValueTable.swift */; };
Expand Down Expand Up @@ -457,8 +459,7 @@
6CBA0D512A1BF524002C6FAA /* SegmentedControlImproved.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CBA0D502A1BF524002C6FAA /* SegmentedControlImproved.swift */; };
6CBD1BC62978DE53006639D5 /* Font+Caption3.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CBD1BC52978DE53006639D5 /* Font+Caption3.swift */; };
6CBE1CFB2B71DAA6003AC32E /* Loopable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CBE1CFA2B71DAA6003AC32E /* Loopable.swift */; };
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */; };
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */; };
6CC17B4F2C432AE000834E2C /* (null) in Frameworks */ = {isa = PBXBuildFile; };
6CC17B512C43311900834E2C /* ProjectNavigatorViewController+NSOutlineViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CC17B502C43311900834E2C /* ProjectNavigatorViewController+NSOutlineViewDataSource.swift */; };
6CC17B532C43314000834E2C /* ProjectNavigatorViewController+NSOutlineViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CC17B522C43314000834E2C /* ProjectNavigatorViewController+NSOutlineViewDelegate.swift */; };
6CC17B5B2C44258700834E2C /* WindowControllerPropertyWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CC17B5A2C44258700834E2C /* WindowControllerPropertyWrapper.swift */; };
Expand All @@ -474,7 +475,7 @@
6CD26C7D2C8EA8F400ADBA38 /* LanguageServer+DocumentSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD26C7C2C8EA8F400ADBA38 /* LanguageServer+DocumentSync.swift */; };
6CD26C812C8F8A4400ADBA38 /* LanguageIdentifier+CodeLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD26C802C8F8A4400ADBA38 /* LanguageIdentifier+CodeLanguage.swift */; };
6CD26C8A2C8F91ED00ADBA38 /* LanguageServer+DocumentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CD26C892C8F91ED00ADBA38 /* LanguageServer+DocumentTests.swift */; };
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */; };
6CD3CA552C8B508200D83DCD /* (null) in Frameworks */ = {isa = PBXBuildFile; };
6CDA84AD284C1BA000C1CC3A /* EditorTabBarContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CDA84AC284C1BA000C1CC3A /* EditorTabBarContextMenu.swift */; };
6CE21E812C643D8F0031B056 /* CETerminalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CE21E802C643D8F0031B056 /* CETerminalView.swift */; };
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */ = {isa = PBXBuildFile; productRef = 6CE21E862C650D2C0031B056 /* SwiftTerm */; };
Expand Down Expand Up @@ -761,6 +762,7 @@
300051692BBD3A8200A98562 /* ServiceType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceType.swift; sourceTree = "<group>"; };
3000516B2BBD3A9500A98562 /* ServiceWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceWrapper.swift; sourceTree = "<group>"; };
3026F50E2AC006C80061227E /* InspectorAreaViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InspectorAreaViewModel.swift; sourceTree = "<group>"; };
3046374D2CB15F9200180667 /* AutoCompleteCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoCompleteCoordinator.swift; sourceTree = "<group>"; };
30AB4EBA2BF718A100ED4431 /* DeveloperSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperSettings.swift; sourceTree = "<group>"; };
30AB4EBC2BF71CA800ED4431 /* DeveloperSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperSettingsView.swift; sourceTree = "<group>"; };
30AB4EC12BF7253200ED4431 /* KeyValueTable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyValueTable.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1321,6 +1323,10 @@
EC0870F62A455F6400EB8692 /* ProjectNavigatorViewController+NSMenuDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectNavigatorViewController+NSMenuDelegate.swift"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
302EFC1F2CC3C034004A74DF /* Views */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Views; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
2BE487E928245162003F3F64 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
Expand All @@ -1333,15 +1339,15 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3048523D2D182DA6000CD5CF /* CodeEditSourceEditor in Frameworks */,
6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */,
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */,
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
6C147C4529A329350089B630 /* OrderedCollections in Frameworks */,
6CE21E872C650D2C0031B056 /* SwiftTerm in Frameworks */,
6CC00A8B2CBEF150004E8134 /* CodeEditSourceEditor in Frameworks */,
6CD3CA552C8B508200D83DCD /* CodeEditSourceEditor in Frameworks */,
6CD3CA552C8B508200D83DCD /* (null) in Frameworks */,
6C0617D62BDB4432008C9C42 /* LogStream in Frameworks */,
6CC17B4F2C432AE000834E2C /* CodeEditSourceEditor in Frameworks */,
6CC17B4F2C432AE000834E2C /* (null) in Frameworks */,
30CB64912C16CA8100CC8A9E /* LanguageServerProtocol in Frameworks */,
6C4E37FC2C73E00700AEE7B5 /* SwiftTerm in Frameworks */,
6C6BD6F429CD142C00235D17 /* CollectionConcurrencyKit in Frameworks */,
Expand Down Expand Up @@ -1600,6 +1606,7 @@
6C3B4CD22D0E2C5400C6759E /* Editor */,
6CD26C732C8EA71F00ADBA38 /* LanguageServer */,
6CD26C742C8EA79100ADBA38 /* Service */,
302EFC1F2CC3C034004A74DF /* Views */,
30B087FA2C0D53080063A882 /* LSPUtil.swift */,
);
path = LSP;
Expand Down Expand Up @@ -2868,6 +2875,7 @@
287776EB27E350BA00D46668 /* TabBar */,
B67660642AA970ED00CD56B0 /* Models */,
B67660632AA970E300CD56B0 /* Views */,
3046374D2CB15F9200180667 /* AutoCompleteCoordinator.swift */,
);
path = Editor;
sourceTree = "<group>";
Expand Down Expand Up @@ -3747,6 +3755,9 @@
6C7B1C762A1D57CE005CBBFC /* PBXTargetDependency */,
2BE487F328245162003F3F64 /* PBXTargetDependency */,
);
fileSystemSynchronizedGroups = (
302EFC1F2CC3C034004A74DF /* Views */,
);
name = CodeEdit;
packageProductDependencies = (
2816F593280CF50500DD548B /* CodeEditSymbols */,
Expand All @@ -3760,11 +3771,9 @@
6C0617D52BDB4432008C9C42 /* LogStream */,
6C85BB3F2C2105ED00EB5DEF /* CodeEditKit */,
6C85BB432C210EFD00EB5DEF /* SwiftUIIntrospect */,
6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */,
6C0824A02C5C0C9700A0751E /* SwiftTerm */,
6CE21E862C650D2C0031B056 /* SwiftTerm */,
6C4E37FB2C73E00700AEE7B5 /* SwiftTerm */,
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */,
6CB94D022CA1205100E8651C /* AsyncAlgorithms */,
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
6C05CF9D2CDE8699006AAECD /* CodeEditSourceEditor */,
Expand Down Expand Up @@ -3865,7 +3874,7 @@
303E88462C276FD600EEA8D9 /* XCRemoteSwiftPackageReference "LanguageServerProtocol" */,
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
6C05CF9C2CDE8699006AAECD /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
302EFBFB2CC3284D004A74DF /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */,
);
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -4247,6 +4256,7 @@
58A5DFA229339F6400D1BD5D /* KeybindingManager.swift in Sources */,
B62AEDB32A1FD95B009A9F52 /* UtilityAreaTerminalView.swift in Sources */,
661EF7BD2BEE215300C3E577 /* LoadingFileView.swift in Sources */,
3046374E2CB15FA900180667 /* AutoCompleteCoordinator.swift in Sources */,
58AFAA2E2933C69E00482B53 /* EditorTabRepresentable.swift in Sources */,
6C4104E6297C884F00F472BA /* AboutDetailView.swift in Sources */,
6C6BD6F129CD13FA00235D17 /* ExtensionDiscovery.swift in Sources */,
Expand Down Expand Up @@ -5654,6 +5664,13 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
302EFBFB2CC3284D004A74DF /* XCLocalSwiftPackageReference "../CodeEditSourceEditor" */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../CodeEditSourceEditor;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCRemoteSwiftPackageReference section */
2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
isa = XCRemoteSwiftPackageReference;
Expand Down Expand Up @@ -5890,14 +5907,6 @@
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
};
6CC17B4E2C432AE000834E2C /* CodeEditSourceEditor */ = {
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
};
6CD3CA542C8B508200D83DCD /* CodeEditSourceEditor */ = {
isa = XCSwiftPackageProductDependency;
productName = CodeEditSourceEditor;
};
6CE21E862C650D2C0031B056 /* SwiftTerm */ = {
isa = XCSwiftPackageProductDependency;
productName = SwiftTerm;
Expand Down
29 changes: 10 additions & 19 deletions CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "ac57a6899925c3e4ac6d43aed791c845c6fc24a4441b6a10297a207d951b7836",
"originHash" : "bb72acfad31b288599b6721256b508d8209ba1bc1d7ab0fff6a358d49a1deae0",
"pins" : [
{
"identity" : "anycodable",
Expand All @@ -13,7 +13,7 @@
{
"identity" : "codeeditkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/CodeEditApp/CodeEditKit.git",
"location" : "https://github.com/CodeEditApp/CodeEditKit",
"state" : {
"revision" : "ad28213a968586abb0cb21a8a56a3587227895f1",
"version" : "0.1.2"
Expand All @@ -28,15 +28,6 @@
"version" : "0.1.20"
}
},
{
"identity" : "codeeditsourceeditor",
"kind" : "remoteSourceControl",
"location" : "https://github.com/CodeEditApp/CodeEditSourceEditor",
"state" : {
"revision" : "b0688fa59fb8060840fb013afb4d6e6a96000f14",
"version" : "0.9.1"
}
},
{
"identity" : "codeeditsymbols",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -123,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/ChimeHQ/LanguageServerProtocol",
"state" : {
"revision" : "ac76fccf0e981c8e30c5ee4de1b15adc1decd697",
"version" : "0.13.2"
"revision" : "d51412945ae88ffcab65ec339ca89aed9c9f0b8a",
"version" : "0.13.3"
}
},
{
Expand All @@ -150,8 +141,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattmassicotte/Queue",
"state" : {
"revision" : "8d6f936097888f97011610ced40313655dc5948d",
"version" : "0.1.4"
"revision" : "6adf359a705e3252742905b413bb8f56401043ca",
"version" : "0.2.0"
}
},
{
Expand Down Expand Up @@ -195,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections.git",
"state" : {
"revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
"version" : "1.1.3"
"revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
"version" : "1.1.4"
}
},
{
Expand All @@ -222,8 +213,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/lukepistrol/SwiftLintPlugin",
"state" : {
"revision" : "5a65f4074975f811da666dfe31a19850950b1ea4",
"version" : "0.56.2"
"revision" : "87454f5c9ff4d644086aec2a0df1ffba678e7f3c",
"version" : "0.57.1"
}
},
{
Expand Down
1 change: 0 additions & 1 deletion CodeEdit/Features/Documents/CodeFileDocument/CodeFileDocument.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Foundation
import SwiftUI
import UniformTypeIdentifiers
import CodeEditSourceEditor
import CodeEditTextView
import CodeEditLanguages
import Combine
import OSLog
Expand Down
Loading
Loading