Merge pull request atom#255 from falcondai/fix-lambda

Max Brunsfeld · web-flow · commit 9efeb2a96768 · 2018-04-24T13:54:14.000-07:00
add more test cases for lambda tokenization
diff --git a/grammars/python.cson b/grammars/python.cson
@@ -335,7 +335,7 @@
     ]
   }
   {
-    'begin': '\\b(lambda)\\s?+'
+    'begin': '\\b(lambda)\\b'
     'beginCaptures':
       '1':
         'name': 'storage.type.function.inline.python'
diff --git a/spec/python-spec.coffee b/spec/python-spec.coffee
@@ -721,7 +721,6 @@ describe "Python grammar", ->
     {tokens} = grammar.tokenizeLine "lambda x, z = 4: x * z"
 
     expect(tokens[0]).toEqual value: 'lambda', scopes: ['source.python', 'meta.function.inline.python', 'storage.type.function.inline.python']
-    expect(tokens[1]).toEqual value: ' ', scopes: ['source.python', 'meta.function.inline.python']
     expect(tokens[2]).toEqual value: 'x', scopes: ['source.python', 'meta.function.inline.python', 'meta.function.inline.parameters.python', 'variable.parameter.function.python']
     expect(tokens[3]).toEqual value: ',', scopes: ['source.python', 'meta.function.inline.python', 'meta.function.inline.parameters.python', 'punctuation.separator.parameters.python']
     expect(tokens[5]).toEqual value: 'z', scopes: ['source.python', 'meta.function.inline.python', 'meta.function.inline.parameters.python', 'variable.parameter.function.python']
@@ -735,10 +734,14 @@ describe "Python grammar", ->
     expect(tokens[0]).toEqual value: 'lambda', scopes: ['source.python', 'meta.function.inline.python', 'storage.type.function.inline.python']
     expect(tokens[1]).toEqual value: ':', scopes: ['source.python', 'meta.function.inline.python', 'punctuation.definition.function.begin.python']
 
-  it "does not tokenizes a variable name containing lambda as a lambda", ->
+  it "does not tokenizes a variable name ending with lambda as a lambda", ->
     {tokens} = grammar.tokenizeLine "not_a_lambda.foo"
     expect(tokens[0]).toEqual value: 'not_a_lambda', scopes: ['source.python', 'variable.other.object.python']
 
+  it "does not tokenizes a variable name starting with lambda as a lambda", ->
+    {tokens} = grammar.tokenizeLine "lambda_not.foo"
+    expect(tokens[0]).toEqual value: 'lambda_not', scopes: ['source.python', 'variable.other.object.python']
+
   describe "SQL highlighting", ->
     beforeEach ->
       waitsForPromise ->

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@`
`335`	`335`	`]`
`336`	`336`	`}`
`337`	`337`	`{`
`338`		`- 'begin': '\\b(lambda)\\s?+'`
	`338`	`+ 'begin': '\\b(lambda)\\b'`
`339`	`339`	`'beginCaptures':`
`340`	`340`	`'1':`
`341`	`341`	`'name': 'storage.type.function.inline.python'`