chore: use .vv extension for meta- and testdata files (#53)

vlang · Mar 25, 2024 · 3c3b24a · 3c3b24a
1 parent 609d66a
commit 3c3b24a
Show file tree

Hide file tree

Showing 54 changed files with 49 additions and 36 deletions.
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -34,7 +34,7 @@
 		"watch": "tsc -watch -p ./",
 		"package": "npx vsce package",
 		"postpackage": "node ./scripts/minify_json.js --restore",
-		"testgrammar": "vscode-tmgrammar-test -g syntaxes/v.tmLanguage.json \"syntaxes/tests/*.v\"",
+		"testgrammar": "vscode-tmgrammar-test -g syntaxes/v.tmLanguage.json \"syntaxes/tests/*.vv\"",
 		"format": "prettier --write \"scripts/**/*.js\" \"src/**/*.ts\""
 	},
 	"main": "dist/extension.js",

diff --git a/editors/code/syntaxes/tests/accessor.v → editors/code/syntaxes/tests/accessor.vv b/editors/code/syntaxes/tests/accessor.v → editors/code/syntaxes/tests/accessor.vv
diff --git a/editors/code/syntaxes/tests/comma.v → editors/code/syntaxes/tests/comma.vv b/editors/code/syntaxes/tests/comma.v → editors/code/syntaxes/tests/comma.vv
diff --git a/editors/code/syntaxes/tests/comment.v → editors/code/syntaxes/tests/comment.vv b/editors/code/syntaxes/tests/comment.v → editors/code/syntaxes/tests/comment.vv
diff --git a/editors/code/syntaxes/tests/comparison.v → editors/code/syntaxes/tests/comparison.vv b/editors/code/syntaxes/tests/comparison.v → editors/code/syntaxes/tests/comparison.vv
diff --git a/editors/code/syntaxes/tests/dot.int.v → editors/code/syntaxes/tests/dot.int.vv b/editors/code/syntaxes/tests/dot.int.v → editors/code/syntaxes/tests/dot.int.vv
diff --git a/editors/code/syntaxes/tests/escape.v → editors/code/syntaxes/tests/escape.vv b/editors/code/syntaxes/tests/escape.v → editors/code/syntaxes/tests/escape.vv
diff --git a/editors/code/syntaxes/tests/hashtag.v → editors/code/syntaxes/tests/hashtag.vv b/editors/code/syntaxes/tests/hashtag.v → editors/code/syntaxes/tests/hashtag.vv
diff --git a/editors/code/syntaxes/tests/method.v → editors/code/syntaxes/tests/method.vv b/editors/code/syntaxes/tests/method.v → editors/code/syntaxes/tests/method.vv
diff --git a/editors/code/syntaxes/tests/numbers.v → editors/code/syntaxes/tests/numbers.vv b/editors/code/syntaxes/tests/numbers.v → editors/code/syntaxes/tests/numbers.vv
diff --git a/editors/code/syntaxes/tests/optional.v → editors/code/syntaxes/tests/optional.vv b/editors/code/syntaxes/tests/optional.v → editors/code/syntaxes/tests/optional.vv
diff --git a/editors/code/syntaxes/tests/pubfn.v → editors/code/syntaxes/tests/pubfn.vv b/editors/code/syntaxes/tests/pubfn.v → editors/code/syntaxes/tests/pubfn.vv
diff --git a/editors/code/syntaxes/tests/string.v → editors/code/syntaxes/tests/string.vv b/editors/code/syntaxes/tests/string.v → editors/code/syntaxes/tests/string.vv
diff --git a/editors/code/syntaxes/tests/type.v → editors/code/syntaxes/tests/type.vv b/editors/code/syntaxes/tests/type.v → editors/code/syntaxes/tests/type.vv
diff --git a/editors/code/syntaxes/tests/variable.v → editors/code/syntaxes/tests/variable.vv b/editors/code/syntaxes/tests/variable.v → editors/code/syntaxes/tests/variable.vv
diff --git a/metadata/metadata.v b/metadata/metadata.v
@@ -27,13 +27,13 @@ pub fn (e &EmbedFS) unpack_to(path string) ! {
 
 pub fn embed_fs() EmbedFS {
 	mut files := []embed_file.EmbedFileData{}
-	files << $embed_file('stubs/arrays.v', .zlib)
-	files << $embed_file('stubs/primitives.v', .zlib)
-	files << $embed_file('stubs/vweb.v', .zlib)
-	files << $embed_file('stubs/compile_time_constants.v', .zlib)
-	files << $embed_file('stubs/compile_time_reflection.v', .zlib)
-	files << $embed_file('stubs/builtin_compile_time.v', .zlib)
-	files << $embed_file('stubs/channels.v', .zlib)
+	files << $embed_file('stubs/arrays.vv', .zlib)
+	files << $embed_file('stubs/primitives.vv', .zlib)
+	files << $embed_file('stubs/vweb.vv', .zlib)
+	files << $embed_file('stubs/compile_time_constants.vv', .zlib)
+	files << $embed_file('stubs/compile_time_reflection.vv', .zlib)
+	files << $embed_file('stubs/builtin_compile_time.vv', .zlib)
+	files << $embed_file('stubs/channels.vv', .zlib)
 	files << $embed_file('stubs/attributes/Deprecated.v', .zlib)
 	files << $embed_file('stubs/attributes/Table.v', .zlib)
 	files << $embed_file('stubs/attributes/Attribute.v', .zlib)
@@ -43,10 +43,10 @@ pub fn embed_fs() EmbedFS {
 	files << $embed_file('stubs/attributes/Noreturn.v', .zlib)
 	files << $embed_file('stubs/attributes/Manualfree.v', .zlib)
 	files << $embed_file('stubs/implicit.v', .zlib)
-	files << $embed_file('stubs/compile_time.v', .zlib)
-	files << $embed_file('stubs/c_decl.v', .zlib)
-	files << $embed_file('stubs/errors.v', .zlib)
-	files << $embed_file('stubs/threads.v', .zlib)
+	files << $embed_file('stubs/compile_time.vv', .zlib)
+	files << $embed_file('stubs/c_decl.vv', .zlib)
+	files << $embed_file('stubs/errors.vv', .zlib)
+	files << $embed_file('stubs/threads.vv', .zlib)
 
 	return EmbedFS{
 		files: files

diff --git a/metadata/stubs/arrays.v → metadata/stubs/arrays.vv b/metadata/stubs/arrays.v → metadata/stubs/arrays.vv
diff --git a/metadata/stubs/builtin_compile_time.v → metadata/stubs/builtin_compile_time.vv b/metadata/stubs/builtin_compile_time.v → metadata/stubs/builtin_compile_time.vv
diff --git a/metadata/stubs/c_decl.v → metadata/stubs/c_decl.vv b/metadata/stubs/c_decl.v → metadata/stubs/c_decl.vv
diff --git a/metadata/stubs/channels.v → metadata/stubs/channels.vv b/metadata/stubs/channels.v → metadata/stubs/channels.vv
diff --git a/metadata/stubs/compile_time.v → metadata/stubs/compile_time.vv b/metadata/stubs/compile_time.v → metadata/stubs/compile_time.vv
diff --git a/metadata/stubs/compile_time_constants.v → metadata/stubs/compile_time_constants.vv b/metadata/stubs/compile_time_constants.v → metadata/stubs/compile_time_constants.vv
diff --git a/metadata/stubs/compile_time_reflection.v → metadata/stubs/compile_time_reflection.vv b/metadata/stubs/compile_time_reflection.v → metadata/stubs/compile_time_reflection.vv
diff --git a/metadata/stubs/errors.v → metadata/stubs/errors.vv b/metadata/stubs/errors.v → metadata/stubs/errors.vv
diff --git a/metadata/stubs/implicit.v b/metadata/stubs/implicit.v
@@ -6,7 +6,20 @@ module stubs
 // Any is any type in code.
 //
 // It is needed to define all implicit methods of all types.
-type Any = any
+type Any = []Any
+	| bool
+	| f32
+	| f64
+	| i16
+	| i64
+	| i8
+	| int
+	| map[string]Any
+	| string
+	| u16
+	| u32
+	| u64
+	| u8
 
 // str returns a string representation of the type.
 //

diff --git a/metadata/stubs/primitives.v → metadata/stubs/primitives.vv b/metadata/stubs/primitives.v → metadata/stubs/primitives.vv
diff --git a/metadata/stubs/threads.v → metadata/stubs/threads.vv b/metadata/stubs/threads.v → metadata/stubs/threads.vv
diff --git a/metadata/stubs/vweb.v → metadata/stubs/vweb.vv b/metadata/stubs/vweb.v → metadata/stubs/vweb.vv
diff --git a/server/language_server.v b/server/language_server.v
@@ -47,7 +47,7 @@ pub mut:
 	// stubs_version incremented on each change in stubs
 	//
 	// See also `LanguageServer.setup_stubs()`
-	stubs_version int = 1
+	stubs_version int = 2
 	// initialization_options is a list of custom initialization options.
 	// Used to pass custom options in tests.
 	initialization_options []string

diff --git a/tests/documentation.v b/tests/documentation.v
@@ -5,7 +5,7 @@ import testing
 fn documentation() testing.Tester {
 	mut t := testing.with_name('documentation')
 
-	t.documentation_test('rendered', 'documentation/rendered.v')
+	t.documentation_test('rendered', 'documentation/rendered.vv')
 
 	return t
 }
diff --git a/tests/testdata/documentation/rendered.v → tests/testdata/documentation/rendered.vv b/tests/testdata/documentation/rendered.v → tests/testdata/documentation/rendered.vv
diff --git a/tests/testdata/documentation/rendered.v.md → tests/testdata/documentation/rendered.vv.md b/tests/testdata/documentation/rendered.v.md → tests/testdata/documentation/rendered.vv.md
diff --git a/tests/testdata/types/bool_operators.v → tests/testdata/types/bool_operators.vv b/tests/testdata/types/bool_operators.v → tests/testdata/types/bool_operators.vv
diff --git a/tests/testdata/types/call_expression.v → tests/testdata/types/call_expression.vv b/tests/testdata/types/call_expression.v → tests/testdata/types/call_expression.vv
diff --git a/tests/testdata/types/chan_type.v → tests/testdata/types/chan_type.vv b/tests/testdata/types/chan_type.v → tests/testdata/types/chan_type.vv
diff --git a/tests/testdata/types/constants.v → tests/testdata/types/constants.vv b/tests/testdata/types/constants.v → tests/testdata/types/constants.vv
diff --git a/tests/testdata/types/fields.v → tests/testdata/types/fields.vv b/tests/testdata/types/fields.v → tests/testdata/types/fields.vv
diff --git a/tests/testdata/types/for_loop.v → tests/testdata/types/for_loop.vv b/tests/testdata/types/for_loop.v → tests/testdata/types/for_loop.vv
diff --git a/tests/testdata/types/for_loops.v → tests/testdata/types/for_loops.vv b/tests/testdata/types/for_loops.v → tests/testdata/types/for_loops.vv
diff --git a/tests/testdata/types/function_literal.v → tests/testdata/types/function_literal.vv b/tests/testdata/types/function_literal.v → tests/testdata/types/function_literal.vv
diff --git a/tests/testdata/types/generics.v → tests/testdata/types/generics.vv b/tests/testdata/types/generics.v → tests/testdata/types/generics.vv
diff --git a/tests/testdata/types/if_expression.v → tests/testdata/types/if_expression.vv b/tests/testdata/types/if_expression.v → tests/testdata/types/if_expression.vv
diff --git a/tests/testdata/types/json_decode.v → tests/testdata/types/json_decode.vv b/tests/testdata/types/json_decode.v → tests/testdata/types/json_decode.vv
diff --git a/tests/testdata/types/literals.v → tests/testdata/types/literals.vv b/tests/testdata/types/literals.v → tests/testdata/types/literals.vv
diff --git a/tests/testdata/types/map_init_expression.v → tests/testdata/types/map_init_expression.vv b/tests/testdata/types/map_init_expression.v → tests/testdata/types/map_init_expression.vv
diff --git a/tests/testdata/types/match_expression.v → tests/testdata/types/match_expression.vv b/tests/testdata/types/match_expression.v → tests/testdata/types/match_expression.vv
diff --git a/tests/testdata/types/parameters.v → tests/testdata/types/parameters.vv b/tests/testdata/types/parameters.v → tests/testdata/types/parameters.vv
diff --git a/tests/testdata/types/pointers.v → tests/testdata/types/pointers.vv b/tests/testdata/types/pointers.v → tests/testdata/types/pointers.vv
diff --git a/tests/testdata/types/receiver.v → tests/testdata/types/receiver.vv b/tests/testdata/types/receiver.v → tests/testdata/types/receiver.vv
diff --git a/...stdata/types/slice_and_index_expression.v → ...tdata/types/slice_and_index_expression.vv b/...stdata/types/slice_and_index_expression.v → ...tdata/types/slice_and_index_expression.vv
diff --git a/tests/testdata/types/type_initializer.v → tests/testdata/types/type_initializer.vv b/tests/testdata/types/type_initializer.v → tests/testdata/types/type_initializer.vv
diff --git a/tests/testdata/types/unsafe_expression.v → tests/testdata/types/unsafe_expression.vv b/tests/testdata/types/unsafe_expression.v → tests/testdata/types/unsafe_expression.vv
diff --git a/tests/types.v b/tests/types.v
@@ -5,26 +5,26 @@ import testing
 fn types() testing.Tester {
 	mut t := testing.with_name('types')
 
-	t.type_test('literals', 'types/literals.v')
-	t.type_test('parameters types', 'types/parameters.v')
-	t.type_test('call expressions', 'types/call_expression.v')
-	t.type_test('type initializer', 'types/type_initializer.v')
-	t.type_test('for loops', 'types/for_loops.v')
-	t.type_test('slice and index expression', 'types/slice_and_index_expression.v')
-	t.type_test('function literal', 'types/function_literal.v')
-	t.type_test('pointers', 'types/pointers.v')
-	t.type_test('bool operators', 'types/bool_operators.v')
-	t.type_test('unsafe expression', 'types/unsafe_expression.v')
-	t.type_test('if expression', 'types/if_expression.v')
-	t.type_test('match expression', 'types/match_expression.v')
-	t.type_test('map init expression', 'types/map_init_expression.v')
-	t.type_test('chan type', 'types/chan_type.v')
-	t.type_test('struct fields', 'types/fields.v')
-	t.type_test('receiver', 'types/receiver.v')
-	t.type_test('json decode', 'types/json_decode.v')
-	t.type_test('generics', 'types/generics.v')
-	t.type_test('constants', 'types/constants.v')
-	t.type_test('for loop', 'types/for_loop.v')
+	t.type_test('literals', 'types/literals.vv')
+	t.type_test('parameters types', 'types/parameters.vv')
+	t.type_test('call expressions', 'types/call_expression.vv')
+	t.type_test('type initializer', 'types/type_initializer.vv')
+	t.type_test('for loops', 'types/for_loops.vv')
+	t.type_test('slice and index expression', 'types/slice_and_index_expression.vv')
+	t.type_test('function literal', 'types/function_literal.vv')
+	t.type_test('pointers', 'types/pointers.vv')
+	t.type_test('bool operators', 'types/bool_operators.vv')
+	t.type_test('unsafe expression', 'types/unsafe_expression.vv')
+	t.type_test('if expression', 'types/if_expression.vv')
+	t.type_test('match expression', 'types/match_expression.vv')
+	t.type_test('map init expression', 'types/map_init_expression.vv')
+	t.type_test('chan type', 'types/chan_type.vv')
+	t.type_test('struct fields', 'types/fields.vv')
+	t.type_test('receiver', 'types/receiver.vv')
+	t.type_test('json decode', 'types/json_decode.vv')
+	t.type_test('generics', 'types/generics.vv')
+	t.type_test('constants', 'types/constants.vv')
+	t.type_test('for loop', 'types/for_loop.vv')
 
 	return t
 }
diff --git a/tree_sitter_v/test/corpus/compile_time.txt b/tree_sitter_v/test/corpus/compile_time.txt
@@ -1,7 +1,7 @@
 ================================================================================
 Compile-time call expression
 ================================================================================
-$embed_file('stubs/arrays.v', .zlib)
+$embed_file('stubs/arrays.vv', .zlib)
 --------------------------------------------------------------------------------
 
 (source_file