Improve typings

lua/cmp/types/cmp.lua

@@ -51,7 +51,7 @@ cmp.ItemField = {
 
 ---@class cmp.SnippetExpansionParams
 ---@field public body string
----@field public insert_text_mode number
+---@field public insert_text_mode integer
 
 ---@class cmp.CompleteParams
 ---@field public reason? cmp.ContextReason
@@ -67,7 +67,7 @@ cmp.ItemField = {
 ---@class cmp.SourceApiParams: cmp.SourceConfig
 
 ---@class cmp.SourceCompletionApiParams : cmp.SourceConfig
----@field public offset number
+---@field public offset integer
 ---@field public context cmp.Context
 ---@field public completion_context lsp.CompletionContext
 
@@ -78,7 +78,7 @@ cmp.ItemField = {
 ---@field public s nil|function(fallback: function): void
 
 ---@class cmp.ConfigSchema
----@field private revision number
+---@field private revision integer
 ---@field public enabled fun():boolean|boolean
 ---@field public performance cmp.PerformanceConfig
 ---@field public preselect cmp.PreselectMode
@@ -95,8 +95,8 @@ cmp.ItemField = {
 ---@field public experimental cmp.ExperimentalConfig
 
 ---@class cmp.PerformanceConfig
----@field public debounce number
----@field public throttle number
+---@field public debounce integer
+---@field public throttle integer
 
 ---@class cmp.WindowConfig
 ---@field completion cmp.WindowConfig
@@ -106,15 +106,15 @@ cmp.ItemField = {
 ---@field public autocomplete cmp.TriggerEvent[]
 ---@field public completeopt string
 ---@field public get_trigger_characters fun(trigger_characters: string[]): string[]
----@field public keyword_length number
+---@field public keyword_length integer
 ---@field public keyword_pattern string
 
 ---@class cmp.WindowConfig
 ---@field public border string|string[]
 ---@field public winhighlight string
----@field public zindex number|nil
----@field public max_width number|nil
----@field public max_height number|nil
+---@field public zindex integer|nil
+---@field public max_width integer|nil
+---@field public max_height integer|nil
 
 ---@class cmp.ConfirmationConfig
 ---@field public default_behavior cmp.ConfirmBehavior
@@ -126,7 +126,7 @@ cmp.ItemField = {
 ---@field public disallow_prefix_unmatching boolean
 
 ---@class cmp.SortingConfig
----@field public priority_weight number
+---@field public priority_weight integer
 ---@field public comparators function[]
 
 ---@class cmp.FormattingConfig
@@ -145,12 +145,12 @@ cmp.ItemField = {
 ---@class cmp.SourceConfig
 ---@field public name string
 ---@field public option table|nil
----@field public priority number|nil
+---@field public priority integer|nil
 ---@field public trigger_characters string[]|nil
 ---@field public keyword_pattern string|nil
----@field public keyword_length number|nil
----@field public max_item_count number|nil
----@field public group_index number|nil
+---@field public keyword_length integer|nil
+---@field public max_item_count integer|nil
+---@field public group_index integer|nil
 
 ---@class cmp.ViewConfig
 ---@field public entries cmp.EntriesConfig

lua/cmp/types/lsp.lua

@@ -6,7 +6,7 @@ local lsp = {}
 
 lsp.Position = {
   ---Convert lsp.Position to vim.Position
-  ---@param buf number|string
+  ---@param buf integer|string
   ---@param position lsp.Position
   ---@return vim.Position
   to_vim = function(buf, position)
@@ -26,7 +26,7 @@ lsp.Position = {
     }
   end,
   ---Convert vim.Position to lsp.Position
-  ---@param buf number|string
+  ---@param buf integer|string
   ---@param position vim.Position
   ---@return lsp.Position
   to_lsp = function(buf, position)
@@ -49,7 +49,7 @@ lsp.Position = {
 
 lsp.Range = {
   ---Convert lsp.Range to vim.Range
-  ---@param buf number|string
+  ---@param buf integer|string
   ---@param range lsp.Range
   ---@return vim.Range
   to_vim = function(buf, range)
@@ -60,7 +60,7 @@ lsp.Range = {
   end,
 
   ---Convert vim.Range to lsp.Range
-  ---@param buf number|string
+  ---@param buf integer|string
   ---@param range vim.Range
   ---@return lsp.Range
   to_lsp = function(buf, range)
@@ -145,8 +145,8 @@ lsp.CompletionItemKind = vim.tbl_add_reverse_lookup(lsp.CompletionItemKind)
 ---@field public value string
 
 ---@class lsp.Position
----@field public line number
----@field public character number
+---@field public line integer
+---@field public character integer
 
 ---@class lsp.Range
 ---@field public start lsp.Position
@@ -161,9 +161,14 @@ lsp.CompletionItemKind = vim.tbl_add_reverse_lookup(lsp.CompletionItemKind)
 ---@field public range lsp.Range|nil
 ---@field public newText string
 
----@class lsp.InsertReplaceTextEdit
----@field public insert lsp.Range|nil
----@field public replace lsp.Range|nil
+---@alias lsp.InsertReplaceTextEdit lsp.internal.InsertTextEdit|lsp.internal.ReplaceTextEdit
+
+---@class lsp.internal.InsertTextEdit
+---@field public insert lsp.Range
+---@field public newText string
+
+---@class lsp.internal.ReplaceTextEdit
+---@field public insert lsp.Range
 ---@field public newText string
 
 ---@class lsp.CompletionItemLabelDetails

lua/cmp/types/vim.lua

@@ -12,8 +12,8 @@
 ---@field public menu_hl_group string|nil
 
 ---@class vim.Position
----@field public row number
----@field public col number
+---@field public row integer
+---@field public col integer
 
 ---@class vim.Range
 ---@field public start vim.Position