Merge branch 'feature/informative-suggestion-wip' into develop

intitni · intitni · commit e5967e0b3a8e · 2023-11-30T14:32:19.000+08:00
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/Core/Sources/ChatGPTChatTab/ChatPanel.swift
@@ -540,26 +540,14 @@ struct ChatPanelInputArea: View {
                 removeDuplicates: {
                     $0.typedMessage == $1.typedMessage && $0.focusedField == $1.focusedField
             }) { viewStore in
-                ZStack(alignment: .center) {
-                    // a hack to support dynamic height of TextEditor
-                    Text(
-                        viewStore.state.typedMessage.isEmpty ? "Hi" : viewStore.state.typedMessage
-                    ).opacity(0)
-                        .font(.system(size: 14))
-                        .frame(maxWidth: .infinity, maxHeight: 400)
-                        .padding(.top, 1)
-                        .padding(.bottom, 2)
-                        .padding(.horizontal, 4)
-
-                    CustomTextEditor(
-                        text: viewStore.$typedMessage,
-                        font: .systemFont(ofSize: 14),
-                        onSubmit: { viewStore.send(.sendButtonTapped) },
-                        completions: chatAutoCompletion
-                    )
-                    .padding(.top, 1)
-                    .padding(.bottom, -1)
-                }
+                AutoresizingCustomTextEditor(
+                    text: viewStore.$typedMessage,
+                    font: .systemFont(ofSize: 14),
+                    isEditable: true,
+                    maxHeight: 400,
+                    onSubmit: { viewStore.send(.sendButtonTapped) },
+                    completions: chatAutoCompletion
+                )
                 .focused($focusedField, equals: .textField)
                 .bind(viewStore.$focusedField, to: $focusedField)
                 .padding(8)
diff --git a/Core/Sources/Service/GUI/WidgetDataSource.swift b/Core/Sources/Service/GUI/WidgetDataSource.swift
@@ -14,7 +14,7 @@ import SuggestionWidget
 final class WidgetDataSource {}
 
 extension WidgetDataSource: SuggestionWidgetDataSource {
-    func suggestionForFile(at url: URL) async -> SuggestionProvider? {
+    func suggestionForFile(at url: URL) async -> CodeSuggestionProvider? {
         for workspace in Service.shared.workspacePool.workspaces.values {
             if let filespace = workspace.filespaces[url],
                let suggestion = filespace.presentingSuggestion
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/PanelFeature.swift
@@ -23,7 +23,7 @@ public struct PanelFeature: ReducerProtocol {
 
     public enum Action: Equatable {
         case presentSuggestion
-        case presentSuggestionProvider(SuggestionProvider, displayContent: Bool)
+        case presentSuggestionProvider(CodeSuggestionProvider, displayContent: Bool)
         case presentError(String)
         case presentPromptToCode(PromptToCodeGroup.PromptToCodeInitialState)
         case displayPanelContent
@@ -136,7 +136,7 @@ public struct PanelFeature: ReducerProtocol {
         }
     }
 
-    func fetchSuggestionProvider(fileURL: URL) async -> SuggestionProvider? {
+    func fetchSuggestionProvider(fileURL: URL) async -> CodeSuggestionProvider? {
         guard let provider = await suggestionWidgetControllerDependency
             .suggestionWidgetDataSource?
             .suggestionForFile(at: fileURL) else { return nil }
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/SharedPanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/SharedPanelFeature.swift
@@ -6,7 +6,7 @@ import SwiftUI
 public struct SharedPanelFeature: ReducerProtocol {
     public struct Content: Equatable {
         public var promptToCodeGroup = PromptToCodeGroup.State()
-        var suggestion: SuggestionProvider?
+        var suggestion: CodeSuggestionProvider?
         public var promptToCode: PromptToCode.State? { promptToCodeGroup.activePromptToCode }
         var error: String?
     }
diff --git a/Core/Sources/SuggestionWidget/FeatureReducers/SuggestionPanelFeature.swift b/Core/Sources/SuggestionWidget/FeatureReducers/SuggestionPanelFeature.swift
@@ -4,7 +4,7 @@ import SwiftUI
 
 public struct SuggestionPanelFeature: ReducerProtocol {
     public struct State: Equatable {
-        var content: SuggestionProvider?
+        var content: CodeSuggestionProvider?
         var colorScheme: ColorScheme = .light
         var alignTopToAnchor = false
         var isPanelDisplayed: Bool = false
diff --git a/Core/Sources/SuggestionWidget/Providers/CodeSuggestionProvider.swift b/Core/Sources/SuggestionWidget/Providers/CodeSuggestionProvider.swift
@@ -1,8 +1,8 @@
 import Foundation
 import SwiftUI
 
-public final class SuggestionProvider: ObservableObject, Equatable {
-    public static func == (lhs: SuggestionProvider, rhs: SuggestionProvider) -> Bool {
+public final class CodeSuggestionProvider: ObservableObject, Equatable {
+    public static func == (lhs: CodeSuggestionProvider, rhs: CodeSuggestionProvider) -> Bool {
         lhs.code == rhs.code && lhs.language == rhs.language
     }
 
@@ -12,6 +12,7 @@ public final class SuggestionProvider: ObservableObject, Equatable {
     @Published public var suggestionCount: Int = 0
     @Published public var currentSuggestionIndex: Int = 0
     @Published public var commonPrecedingSpaceCount = 0
+    @Published public var extraInformation: String = ""
 
     public var onSelectPreviousSuggestionTapped: () -> Void
     public var onSelectNextSuggestionTapped: () -> Void
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift
@@ -2,13 +2,13 @@ import SharedUIComponents
 import SwiftUI
 
 struct CodeBlockSuggestionPanel: View {
-    @ObservedObject var suggestion: SuggestionProvider
+    @ObservedObject var suggestion: CodeSuggestionProvider
     @Environment(\.colorScheme) var colorScheme
     @AppStorage(\.suggestionCodeFontSize) var fontSize
     @AppStorage(\.suggestionDisplayCompactMode) var suggestionDisplayCompactMode
 
     struct ToolBar: View {
-        @ObservedObject var suggestion: SuggestionProvider
+        @ObservedObject var suggestion: CodeSuggestionProvider
 
         var body: some View {
             HStack {
@@ -50,7 +50,7 @@ struct CodeBlockSuggestionPanel: View {
     }
 
     struct CompactToolBar: View {
-        @ObservedObject var suggestion: SuggestionProvider
+        @ObservedObject var suggestion: CodeSuggestionProvider
 
         var body: some View {
             HStack {
@@ -114,7 +114,7 @@ struct CodeBlockSuggestionPanel: View {
 
 struct CodeBlockSuggestionPanel_Dark_Preview: PreviewProvider {
     static var previews: some View {
-        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+        CodeBlockSuggestionPanel(suggestion: CodeSuggestionProvider(
             code: """
             LazyVGrid(columns: [GridItem(.fixed(30)), GridItem(.flexible())]) {
             ForEach(0..<viewModel.suggestion.count, id: \\.self) { index in // lkjaskldjalksjdlkasjdlkajslkdjas
@@ -142,7 +142,7 @@ struct CodeBlockSuggestionPanel_Dark_Preview: PreviewProvider {
 
 struct CodeBlockSuggestionPanel_Bright_Preview: PreviewProvider {
     static var previews: some View {
-        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+        CodeBlockSuggestionPanel(suggestion: CodeSuggestionProvider(
             code: """
             LazyVGrid(columns: [GridItem(.fixed(30)), GridItem(.flexible())]) {
             ForEach(0..<viewModel.suggestion.count, id: \\.self) { index in // lkjaskldjalksjdlkasjdlkajslkdjas
@@ -176,7 +176,7 @@ struct CodeBlockSuggestionPanel_CompactToolBar_Preview: PreviewProvider {
     }()
 
     static var previews: some View {
-        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+        CodeBlockSuggestionPanel(suggestion: CodeSuggestionProvider(
             code: """
             LazyVGrid(columns: [GridItem(.fixed(30)), GridItem(.flexible())]) {
             ForEach(0..<viewModel.suggestion.count, id: \\.self) { index in // lkjaskldjalksjdlkasjdlkajslkdjas
@@ -208,7 +208,7 @@ struct CodeBlockSuggestionPanel_CompactToolBar_Preview: PreviewProvider {
 
 struct CodeBlockSuggestionPanel_Dark_Objc_Preview: PreviewProvider {
     static var previews: some View {
-        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+        CodeBlockSuggestionPanel(suggestion: CodeSuggestionProvider(
             code: """
             - (void)addSubview:(UIView *)view {
                 [self addSubview:view];
@@ -233,7 +233,7 @@ struct CodeBlockSuggestionPanel_Dark_Objc_Preview: PreviewProvider {
 
 struct CodeBlockSuggestionPanel_Bright_Objc_Preview: PreviewProvider {
     static var previews: some View {
-        CodeBlockSuggestionPanel(suggestion: SuggestionProvider(
+        CodeBlockSuggestionPanel(suggestion: CodeSuggestionProvider(
             code: """
             - (void)addSubview:(UIView *)view {
                 [self addSubview:view];
diff --git a/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift b/Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift
@@ -372,27 +372,15 @@ extension PromptToCodePanel {
                     )
                 }
             ) { viewStore in
-                ZStack(alignment: .center) {
-                    // a hack to support dynamic height of TextEditor
-                    Text(viewStore.state.prompt.isEmpty ? "Hi" : viewStore.state.prompt)
-                        .opacity(0)
-                        .font(.system(size: 14))
-                        .frame(maxWidth: .infinity, maxHeight: 400)
-                        .padding(.top, 1)
-                        .padding(.bottom, 2)
-                        .padding(.horizontal, 4)
-
-                    CustomTextEditor(
-                        text: viewStore.$prompt,
-                        font: .systemFont(ofSize: 14),
-                        isEditable: !viewStore.state.isResponding,
-                        onSubmit: { viewStore.send(.modifyCodeButtonTapped) }
-                    )
-                    .padding(.top, 1)
-                    .padding(.bottom, -1)
-                    .opacity(viewStore.state.isResponding ? 0.5 : 1)
-                    .disabled(viewStore.state.isResponding)
-                }
+                AutoresizingCustomTextEditor(
+                    text: viewStore.$prompt,
+                    font: .systemFont(ofSize: 14),
+                    isEditable: !viewStore.state.isResponding,
+                    maxHeight: 400,
+                    onSubmit: { viewStore.send(.modifyCodeButtonTapped) }
+                )
+                .opacity(viewStore.state.isResponding ? 0.5 : 1)
+                .disabled(viewStore.state.isResponding)
                 .focused($focusField, equals: .textField)
                 .bind(viewStore.$focusField, to: $focusField)
             }
diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetDataSource.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetDataSource.swift
@@ -1,12 +1,12 @@
 import Foundation
 
 public protocol SuggestionWidgetDataSource {
-    func suggestionForFile(at url: URL) async -> SuggestionProvider?
+    func suggestionForFile(at url: URL) async -> CodeSuggestionProvider?
 }
 
 struct MockWidgetDataSource: SuggestionWidgetDataSource {
-    func suggestionForFile(at url: URL) async -> SuggestionProvider? {
-        return SuggestionProvider(
+    func suggestionForFile(at url: URL) async -> CodeSuggestionProvider? {
+        return CodeSuggestionProvider(
             code: """
             func test() {
                 let x = 1
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit c0ffa88685b35c90643d71a1feb9faa6ce624898
+Subproject commit 7b8199f4e10217a9349dffec28aa71b7721c8bdd
diff --git a/Tool/Package.swift b/Tool/Package.swift
@@ -61,6 +61,7 @@ let package = Package(
         ),
         .package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),
         .package(url: "https://github.com/GottaGetSwifty/CodableWrappers", from: "2.0.7"),
+        .package(url: "https://github.com/krzyzanowskim/STTextView", from: "0.8.21"),
 
         // TreeSitter
         .package(url: "https://github.com/intitni/SwiftTreeSitter.git", branch: "main"),
@@ -185,6 +186,7 @@ let package = Package(
             dependencies: [
                 "Highlightr",
                 "Preferences",
+                .product(name: "STTextView", package: "STTextView"),
             ]
         ),
         .testTarget(name: "SharedUIComponentsTests", dependencies: ["SharedUIComponents"]),
diff --git a/Tool/Sources/SharedUIComponents/CustomTextEditor.swift b/Tool/Sources/SharedUIComponents/CustomTextEditor.swift
@@ -1,5 +1,52 @@
 import SwiftUI
 
+public struct AutoresizingCustomTextEditor: View {
+    @Binding public var text: String
+    public let font: NSFont
+    public let isEditable: Bool
+    public let maxHeight: Double
+    public let onSubmit: () -> Void
+    public var completions: (_ text: String, _ words: [String], _ range: NSRange) -> [String]
+
+    public init(
+        text: Binding<String>,
+        font: NSFont,
+        isEditable: Bool,
+        maxHeight: Double,
+        onSubmit: @escaping () -> Void,
+        completions: @escaping (_ text: String, _ words: [String], _ range: NSRange)
+            -> [String] = { _, _, _ in [] }
+    ) {
+        _text = text
+        self.font = font
+        self.isEditable = isEditable
+        self.maxHeight = maxHeight
+        self.onSubmit = onSubmit
+        self.completions = completions
+    }
+
+    public var body: some View {
+        ZStack(alignment: .center) {
+            // a hack to support dynamic height of TextEditor
+            Text(text.isEmpty ? "Hi" : text).opacity(0)
+                .font(.init(font))
+                .frame(maxWidth: .infinity, maxHeight: maxHeight)
+                .padding(.top, 1)
+                .padding(.bottom, 2)
+                .padding(.horizontal, 4)
+
+            CustomTextEditor(
+                text: $text,
+                font: font,
+                onSubmit: onSubmit,
+                completions: completions
+            )
+            .padding(.top, 1)
+            .padding(.bottom, -1)
+        }
+    }
+}
+
 public struct CustomTextEditor: NSViewRepresentable {
     public func makeCoordinator() -> Coordinator {
         Coordinator(self)
diff --git a/Tool/Sources/SharedUIComponents/Experiment/NewCodeBlock.swift b/Tool/Sources/SharedUIComponents/Experiment/NewCodeBlock.swift
diff --git a/Tool/Sources/SharedUIComponents/SyntaxHighlighting.swift b/Tool/Sources/SharedUIComponents/SyntaxHighlighting.swift

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import SwiftUI`
`6`	`6`	`public struct SharedPanelFeature: ReducerProtocol {`
`7`	`7`	`public struct Content: Equatable {`
`8`	`8`	`public var promptToCodeGroup = PromptToCodeGroup.State()`
`9`		`- var suggestion: SuggestionProvider?`
	`9`	`+ var suggestion: CodeSuggestionProvider?`
`10`	`10`	`public var promptToCode: PromptToCode.State? { promptToCodeGroup.activePromptToCode }`
`11`	`11`	`var error: String?`
`12`	`12`	`}`