coder3101 · asharkhan3101 · Jun 2, 2025 · Jun 2, 2025
diff --git a/src/docs.rs b/src/docs.rs
@@ -0,0 +1,72 @@
+use std::{collections::HashMap, sync::LazyLock};
+
+macro_rules! docmap_builtin {
+    ($name:literal) => {
+        ($name, include_str!(concat!("docs/builtin/", $name, ".md")))
+    };
+}
+
+macro_rules! docmap_wellknown {
+    ($name:literal) => {
+        (
+            concat!("google.protobuf.", $name),
+            include_str!(concat!("docs/wellknown/", $name, ".md")),
+        )
+    };
+}
+
+pub static BUITIN: LazyLock<HashMap<&'static str, &'static str>> = LazyLock::new(|| {
+    HashMap::from([
+        docmap_builtin!("int32"),
+        docmap_builtin!("int64"),
+        docmap_builtin!("uint32"),
+        docmap_builtin!("uint64"),
+        docmap_builtin!("sint32"),
+        docmap_builtin!("sint64"),
+        docmap_builtin!("fixed32"),
+        docmap_builtin!("fixed64"),
+        docmap_builtin!("sfixed32"),
+        docmap_builtin!("sfixed64"),
+        docmap_builtin!("float"),
+        docmap_builtin!("double"),
+        docmap_builtin!("string"),
+        docmap_builtin!("bytes"),
+        docmap_builtin!("bool"),
+        docmap_builtin!("default"),
+    ])
+});
+
+pub static WELLKNOWN: LazyLock<HashMap<&'static str, &'static str>> = LazyLock::new(|| {
+    HashMap::from([
+        docmap_wellknown!("Any"),
+        docmap_wellknown!("Api"),
+        docmap_wellknown!("BoolValue"),
+        docmap_wellknown!("BytesValue"),
+        docmap_wellknown!("DoubleValue"),
+        docmap_wellknown!("Duration"),
+        docmap_wellknown!("Empty"),
+        docmap_wellknown!("Enum"),
+        docmap_wellknown!("EnumValue"),
+        docmap_wellknown!("Field"),
+        docmap_wellknown!("Field.Cardinality"),
+        docmap_wellknown!("Field.Kind"),
+        docmap_wellknown!("FieldMask"),
+        docmap_wellknown!("FloatValue"),
+        docmap_wellknown!("Int32Value"),
+        docmap_wellknown!("Int64Value"),
+        docmap_wellknown!("ListValue"),
+        docmap_wellknown!("Method"),
+        docmap_wellknown!("Mixin"),
+        docmap_wellknown!("NullValue"),
+        docmap_wellknown!("Option"),
+        docmap_wellknown!("SourceContext"),
+        docmap_wellknown!("StringValue"),
+        docmap_wellknown!("Struct"),
+        docmap_wellknown!("Syntax"),
+        docmap_wellknown!("Timestamp"),
+        docmap_wellknown!("Type"),
+        docmap_wellknown!("UInt32Value"),
+        docmap_wellknown!("UInt64Value"),
+        docmap_wellknown!("Value"),
+    ])
+});
diff --git a/src/workspace/docs/builtin/bool.md → src/docs/builtin/bool.md b/src/workspace/docs/builtin/bool.md → src/docs/builtin/bool.md
diff --git a/src/workspace/docs/builtin/bytes.md → src/docs/builtin/bytes.md b/src/workspace/docs/builtin/bytes.md → src/docs/builtin/bytes.md
diff --git a/src/workspace/docs/builtin/default.md → src/docs/builtin/default.md b/src/workspace/docs/builtin/default.md → src/docs/builtin/default.md
diff --git a/src/workspace/docs/builtin/double.md → src/docs/builtin/double.md b/src/workspace/docs/builtin/double.md → src/docs/builtin/double.md
diff --git a/src/workspace/docs/builtin/fixed32.md → src/docs/builtin/fixed32.md b/src/workspace/docs/builtin/fixed32.md → src/docs/builtin/fixed32.md
diff --git a/src/workspace/docs/builtin/fixed64.md → src/docs/builtin/fixed64.md b/src/workspace/docs/builtin/fixed64.md → src/docs/builtin/fixed64.md
diff --git a/src/workspace/docs/builtin/float.md → src/docs/builtin/float.md b/src/workspace/docs/builtin/float.md → src/docs/builtin/float.md
diff --git a/src/workspace/docs/builtin/int32.md → src/docs/builtin/int32.md b/src/workspace/docs/builtin/int32.md → src/docs/builtin/int32.md
diff --git a/src/workspace/docs/builtin/int64.md → src/docs/builtin/int64.md b/src/workspace/docs/builtin/int64.md → src/docs/builtin/int64.md
diff --git a/src/workspace/docs/builtin/sfixed32.md → src/docs/builtin/sfixed32.md b/src/workspace/docs/builtin/sfixed32.md → src/docs/builtin/sfixed32.md
diff --git a/src/workspace/docs/builtin/sfixed64.md → src/docs/builtin/sfixed64.md b/src/workspace/docs/builtin/sfixed64.md → src/docs/builtin/sfixed64.md
diff --git a/src/workspace/docs/builtin/sint32.md → src/docs/builtin/sint32.md b/src/workspace/docs/builtin/sint32.md → src/docs/builtin/sint32.md
diff --git a/src/workspace/docs/builtin/sint64.md → src/docs/builtin/sint64.md b/src/workspace/docs/builtin/sint64.md → src/docs/builtin/sint64.md
diff --git a/src/workspace/docs/builtin/string.md → src/docs/builtin/string.md b/src/workspace/docs/builtin/string.md → src/docs/builtin/string.md
diff --git a/src/workspace/docs/builtin/uint32.md → src/docs/builtin/uint32.md b/src/workspace/docs/builtin/uint32.md → src/docs/builtin/uint32.md
diff --git a/src/workspace/docs/builtin/uint64.md → src/docs/builtin/uint64.md b/src/workspace/docs/builtin/uint64.md → src/docs/builtin/uint64.md
diff --git a/src/workspace/docs/wellknown/Any.md → src/docs/wellknown/Any.md b/src/workspace/docs/wellknown/Any.md → src/docs/wellknown/Any.md
diff --git a/src/workspace/docs/wellknown/Api.md → src/docs/wellknown/Api.md b/src/workspace/docs/wellknown/Api.md → src/docs/wellknown/Api.md
diff --git a/src/workspace/docs/wellknown/BoolValue.md → src/docs/wellknown/BoolValue.md b/src/workspace/docs/wellknown/BoolValue.md → src/docs/wellknown/BoolValue.md
diff --git a/src/workspace/docs/wellknown/BytesValue.md → src/docs/wellknown/BytesValue.md b/src/workspace/docs/wellknown/BytesValue.md → src/docs/wellknown/BytesValue.md
diff --git a/src/workspace/docs/wellknown/DoubleValue.md → src/docs/wellknown/DoubleValue.md b/src/workspace/docs/wellknown/DoubleValue.md → src/docs/wellknown/DoubleValue.md
diff --git a/src/workspace/docs/wellknown/Duration.md → src/docs/wellknown/Duration.md b/src/workspace/docs/wellknown/Duration.md → src/docs/wellknown/Duration.md
diff --git a/src/workspace/docs/wellknown/Empty.md → src/docs/wellknown/Empty.md b/src/workspace/docs/wellknown/Empty.md → src/docs/wellknown/Empty.md
diff --git a/src/workspace/docs/wellknown/Enum.md → src/docs/wellknown/Enum.md b/src/workspace/docs/wellknown/Enum.md → src/docs/wellknown/Enum.md
diff --git a/src/workspace/docs/wellknown/EnumValue.md → src/docs/wellknown/EnumValue.md b/src/workspace/docs/wellknown/EnumValue.md → src/docs/wellknown/EnumValue.md
diff --git a/...space/docs/wellknown/Field.Cardinality.md → src/docs/wellknown/Field.Cardinality.md b/...space/docs/wellknown/Field.Cardinality.md → src/docs/wellknown/Field.Cardinality.md
diff --git a/src/workspace/docs/wellknown/Field.Kind.md → src/docs/wellknown/Field.Kind.md b/src/workspace/docs/wellknown/Field.Kind.md → src/docs/wellknown/Field.Kind.md
diff --git a/src/workspace/docs/wellknown/Field.md → src/docs/wellknown/Field.md b/src/workspace/docs/wellknown/Field.md → src/docs/wellknown/Field.md
diff --git a/src/workspace/docs/wellknown/FieldMask.md → src/docs/wellknown/FieldMask.md b/src/workspace/docs/wellknown/FieldMask.md → src/docs/wellknown/FieldMask.md
diff --git a/src/workspace/docs/wellknown/FloatValue.md → src/docs/wellknown/FloatValue.md b/src/workspace/docs/wellknown/FloatValue.md → src/docs/wellknown/FloatValue.md
diff --git a/src/workspace/docs/wellknown/Int32Value.md → src/docs/wellknown/Int32Value.md b/src/workspace/docs/wellknown/Int32Value.md → src/docs/wellknown/Int32Value.md
diff --git a/src/workspace/docs/wellknown/Int64Value.md → src/docs/wellknown/Int64Value.md b/src/workspace/docs/wellknown/Int64Value.md → src/docs/wellknown/Int64Value.md
diff --git a/src/workspace/docs/wellknown/ListValue.md → src/docs/wellknown/ListValue.md b/src/workspace/docs/wellknown/ListValue.md → src/docs/wellknown/ListValue.md
diff --git a/src/workspace/docs/wellknown/Method.md → src/docs/wellknown/Method.md b/src/workspace/docs/wellknown/Method.md → src/docs/wellknown/Method.md
diff --git a/src/workspace/docs/wellknown/Mixin.md → src/docs/wellknown/Mixin.md b/src/workspace/docs/wellknown/Mixin.md → src/docs/wellknown/Mixin.md
diff --git a/src/workspace/docs/wellknown/NullValue.md → src/docs/wellknown/NullValue.md b/src/workspace/docs/wellknown/NullValue.md → src/docs/wellknown/NullValue.md
diff --git a/src/workspace/docs/wellknown/Option.md → src/docs/wellknown/Option.md b/src/workspace/docs/wellknown/Option.md → src/docs/wellknown/Option.md
diff --git a/...workspace/docs/wellknown/SourceContext.md → src/docs/wellknown/SourceContext.md b/...workspace/docs/wellknown/SourceContext.md → src/docs/wellknown/SourceContext.md
diff --git a/src/workspace/docs/wellknown/StringValue.md → src/docs/wellknown/StringValue.md b/src/workspace/docs/wellknown/StringValue.md → src/docs/wellknown/StringValue.md
diff --git a/src/workspace/docs/wellknown/Struct.md → src/docs/wellknown/Struct.md b/src/workspace/docs/wellknown/Struct.md → src/docs/wellknown/Struct.md
diff --git a/src/workspace/docs/wellknown/Syntax.md → src/docs/wellknown/Syntax.md b/src/workspace/docs/wellknown/Syntax.md → src/docs/wellknown/Syntax.md
diff --git a/src/workspace/docs/wellknown/Timestamp.md → src/docs/wellknown/Timestamp.md b/src/workspace/docs/wellknown/Timestamp.md → src/docs/wellknown/Timestamp.md
diff --git a/src/workspace/docs/wellknown/Type.md → src/docs/wellknown/Type.md b/src/workspace/docs/wellknown/Type.md → src/docs/wellknown/Type.md
diff --git a/src/workspace/docs/wellknown/UInt32Value.md → src/docs/wellknown/UInt32Value.md b/src/workspace/docs/wellknown/UInt32Value.md → src/docs/wellknown/UInt32Value.md
diff --git a/src/workspace/docs/wellknown/UInt64Value.md → src/docs/wellknown/UInt64Value.md b/src/workspace/docs/wellknown/UInt64Value.md → src/docs/wellknown/UInt64Value.md
diff --git a/src/workspace/docs/wellknown/Value.md → src/docs/wellknown/Value.md b/src/workspace/docs/wellknown/Value.md → src/docs/wellknown/Value.md
diff --git a/src/lsp.rs b/src/lsp.rs
@@ -7,19 +7,20 @@ use async_lsp::lsp_types::{
     CreateFilesParams, DeleteFilesParams, DidChangeConfigurationParams,
     DidChangeTextDocumentParams, DidChangeWorkspaceFoldersParams, DidCloseTextDocumentParams,
     DidOpenTextDocumentParams, DidSaveTextDocumentParams, DocumentFormattingParams,
-    DocumentRangeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse,
+    DocumentRangeFormattingParams, DocumentSymbolParams, DocumentSymbolResponse, Documentation,
     FileOperationFilter, FileOperationPattern, FileOperationPatternKind,
     FileOperationRegistrationOptions, GotoDefinitionParams, GotoDefinitionResponse, Hover,
     HoverContents, HoverParams, HoverProviderCapability, InitializeParams, InitializeResult,
-    Location, OneOf, PrepareRenameResponse, ReferenceParams, RenameFilesParams, RenameOptions,
-    RenameParams, ServerCapabilities, ServerInfo, TextDocumentPositionParams,
-    TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit, Url, WorkspaceEdit,
-    WorkspaceFileOperationsServerCapabilities, WorkspaceFoldersServerCapabilities,
+    Location, MarkupContent, MarkupKind, OneOf, PrepareRenameResponse, ReferenceParams,
+    RenameFilesParams, RenameOptions, RenameParams, ServerCapabilities, ServerInfo,
+    TextDocumentPositionParams, TextDocumentSyncCapability, TextDocumentSyncKind, TextEdit, Url,
+    WorkspaceEdit, WorkspaceFileOperationsServerCapabilities, WorkspaceFoldersServerCapabilities,
     WorkspaceServerCapabilities,
 };
 use async_lsp::{LanguageClient, LanguageServer, ResponseError};
 use futures::future::BoxFuture;
 
