diff --git a/Developer/Resources/Styles.wl b/Developer/Resources/Styles.wl index 7e3abbb1..dd00c473 100644 --- a/Developer/Resources/Styles.wl +++ b/Developer/Resources/Styles.wl @@ -546,32 +546,6 @@ Cell[ -(* ::Subsection::Closed:: *) -(*ChatCode*) - - -(* - 14.2 CoreExtensions: most important parts of Input are defined in Core.nb. Only the CellEpliog is missing for chat functionality. - There is no impact on 14.1 chatbooks because Input already adds CellEpilog, so duplicating it here has no effect. *) -Cell[ - StyleData[ "ChatCode", StyleDefinitions -> StyleData[ "Input" ] ], - Background -> GrayLevel[ 1 ], - FontSize -> 14, - FontWeight -> "Plain", - LanguageCategory -> "Input", - ShowAutoStyles -> True, - ShowStringCharacters -> True, - ShowSyntaxStyles -> True, - - CellEpilog :> With[ { Wolfram`ChatNB`cell = (FinishDynamic[]; EvaluationCell[]) }, - Quiet[ Needs[ "Wolfram`Chatbook`" -> None ] ]; - Symbol[ "Wolfram`Chatbook`ChatbookAction" ][ "AIAutoAssist", Wolfram`ChatNB`cell ] - ] - -] - - - (* ::Subsection::Closed:: *) (*ChatPreformatted*) @@ -604,9 +578,9 @@ Cell[ Cell[ - StyleData[ "ChatCodeActive", StyleDefinitions -> StyleData[ "ChatCode" ] ], + StyleData[ "ChatCodeActive", StyleDefinitions -> StyleData[ "Input" ] ], CodeAssistOptions -> { "AutoDetectHyperlinks" -> False }, - LanguageCategory -> None, + FontSize -> 13, ShowAutoStyles -> False ] diff --git a/FrontEnd/Assets/Extensions/CoreExtensions.nb b/FrontEnd/Assets/Extensions/CoreExtensions.nb index 0509fd45..e18ee5f6 100644 --- a/FrontEnd/Assets/Extensions/CoreExtensions.nb +++ b/FrontEnd/Assets/Extensions/CoreExtensions.nb @@ -11,7 +11,7 @@ Notebook[ Cell["Chatbook Core.nb Extensions", "Title"], Cell[ StyleData["ChatStyleSheetInformation"], - TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3940599860"|> + TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3940955540"|> ], Cell[ StyleData["NotebookAssistant`Text"], @@ -1001,27 +1001,6 @@ Notebook[ Background -> GrayLevel[1] ], Cell[StyleData["ChatCodeBlockButtonPanel"]], - Cell[ - StyleData[ - "ChatCode", - StyleDefinitions -> StyleData["Input"] - ], - CellEpilog :> - With[ { Wolfram`ChatNB`cell = (FinishDynamic[]; EvaluationCell[]) }, - Quiet[Needs["Wolfram`Chatbook`" -> None]]; - Symbol["Wolfram`Chatbook`ChatbookAction"][ - "AIAutoAssist", - Wolfram`ChatNB`cell - ] - ], - ShowAutoStyles -> True, - ShowSyntaxStyles -> True, - LanguageCategory -> "Input", - ShowStringCharacters -> True, - FontSize -> 14, - FontWeight -> "Plain", - Background -> GrayLevel[1] - ], Cell[ StyleData["ChatPreformatted"], CellFrame -> None, @@ -1043,11 +1022,11 @@ Notebook[ Cell[ StyleData[ "ChatCodeActive", - StyleDefinitions -> StyleData["ChatCode"] + StyleDefinitions -> StyleData["Input"] ], ShowAutoStyles -> False, CodeAssistOptions -> {"AutoDetectHyperlinks" -> False}, - LanguageCategory -> None + FontSize -> 13 ], Cell[ StyleData["ChatCodeBlockTemplate"], diff --git a/FrontEnd/StyleSheets/Chatbook.nb b/FrontEnd/StyleSheets/Chatbook.nb index 1e308701..595146d4 100644 --- a/FrontEnd/StyleSheets/Chatbook.nb +++ b/FrontEnd/StyleSheets/Chatbook.nb @@ -824,7 +824,7 @@ Notebook[ ], Cell[ StyleData["ChatStyleSheetInformation"], - TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3940939112"|> + TaggingRules -> <|"StyleSheetVersion" -> "1.5.2.3940955540"|> ], Cell[ StyleData["NotebookAssistant`Text"], @@ -1840,27 +1840,6 @@ Notebook[ Background -> GrayLevel[1] ], Cell[StyleData["ChatCodeBlockButtonPanel"]], - Cell[ - StyleData[ - "ChatCode", - StyleDefinitions -> StyleData["Input"] - ], - CellEpilog :> - With[ { Wolfram`ChatNB`cell = (FinishDynamic[]; EvaluationCell[]) }, - Quiet[Needs["Wolfram`Chatbook`" -> None]]; - Symbol["Wolfram`Chatbook`ChatbookAction"][ - "AIAutoAssist", - Wolfram`ChatNB`cell - ] - ], - ShowAutoStyles -> True, - ShowSyntaxStyles -> True, - LanguageCategory -> "Input", - ShowStringCharacters -> True, - FontSize -> 14, - FontWeight -> "Plain", - Background -> GrayLevel[1] - ], Cell[ StyleData["ChatPreformatted"], CellFrame -> None, @@ -1882,11 +1861,11 @@ Notebook[ Cell[ StyleData[ "ChatCodeActive", - StyleDefinitions -> StyleData["ChatCode"] + StyleDefinitions -> StyleData["Input"] ], ShowAutoStyles -> False, CodeAssistOptions -> {"AutoDetectHyperlinks" -> False}, - LanguageCategory -> None + FontSize -> 13 ], Cell[ StyleData["ChatCodeBlockTemplate"], diff --git a/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb b/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb index 7eb6ffc9..b098f62d 100644 --- a/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb +++ b/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb @@ -83,7 +83,7 @@ Notebook[ Cell[StyleData["CellExpression"], Selectable -> True], Cell[ StyleData["WorkspaceChatStyleSheetInformation"], - TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "1.5.2.3940930109"|> + TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "1.5.2.3940955540"|> ], Cell[ StyleData[ diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl index 65bda248..b705c075 100644 --- a/Source/Chatbook/SendChat.wl +++ b/Source/Chatbook/SendChat.wl @@ -964,13 +964,7 @@ splitDynamicContent[ container_, { static__String, dynamic_String }, cell_, uuid write, None, AutoScroll -> False - ]; - splitDynamicTaskFunction @ NotebookWrite[ - System`NotebookLocationSpecifier[ boxObject, "Before" ], - Cell[ "\n", "None" ], - None, - AutoScroll -> False - ]; + ] ]; $dynamicTrigger++;