Fix minor bugs & add tests

SpyglassMC · Jul 7, 2024 · 27751ce · 27751ce
1 parent b5ffbb2
commit 27751ce
Show file tree

Hide file tree

Showing 6 changed files with 174 additions and 10 deletions.
diff --git a/__snapshots__/packages/mcdoc/test-out/__fixture__/simple_types.spec.js b/__snapshots__/packages/mcdoc/test-out/__fixture__/simple_types.spec.js
diff --git a/__snapshots__/packages/mcdoc/test-out/parser/syntax/type/numericType.spec.js b/__snapshots__/packages/mcdoc/test-out/parser/syntax/type/numericType.spec.js
diff --git a/__snapshots__/packages/mcdoc/test-out/parser/syntax/type/primitiveArrayType.spec.js b/__snapshots__/packages/mcdoc/test-out/parser/syntax/type/primitiveArrayType.spec.js
diff --git a/packages/mcdoc/src/parser/index.ts b/packages/mcdoc/src/parser/index.ts
@@ -919,7 +919,7 @@ export const numericType: Parser<NumericTypeNode> = typeBase(
 		),
 	}, {
 		predicate: (src) => src.tryPeek('long'),
-		parser: syntax([keyword(NumericTypeIntKinds, { colorTokenType: 'type' }), atLongRange], true),
+		parser: syntax([keyword('long', { colorTokenType: 'type' }), atLongRange], true),
 	}, {
 		parser: syntax([keyword(NumericTypeIntKinds, { colorTokenType: 'type' }), atIntRange], true),
 	}]),
@@ -928,10 +928,12 @@ export const numericType: Parser<NumericTypeNode> = typeBase(
 export const primitiveArrayType: Parser<PrimitiveArrayTypeNode> = typeBase(
 	'mcdoc:type/primitive_array',
 	syntax([
-		any([
-			sequence([literal('long'), atLongRange]),
-			sequence([literal(PrimitiveArrayValueKinds), atIntRange]),
-		]),
+		select([{
+			predicate: (src) => src.tryPeek('long'),
+			parser: syntax([literal('long'), atLongRange], true),
+		}, {
+			parser: syntax([literal(PrimitiveArrayValueKinds), atIntRange], true),
+		}]),
 		keyword('[]', { allowedChars: new Set(['[', ']']), colorTokenType: 'type' }),
 		atIntRange,
 	]),

diff --git a/packages/mcdoc/src/runtime/completer/index.ts b/packages/mcdoc/src/runtime/completer/index.ts
@@ -2,6 +2,7 @@ import type * as core from '@spyglassmc/core'
 import { TypeDefSymbolData } from '../../binder/index.js'
 import type {
 	LiteralType,
+	LongType,
 	McdocType,
 	NumericType,
 	StringType,
@@ -174,7 +175,7 @@ function getStringCompletions(
 }
 
 function getNumericCompletions(
-	typeDef: core.DeepReadonly<NumericType>,
+	typeDef: core.DeepReadonly<NumericType | LongType>,
 	ctx: McdocCompleterContext,
 ) {
 	const ans: SimpleCompletionValue[] = []

diff --git a/packages/mcdoc/test/parser/index.spec.ts b/packages/mcdoc/test/parser/index.spec.ts
@@ -176,6 +176,8 @@ const Suites: Record<
 				'int @ 4..',
 				'int @ ..4',
 				'int @ 0..1',
+				'int @ 10000000000000001',
+				'long @ 10000000000000001',
 				'[email protected]',
 				'double[]',
 			],
@@ -189,6 +191,7 @@ const Suites: Record<
 				'[email protected][]',
 				'int[] @ 4',
 				'byte @ 0..1 [] @ 0..',
+				'long @ 10000000000000001.. [] @ 0..',
 			],
 		},
 		referenceType: { content: ['', '#[uuid] UuidMostLeast', 'MinMaxBounds<float @ 1..2>'] },