Add lexing of commas and fix SwiftLint warnings.

ocelotgraphql · Dec 9, 2018 · 5f16dc4 · 5f16dc4
1 parent 71e2b73
commit 5f16dc4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/Sources/GraphQL/Language/Lexer/Lexer.swift b/Sources/GraphQL/Language/Lexer/Lexer.swift
@@ -231,6 +231,7 @@ private let punctuationTokens: [UInt32: Lexer.Token.Kind] = [
 	38: .ampersand,
 	40: .openingParenthesis,
 	41: .closingParenthesis,
+	44: .comma,
 	46: .spread,
 	58: .colon,
 	61: .equals,

diff --git a/Sources/GraphQL/Language/Lexer/Token.swift b/Sources/GraphQL/Language/Lexer/Token.swift
@@ -47,6 +47,7 @@ extension Lexer.Token {
 		case ampersand
 		case openingParenthesis
 		case closingParenthesis
+		case comma
 		case int
 		case float
 		case spread

diff --git a/Tests/GraphQLTests/Language/Lexer/LexerPunctuationTokenTestCase.swift b/Tests/GraphQLTests/Language/Lexer/LexerPunctuationTokenTestCase.swift
@@ -6,6 +6,10 @@ final class LexerPunctuationTokenTestCase: XCTestCase {
 		XCTAssertLexing("!", spitsOutPunctuationTokenOfKind: .bang)
 	}
 
+	func testItLexesCommas() {
+		XCTAssertLexing(",", spitsOutPunctuationTokenOfKind: .comma)
+	}
+
 	func testItLexesDollars() {
 		XCTAssertLexing("$", spitsOutPunctuationTokenOfKind: .dollar)
 	}

diff --git a/Tests/GraphQLTests/Language/Lexer/LexerTestCase.swift b/Tests/GraphQLTests/Language/Lexer/LexerTestCase.swift
@@ -2,28 +2,28 @@ import XCTest
 @testable import GraphQL
 
 final class LexerTestCase: XCTestCase {
-	func testItLexesAComplexQuery() {
-		let query = """
-		{
-			viewer {
-				...SmallUser
-				followers(first: 100) {
-					edges {
-						node {
-							...SmallUser
-						}
+	private let validGraphQLQuery = """
+	{
+		viewer {
+			...SmallUser
+			followers(first: 100) {
+				edges {
+					node {
+						...SmallUser
 					}
 				}
 			}
 		}
+	}
 
-		fragment SmallUser on User {
-			id
-			name
-		}
-		"""
+	fragment SmallUser on User {
+		id
+		name
+	}
+	"""
 
-		XCTAssertLexing(query, spitsOut: [
+	func testItLexesAComplexQuery() {
+		XCTAssertLexing(validGraphQLQuery, spitsOut: [
 			Lexer.Token(ofKind: GraphQL.Lexer.Token.Kind.openingBrace, startingAt: 0, endingAt: 1),
 			Lexer.Token(ofKind: GraphQL.Lexer.Token.Kind.name, startingAt: 3, endingAt: 9, holding: "viewer"),
 			Lexer.Token(ofKind: GraphQL.Lexer.Token.Kind.openingBrace, startingAt: 10, endingAt: 11),