Vim: fill implementation: field

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Angluca · Mar 13, 2024 · 76761d4 · 76761d4
1 parent 8680595
commit 76761d4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/Units/parser-vim.r/vim-class.d/args.ctags b/Units/parser-vim.r/vim-class.d/args.ctags
@@ -1,2 +1,2 @@
 --sort=no
---fields=+tSen{access}
+--fields=+tSen{access}{implementation}
diff --git a/Units/parser-vim.r/vim-class.d/expected.tags b/Units/parser-vim.r/vim-class.d/expected.tags
@@ -17,3 +17,13 @@ v1	input-0.vim	/^   final v1 = [1, 2]               # final object variable$/;"
 v2	input-0.vim	/^   public final v2 = {x: 1}        # final object variable$/;"	C	line:34	class:A	access:public
 v3	input-0.vim	/^   static final v3 = 'abc'         # final class variable$/;"	C	line:35	class:A
 v4	input-0.vim	/^   public static final v4 = 0z10   # final class variable$/;"	C	line:36	class:A	access:public
+Shape	input-1.vim	/^abstract class Shape$/;"	k	line:4	implementation:abstract	end:7
+color	input-1.vim	/^   var color = Color.Black$/;"	v	line:5	class:Shape
+thickness	input-1.vim	/^   var thickness = 10$/;"	v	line:6	class:Shape
+Square	input-1.vim	/^class Square extends Shape$/;"	k	line:9	end:14
+size	input-1.vim	/^   var size: number$/;"	v	line:10	class:Square	typeref:typename:number
+new	input-1.vim	/^   def new(this.size)$/;"	f	line:12	class:Square	signature:(this.size)	end:13
+Triangle	input-1.vim	/^class Triangle extends Shape$/;"	k	line:16	end:22
+base	input-1.vim	/^   var base: number$/;"	v	line:17	class:Triangle	typeref:typename:number
+height	input-1.vim	/^   var height: number$/;"	v	line:18	class:Triangle	typeref:typename:number
+new	input-1.vim	/^   def new(this.base, this.height)$/;"	f	line:20	class:Triangle	signature:(this.base,this.height)	end:21
diff --git a/Units/parser-vim.r/vim-class.d/input-1.vim b/Units/parser-vim.r/vim-class.d/input-1.vim
@@ -0,0 +1,22 @@
+vim9script
+# Taken from https://vim-jp.org/vimdoc-en/vim9class.html#Vim9-simple-class
+
+abstract class Shape
+   var color = Color.Black
+   var thickness = 10
+endclass
+
+class Square extends Shape
+   var size: number
+
+   def new(this.size)
+   enddef
+endclass
+
+class Triangle extends Shape
+   var base: number
+   var height: number
+
+   def new(this.base, this.height)
+   enddef
+endclass
diff --git a/parsers/vim.c b/parsers/vim.c
@@ -411,7 +411,8 @@ static void parseFunction (const unsigned char *line, int parent, bool definedWi
 	vStringDelete (name);
 }
 
-static void parseClass (const unsigned char *line, int parent, bool isPublic)
+static void parseClass (const unsigned char *line, int parent,
+						bool isPublic, bool isAbstract)
 {
 	vString *name = vStringNew ();
 	const unsigned char *cp = line;
@@ -438,6 +439,8 @@ static void parseClass (const unsigned char *line, int parent, bool isPublic)
 				e->extensionFields.scopeIndex = parent;
 				if (isPublic)
 					e->extensionFields.access = eStrdup ("public");
+				if (isAbstract)
+					e->extensionFields.implementation = eStrdup ("abstract");
 			}
 			while ((line = readVimLine ()) != NULL)
 			{
@@ -833,6 +836,7 @@ static bool parseVimLine (const unsigned char *line, int parent)
 	bool readNextLine = true;
 	int heredoc = CORK_NIL;
 	bool isPublic = false;
+	bool isAbstract = false;
 
 	while (true)
 	{
@@ -849,7 +853,7 @@ static bool parseVimLine (const unsigned char *line, int parent)
 			line += 8;
 			while (*line && isspace (*line))
 				++line;
-			/* TODO: abstract should be stored to a field. */
+			isAbstract = true;
 			continue;
 		}
 		else if (vim9script && wordMatchLen (line, "static", 6))
@@ -907,7 +911,7 @@ static bool parseVimLine (const unsigned char *line, int parent)
 	}
 	else if (vim9script && wordMatchLen (line, "class", 5))
 	{
-		parseClass (skipWord (line), parent, isPublic);
+		parseClass (skipWord (line), parent, isPublic, isAbstract);
 	}
 
 	tagEntryInfo *e;