lsp ty

ms-jpq · Aug 23, 2022 · 648724c · 648724c
1 parent 1a354cf
commit 648724c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/coq/lsp/types.py b/coq/lsp/types.py
@@ -1,5 +1,14 @@
 from dataclasses import dataclass
-from typing import Any, Iterator, Literal, Optional, Sequence, TypedDict, Union
+from typing import (
+    AbstractSet,
+    Any,
+    Iterator,
+    Literal,
+    Optional,
+    Sequence,
+    TypedDict,
+    Union,
+)
 
 from ..shared.types import Completion
 
@@ -18,17 +27,21 @@ class _Range:
     end: _Position
 
 
+@dataclass(frozen=True)
+class _InsertReplaceRange:
+    insert: _Range
+    replace: _Range
+
+
 @dataclass(frozen=True)
 class TextEdit:
     newText: str
     range: _Range
 
 
 @dataclass(frozen=True)
-class InsertReplaceEdit:
+class InsertReplaceEdit(_InsertReplaceRange):
     newText: str
-    insert: _Range
-    replace: _Range
 
 
 _CompletionItemKind = int
@@ -76,9 +89,19 @@ class CompletionItem:
     data: Optional[Any] = None
 
 
+@dataclass(frozen=True)
+class ItemDefaults:
+    commitCharacters: Optional[AbstractSet[str]] = frozenset()
+    editRange: Union[_Range, _InsertReplaceRange, None] = None
+    insertTextFormat: Optional[_InsertTextFormat] = None
+    insertTextMode: Optional[_InsertTextMode] = None
+    data: Optional[Any] = None
+
+
 class _CompletionList(TypedDict):
     isIncomplete: bool
     items: Sequence[CompletionItem]
+    itemDefaults: Optional[ItemDefaults]
 
 
 CompletionResponse = Union[

diff --git a/syntax/coq-snip.vim b/syntax/coq-snip.vim
@@ -16,16 +16,16 @@ syntax match  Keyword           '\v^alias\s'
 syntax match  Label             '\v^abbr\s'
 
 
-syntax match  String            '\v^\s+\_.{-1,}$'                          contains=Special,csTrailingWS
+syntax match  String            '\v^\s+\_.{-1,}$'                     contains=Special,csTrailingWS
 syntax match  csTrailingWS      '\v\s+$'
 
-syntax region Special           start='\V${' end='\V}'           contained contains=Number,Macro,Operator,csContainedString
-syntax match  Special           '\v\$\d+'                        contained contains=Number
+syntax region Special           start='\V${' end='\V}'      contained contains=Number,Macro,Operator,csContainedString
+syntax match  Special           '\v\$\d+'                   contained contains=Number
 
-syntax match  Macro             '\v%(\$\{)@<=\D\_.{-}%(\:)@='    contained                                                  nextgroup=Operator
-syntax match  Number            '\v%(\$\{?)@<=\d+'               contained
-syntax match  Operator          '\V:'                            contained                                                  nextgroup=csContainedString
-syntax match  csContainedString '\v%(\:)@<=\_.{-1,}%(\})@='      contained contains=Special,csTrailingWS
+syntax match  Macro             '\v%(\$\{)@<=\w+%(\:)@='    contained                                                  nextgroup=Operator
+syntax match  Number            '\v%(\$\{?)@<=\d+'          contained
+syntax match  Operator          '\V:'                       contained                                                  nextgroup=csContainedString
+syntax match  csContainedString '\v%(\:)@<=\_.{-1,}%(\})@=' contained contains=Special,csTrailingWS
 
 
 highlight default link csTrailingWS Error