+use crate::docs;
 use crate::formatter::ProtoFormatter;
 use crate::server::ProtoLanguageServer;
 
@@ -159,20 +160,40 @@ impl LanguageServer for ProtoLanguageServer {
     ) -> BoxFuture<'static, Result<Option<CompletionResponse>, Self::Error>> {
         let uri = params.text_document_position.text_document.uri;
 
+        // All keywords in the language
         let keywords = vec![
             "syntax", "package", "option", "import", "service", "rpc", "returns", "message",
             "enum", "oneof", "repeated", "reserved", "to",
         ];
 
-        let mut completions: Vec<CompletionItem> = keywords
-            .into_iter()
-            .map(|w| CompletionItem {
-                label: w.to_string(),
-                kind: Some(CompletionItemKind::KEYWORD),
+        // Build completion item from builtins as fields
+        let mut completions: Vec<CompletionItem> = docs::BUITIN
+            .iter()
+            .map(|(k, v)| {
+                (
+                    k,
+                    MarkupContent {
+                        kind: MarkupKind::Markdown,
+                        value: v.to_string(),
+                    },
+                )
+            })
+            .map(|(k, v)| CompletionItem {
+                label: k.to_string(),
+                kind: Some(CompletionItemKind::FIELD),
+                documentation: Some(Documentation::MarkupContent(v)),
                 ..CompletionItem::default()
             })
             .collect();
 
+        // Build completion item from keywords
+        completions.extend(keywords.into_iter().map(|w| CompletionItem {
+            label: w.to_string(),
+            kind: Some(CompletionItemKind::KEYWORD),
+            ..CompletionItem::default()
+        }));
+
+        // Build completion item from the current tree
         if let Some(tree) = self.state.get_tree(&uri) {
             let content = self.state.get_content(&uri);
             if let Some(package_name) = tree.get_package_name(content.as_bytes()) {

diff --git a/src/main.rs b/src/main.rs
@@ -12,6 +12,7 @@ use tracing::Level;
 
 mod config;
 mod context;
+mod docs;
 mod formatter;
 mod lsp;
 mod nodekind;

diff --git a/src/workspace/hover.rs b/src/workspace/hover.rs
@@ -1,67 +1,12 @@
-use std::{collections::HashMap, path::PathBuf, sync::LazyLock};
+use std::path::PathBuf;
 
 use async_lsp::lsp_types::{MarkupContent, MarkupKind};
 
 use crate::{
-    context::hoverable::Hoverables, state::ProtoLanguageState, utils::split_identifier_package,
+    context::hoverable::Hoverables, docs, state::ProtoLanguageState,
+    utils::split_identifier_package,
 };
 
-static BUITIN_DOCS: LazyLock<HashMap<&'static str, &'static str>> = LazyLock::new(|| {
-    HashMap::from([
-        ("int32", include_str!("docs/builtin/int32.md")),
-        ("int64", include_str!("docs/builtin/int64.md")),
-        ("uint32", include_str!("docs/builtin/uint32.md")),
-        ("uint64", include_str!("docs/builtin/uint64.md")),
-        ("sint32", include_str!("docs/builtin/sint32.md")),
-        ("sint64", include_str!("docs/builtin/sint64.md")),
-        ("fixed32", include_str!("docs/builtin/fixed32.md")),
-        ("fixed64", include_str!("docs/builtin/fixed64.md")),
-        ("sfixed32", include_str!("docs/builtin/sfixed32.md")),
-        ("sfixed64", include_str!("docs/builtin/sfixed64.md")),
-        ("float", include_str!("docs/builtin/float.md")),
-        ("double", include_str!("docs/builtin/double.md")),
-        ("string", include_str!("docs/builtin/string.md")),
-        ("bytes", include_str!("docs/builtin/bytes.md")),
-        ("bool", include_str!("docs/builtin/bool.md")),
-        ("default", include_str!("docs/builtin/default.md")),
-    ])
-});
-
-static WELLKNOWN_DOCS: LazyLock<HashMap<&'static str, &'static str>> = LazyLock::new(|| {
-    HashMap::from([
-        ("google.protobuf.Any", include_str!("docs/wellknown/Any.md")),
-        ("google.protobuf.Api", include_str!("docs/wellknown/Api.md")),
-        ("google.protobuf.BoolValue", include_str!("docs/wellknown/BoolValue.md")),
-        ("google.protobuf.BytesValue", include_str!("docs/wellknown/BytesValue.md")),
-        ("google.protobuf.DoubleValue", include_str!("docs/wellknown/DoubleValue.md")),
-        ("google.protobuf.Duration", include_str!("docs/wellknown/Duration.md")),
-        ("google.protobuf.Empty", include_str!("docs/wellknown/Empty.md")),
-        ("google.protobuf.Enum", include_str!("docs/wellknown/Enum.md")),
-        ("google.protobuf.EnumValue", include_str!("docs/wellknown/EnumValue.md")),
-        ("google.protobuf.Field", include_str!("docs/wellknown/Field.md")),
-        ("google.protobuf.Field.Cardinality", include_str!("docs/wellknown/Field.Cardinality.md")),
-        ("google.protobuf.Field.Kind", include_str!("docs/wellknown/Field.Kind.md")),
-        ("google.protobuf.FieldMask", include_str!("docs/wellknown/FieldMask.md")),
-        ("google.protobuf.FloatValue", include_str!("docs/wellknown/FloatValue.md")),
-        ("google.protobuf.Int32Value", include_str!("docs/wellknown/Int32Value.md")),
-        ("google.protobuf.Int64Value", include_str!("docs/wellknown/Int64Value.md")),
-        ("google.protobuf.ListValue", include_str!("docs/wellknown/ListValue.md")),
-        ("google.protobuf.Method", include_str!("docs/wellknown/Method.md")),
-        ("google.protobuf.Mixin", include_str!("docs/wellknown/Mixin.md")),
-        ("google.protobuf.NullValue", include_str!("docs/wellknown/NullValue.md")),
-        ("google.protobuf.Option", include_str!("docs/wellknown/Option.md")),
-        ("google.protobuf.SourceContext", include_str!("docs/wellknown/SourceContext.md")),
-        ("google.protobuf.StringValue", include_str!("docs/wellknown/StringValue.md")),
-        ("google.protobuf.Struct", include_str!("docs/wellknown/Struct.md")),
-        ("google.protobuf.Syntax", include_str!("docs/wellknown/Syntax.md")),
-        ("google.protobuf.Timestamp", include_str!("docs/wellknown/Timestamp.md")),
-        ("google.protobuf.Type", include_str!("docs/wellknown/Type.md")),
-        ("google.protobuf.UInt32Value", include_str!("docs/wellknown/UInt32Value.md")),
-        ("google.protobuf.UInt64Value", include_str!("docs/wellknown/UInt64Value.md")),
-        ("google.protobuf.Value", include_str!("docs/wellknown/Value.md")),
-    ])
-});
-
 impl ProtoLanguageState {
     pub fn hover(
         &self,
@@ -72,7 +17,7 @@ impl ProtoLanguageState {
         let v = match hv {
             Hoverables::FieldType(field) => {
                 // Type is a builtin
-                match BUITIN_DOCS.get(field.as_str()) {
+                match docs::BUITIN.get(field.as_str()) {
                     Some(docs) => docs.to_string(),
                     _ => String::new(),
                 }
@@ -97,7 +42,7 @@ Included from {}"#,
 
                 // Node is user defined type or well known type
                 // If user defined,
-                let mut result = WELLKNOWN_DOCS
+                let mut result = docs::WELLKNOWN
                     .get(format!("{package}.{identifier}").as_str())
                     .map(|&s| s.to_string())
                     .unwrap_or_default();