Merge pull request #39 from joyme123/feat-uuid-type

feat(uuid): support uuid type

Makefile

@@ -1,10 +1,26 @@
+# 获取系统架构
+UNAME_M := $(shell uname -m)
+
+# 根据系统架构设置 ARCH 变量
+ifeq ($(UNAME_M),x86_64)
+	ARCH := amd64
+else ifeq ($(UNAME_M),amd64)
+	ARCH := amd64
+else ifeq ($(UNAME_M),aarch64)
+	ARCH := arm64
+else ifeq ($(UNAME_M),arm64)
+	ARCH := arm64
+else
+	ARCH := unknown
+endif
+
 .PHONY: build install install-for-mason test
 build:
 	go build -o bin/thriftls main.go
 install:
 	cp bin/thriftls /usr/local/bin/thriftls
 install-for-mason:
-	cp bin/thriftls ~/.local/share/nvim/mason/packages/thriftls/thriftls-darwin-amd64
+	cp bin/thriftls ~/.local/share/nvim/mason/packages/thriftls/thriftls-darwin-$(ARCH)
 test:
 	@go test -gcflags=all=-l -gcflags=all=-d=checkptr=0 -race -coverpkg=./... -coverprofile=coverage.out $(shell go list ./...)
 	@go tool cover -func coverage.out | tail -n 1 | awk '{ print "Total coverage: " $$3 }'

lsp/codejump/utils.go

@@ -214,6 +214,7 @@ var basicType = map[string]struct{}{
 	"bool":   {},
 	"byte":   {},
 	"binary": {},
+	"uuid":   {},
 }
 
 var containerType = map[string]struct{}{

lsp/completion/token_completion.go

@@ -29,6 +29,7 @@ var keywords = map[string]protocol.InsertTextFormat{
 	"i64":                   protocol.InsertTextFormatPlainText,
 	"double":                protocol.InsertTextFormatPlainText,
 	"binary":                protocol.InsertTextFormatPlainText,
+	"uuid":                  protocol.InsertTextFormatPlainText,
 	"string":                protocol.InsertTextFormatPlainText,
 	"required":              protocol.InsertTextFormatPlainText,
 	"optional":              protocol.InsertTextFormatPlainText,

lsp/diagnostic/semantic_analysis_test.go

@@ -48,6 +48,10 @@ struct TestContainer {
 	101: required i64 user3 = 2
 	102: required bool isUser = true
 }
+// line 36
+struct TestUUID {
+	1: required uuid id
+}
 `
 	ss := buildSnapshotForTest([]*cache.FileChange{
 		{

parser/ast.go

@@ -3556,7 +3556,7 @@ func (c *FieldType) Equals(node Node) bool {
 type TypeName struct {
 	// TypeName can be:
 	// container type: map, set, list
-	// base type: bool, byte, i8, i16, i32, i64, double, string, binary
+	// base type: bool, byte, i8, i16, i32, i64, double, string, binary, uuid
 	// struct, enum, union, exception, identifier
 	Name     string
 	Comments []*Comment

parser/thrift.peg

@@ -434,7 +434,7 @@ IdentifierType = v:Identifier {
 	return v.(*Identifier).ToFieldType(), nil
 }
 
-BaseType = v:(BOOL / BYTE / I8 / I16 / I32 / I64 / DOUBLE / STRING / BINARY) {
+BaseType = v:(BOOL / BYTE / I8 / I16 / I32 / I64 / DOUBLE / STRING / BINARY / UUID) {
 	return NewFieldType(nil, nil, nil, nil, v.(*TypeName), nil, nil, NewLocationFromCurrent(c)), nil
 }
 
@@ -811,6 +811,16 @@ BINARYToken = "binary" {
 	return NewTypeName(string(c.text), c.pos), nil
 }
 
+UUID = comments:ReservedComments t:UUIDToken      !LetterOrDigit  Indent* {
+	tn := t.(*TypeName)
+	tn.Comments = comments.([]*Comment)
+
+	return tn, nil
+}
+UUIDToken = "uuid" {
+	return NewTypeName(string(c.text), c.pos), nil
+}
+
 MAP = comments:ReservedComments t:MAPToken           !LetterOrDigit  Indent* {
 	tn := t.(*TypeName)
 	tn.Comments = comments.([]*Comment)