feat(Lezer grammar): Allow tabs (#3742)

PRQL · Oct 24, 2023 · bb96b0c · bb96b0c
1 parent 5f133b3
commit bb96b0c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/grammars/prql-lezer/src/highlight.js b/grammars/prql-lezer/src/highlight.js
@@ -11,6 +11,7 @@ export const prqlHighlight = styleTags({
   Boolean: t.bool,
   Integer: t.integer,
   Float: t.float,
+  TypeTerm: t.typeName,
   Escape: t.escape,
   String: t.string,
   FString: t.special(t.string),

diff --git a/grammars/prql-lezer/src/prql.grammar b/grammars/prql-lezer/src/prql.grammar
@@ -136,7 +136,7 @@ LambdaParam { identPart TypeDefinition? (":" expression)? }
   Float { @digit ( @digit | "_" )* "." @digit ( @digit | "_" )* ("e" Integer)? }
   // TODO: This is not as precise as PRQL, which doesn't allow trailing
   // underscores and allows no digit before the decimal point.
-  space { " "+ }
+  space { $[ \t] }
 
   Escape {
     "\\" ("x" hex hex | "u" "{" hex+ "}" | $[bfnrt])

diff --git a/grammars/prql-lezer/test/misc.txt b/grammars/prql-lezer/test/misc.txt
@@ -87,6 +87,14 @@ let my_func = arg1 arg2 -> arg1 + arg2
 
 Query(Statements(VariableDeclaration(let,VariableName,Equals,Lambda(LambdaParam,LambdaParam,BinaryExpression(Identifier,ArithOp,Identifier)))))
 
+# Function declaration with type annotation
+
+let my_func = arg1<int32> -> arg1
+
+==>
+
+Query(Statements(VariableDeclaration(let,VariableName,Equals,Lambda(LambdaParam(TypeDefinition(TypeTerm)),Identifier))))
+
 # Simple pipeline
 
 from foo | select bar
@@ -117,3 +125,11 @@ group customer_id (
 ==>
 
 Query(Statements(PipelineStatement(Pipeline(CallExpression(Identifier,Identifier,NestedPipeline(Pipeline(CallExpression(Identifier,TupleExpression(CallExpression(Identifier,Identifier))))))))))
+
+# Tabs as spaces
+
+let		foo		=		(1)
+
+==>
+
+Query(Statements(VariableDeclaration(let,VariableName,Equals,NestedPipeline(Pipeline(Integer)))))