style fix

one-ware · Jul 14, 2023 · 5703dd3 · 5703dd3
1 parent 87d21f6
commit 5703dd3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/OneWare.Core/Styles/Editor.axaml b/src/OneWare.Core/Styles/Editor.axaml
@@ -72,7 +72,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate>
-                    <Border Padding="1" CornerRadius="1" BorderThickness="1"
+                    <Border Padding="1" CornerRadius="1" BorderThickness="1" 
                             BorderBrush="{DynamicResource ThemeBorderLowBrush}"
                             Background="{DynamicResource ThemeBackgroundBrush}">
                         <md:MarkdownScrollViewer Classes="ToolTip" Markdown="{TemplateBinding Content}">

diff --git a/src/OneWare.Core/Views/DockViews/EditView.axaml b/src/OneWare.Core/Views/DockViews/EditView.axaml
@@ -71,7 +71,7 @@
             </ContentControl.Styles>
         </ContentControl>
 
-        <Popup Name="HoverBox" IsLightDismissEnabled="False">
+        <Popup Name="HoverBox" IsLightDismissEnabled="False" MaxWidth="700">
             <Grid>
             <ContentControl Name="HoverBoxContent" Padding="2" CornerRadius="1" BorderThickness="1" BorderBrush="{DynamicResource ThemeBorderLowBrush}"
                             Background="{DynamicResource ThemeBackgroundBrush}">

diff --git a/src/OneWare.Cpp/LanguageServiceCpp.cs b/src/OneWare.Cpp/LanguageServiceCpp.cs
@@ -10,7 +10,8 @@ namespace OneWare.Cpp
     public class LanguageServiceCpp : LanguageService
     {
         public LanguageServiceCpp(ISettingsService settingsService, IPaths paths) : base("Clang",
-            Path.Combine(paths.PackagesDirectory, "clangd_16.0.2", "bin", $"clangd{Platform.ExecutableExtension}"), "--log=error",
+            Path.Combine(paths.PackagesDirectory, "clangd_16.0.2", "bin", $"clangd{Platform.ExecutableExtension}"), 
+            "--log=error",
             null)
         {
             // Global.Options.WhenAnyValue(x => x.CppLspNiosMode).Subscribe(x =>

diff --git a/src/OneWare.Shared/LanguageService/TypeAssistanceLSP.cs b/src/OneWare.Shared/LanguageService/TypeAssistanceLSP.cs
@@ -405,23 +405,20 @@ await Service.ApplyWorkspaceEditAsync(new ApplyWorkspaceEditParams
             return null;
         }
 
-        public virtual async Task GoToLocationAsync(Location? location)
+        protected virtual async Task GoToLocationAsync(Location? location)
         {
             if (location == null) return;
 
             var path = Path.GetFullPath(location.Uri.GetFileSystemPath());
-            var entry = ContainerLocator.Container.Resolve<IProjectExplorerService>().Search(path) as IFile;
-            entry ??= ContainerLocator.Container.Resolve<IProjectExplorerService>().GetTemporaryFile(path);
+            var file = ContainerLocator.Container.Resolve<IProjectExplorerService>().Search(path) as IFile;
+            file ??= ContainerLocator.Container.Resolve<IProjectExplorerService>().GetTemporaryFile(path);
 
-            if (entry is IProjectFile file)
+            var dockable = await ContainerLocator.Container.Resolve<IDockService>().OpenFileAsync(file);
+            if (dockable is IEditor evm)
             {
-                var dockable = await ContainerLocator.Container.Resolve<IDockService>().OpenFileAsync(file);
-                if (dockable is IEditor evm)
-                {
-                    var sOff = evm.CurrentDocument.GetOffsetFromPosition(location.Range.Start) - 1;
-                    var eOff = evm.CurrentDocument.GetOffsetFromPosition(location.Range.End) - 1;
-                    if (sOff >= 0 && eOff >= 0 && eOff > sOff) evm.Select(sOff, eOff - sOff);
-                }
+                var sOff = evm.CurrentDocument.GetOffsetFromPosition(location.Range.Start) - 1;
+                var eOff = evm.CurrentDocument.GetOffsetFromPosition(location.Range.End) - 1;
+                if (sOff >= 0 && eOff >= 0 && eOff > sOff) evm.Select(sOff, eOff - sOff);
             }
         }