Add config

Author: jcs090218

Server/Handlers/CompletionHandler.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Document;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -37,10 +38,15 @@ public override Task<CompletionItem> Handle(CompletionItem request, Cancellation
 
         public override async Task<CompletionList> Handle(CompletionParams request, CancellationToken cancellationToken)
         {
-            return GenerateCompletions(request, cancellationToken);
+            var conf = await _configuration.GetScopedConfiguration(request.TextDocument.Uri, cancellationToken);
+            var options = new ServerOptions();
+            conf.GetSection("ShaderLab").Bind(options);
+            return GenerateCompletions(request, options);
         }
 
-        protected override CompletionRegistrationOptions CreateRegistrationOptions(CompletionCapability capability, ClientCapabilities clientCapabilities)
+        protected override CompletionRegistrationOptions CreateRegistrationOptions(
+            CompletionCapability capability,
+            ClientCapabilities clientCapabilities)
             => new CompletionRegistrationOptions()
             {
                 DocumentSelector = _documentSelector,
@@ -49,13 +55,15 @@ protected override CompletionRegistrationOptions CreateRegistrationOptions(Compl
                 AllCommitCharacters = new Container<string>(new[] { "\n" })
             };
 
-        public CompletionList GenerateCompletions(CompletionParams request, CancellationToken cancellationToken)
+        public CompletionList GenerateCompletions(
+            CompletionParams request,
+            ServerOptions options)
         {
             var uri = request.TextDocument.Uri;
 
             var completions = new List<CompletionItem>();
             var keywords = new HashSet<string>();
-            
+
             var dm = ShaderlabDataManager.Instance;
 
             // Add functions into auto completion list
@@ -199,17 +207,21 @@ public CompletionList GenerateCompletions(CompletionParams request, Cancellation
 
             // Add words in current file
             //
-            foreach (var word in _workspace.BufferService.Tokens(uri))
+            _logger.LogWarning("ooo: " + options.CompletionWord);
+            if (options.CompletionWord)
             {
-                if (!keywords.Contains(word) && word != current)
+                foreach (var word in _workspace.BufferService.Tokens(uri))
                 {
-                    completions.Add(new CompletionItem
+                    if (!keywords.Contains(word) && word != current)
                     {
-                        Kind = CompletionItemKind.Text,
-                        Label = word,
-                        InsertText = word,
-                        Documentation = new MarkupContent { Kind = MarkupKind.Markdown, Value = string.Empty },
-                    });
+                        completions.Add(new CompletionItem
+                        {
+                            Kind = CompletionItemKind.Text,
+                            Label = word,
+                            InsertText = word,
+                            Documentation = new MarkupContent { Kind = MarkupKind.Markdown, Value = string.Empty },
+                        });
+                    }
                 }
             }
 

Server/Handlers/TextDocumentSyncHandler.cs

@@ -1,4 +1,5 @@
 using MediatR;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
@@ -57,6 +58,11 @@ public override async Task<Unit> Handle(DidChangeTextDocumentParams notification
         public override async Task<Unit> Handle(DidOpenTextDocumentParams notification, CancellationToken token)
         {
             DocumentUri uri = notification.TextDocument.Uri;
+
+            var conf = await _configuration.GetScopedConfiguration(uri, token);
+            var options = new ServerOptions();
+            conf.GetSection("ShaderLab").Bind(options);
+
             string text = notification.TextDocument.Text;
             _workspace.Init(uri);
             _logger.LogWarning("didOpen: " + uri.Path);

Server/Program.cs

@@ -49,8 +49,7 @@ private static void Configure(LanguageServerOptions options)
 
         private static void ConfigureServices(IServiceCollection services)
         {
-            services.AddSingleton(new ConfigurationItem { Section = "shaderlab" });
-            services.AddSingleton(new ConfigurationItem { Section = "shader-ls.completion.word" });
+            services.AddSingleton(new ConfigurationItem { Section = "ShaderLab" });
             services.AddSingleton(new DocumentSelector(
                 new DocumentFilter { Pattern = "**/*.shader" },
                 new DocumentFilter { Pattern = "**/*.cginc" },

Server/ServerOptions.cs

@@ -0,0 +1,7 @@
+namespace ShaderLS
+{
+    public class ServerOptions
+    {
+        public bool CompletionWord { get; set; }
+    }
+}