Skip to content

Detect AttributeApplication completion context for unfinished attributes #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TIHan merged 7 commits into from
Dec 17, 2017
Merged

Detect AttributeApplication completion context for unfinished attributes #4126

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dae0ad7
detect AttributeApplication completion context for unfinished attributes
vasily-kirichenko Dec 16, 2017
3673d66
fix whitespace sensitiveness, add more tests
vasily-kirichenko Dec 16, 2017
2c90332
more tests
vasily-kirichenko Dec 16, 2017
902a04c
support ":" in attribute names
vasily-kirichenko Dec 16, 2017
80bd40e
fix tests
vasily-kirichenko Dec 16, 2017
11dc2dd
pass ParsedInput instead of ParsedInput option to TryGetCompletionCon…
vasily-kirichenko Dec 16, 2017
25dae9e
refactor tests
vasily-kirichenko Dec 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor tests
  • Loading branch information
@vasily-kirichenko
vasily-kirichenko committed Dec 17, 2017
commit 25dae9e3000881922c2df8f8bf15645f0a152a39
325 changes: 51 additions & 274 deletions tests/service/ServiceUntypedParseTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ open Tests.Service

let [<Literal>] private Marker = "(* marker *)"

let (=>) (source: string) (expected: CompletionContext option) =
let private (=>) (source: string) (expected: CompletionContext option) =

let lines =
use reader = new StringReader(source)
Expand Down Expand Up @@ -49,277 +49,54 @@ let (=>) (source: string) (expected: CompletionContext option) =
printfn "ParseTree: %A" parseTree
reraise()

(*** open ended attribute ***)

[<Test>]
let ``AttributeApplication completion context at [<|``() =
"""
module AttributeCompletion =
[<Test>]
let ``at [<|, applied to nothing``() =
"""
[<(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttr|``() =
"""
[<AnAttr(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<type:|``() =
"""
[<type:(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<type:AnAttr|``() =
"""
[<type:AnAttr(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [< |``() =
"""
[< (* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute;|``() =
"""
[<AnAttribute;(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute; |``() =
"""
[<AnAttribute; (* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute>][<|``() =
"""
[<AnAttribute>][<(* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute>][< |``() =
"""
[<AnAttribute>][< (* marker *)
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute(|``() =
"""
[<AnAttribute((* marker *)
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute( |``() =
"""
[<AnAttribute( (* marker *)
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute |``() =
"""
[<AnAttribute (* marker *)
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute>][<AnAttribute(|``() =
"""
[<AnAttribute>][<AnAttribute((* marker *)
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute; AnAttribute(|``() =
"""
[<AnAttribute; AnAttribute((* marker *)
type T =
{ F: int }
"""
=> None

(*** closed attribute ***)

[<Test>]
let ``AttributeApplication completion context at [<|>]``() =
"""
[<(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttr|>]``() =
"""
[<AnAttr(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<type:|>]``() =
"""
[<type:(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<type:AnAttr|>]``() =
"""
[<type:AnAttr(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication


[<Test>]
let ``AttributeApplication completion context at [< |>]``() =
"""
[< (* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute>][<|>]``() =
"""
[<AnAttribute>][<(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute>][< |>]``() =
"""
[<AnAttribute>][< (* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute;|>]``() =
"""
[<AnAttribute;(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute; | >]``() =
"""
[<AnAttribute; (* marker *) >]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``AttributeApplication completion context at [<AnAttribute>][<AnAttribute; | >]``() =
"""
[<AnAttribute>][<AnAttribute;(* marker *)>]
type T =
{ F: int }
"""
=> Some CompletionContext.AttributeApplication

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute(|>]``() =
"""
[<AnAttribute((* marker *)>]
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute | >]``() =
"""
[<AnAttribute (* marker *) >]
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute>][<AnAttribute( | >]``() =
"""
[<AnAttribute>][<AnAttribute((* marker *)>]
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute; AnAttribute(| >]``() =
"""
[<AnAttribute; AnAttribute((* marker *)>]
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute; AnAttribute( | >]``() =
"""
[<AnAttribute; AnAttribute( (* marker *)>]
type T =
{ F: int }
"""
=> None

[<Test>]
let ``No AttributeApplication completion context at [<AnAttribute>][<AnAttribute; AnAttribute(| >]``() =
"""
[<AnAttribute>][<AnAttribute; AnAttribute((* marker *)>]
type T =
{ F: int }
"""
=> None
"""
=> Some CompletionContext.AttributeApplication

[<TestCase ("[<(* marker *)", true)>]
[<TestCase ("[<AnAttr(* marker *)", true)>]
[<TestCase ("[<type:(* marker *)", true)>]
[<TestCase ("[<type:AnAttr(* marker *)", true)>]
[<TestCase ("[< (* marker *)", true)>]
[<TestCase ("[<AnAttribute;(* marker *)", true)>]
[<TestCase ("[<AnAttribute; (* marker *)", true)>]
[<TestCase ("[<AnAttribute>][<(* marker *)", true)>]
[<TestCase ("[<AnAttribute>][< (* marker *)", true)>]
[<TestCase ("[<AnAttribute((* marker *)", false)>]
[<TestCase ("[<AnAttribute( (* marker *)", false)>]
[<TestCase ("[<AnAttribute (* marker *)", false)>]
[<TestCase ("[<AnAttribute>][<AnAttribute((* marker *)", false)>]
[<TestCase ("[<AnAttribute; AnAttribute((* marker *)", false)>]
let ``incomplete``(lineStr: string, expectAttributeApplicationContext: bool) =
(sprintf """
%s
type T =
{ F: int }
""" lineStr) => (if expectAttributeApplicationContext then Some CompletionContext.AttributeApplication else None)

[<TestCase ("[<(* marker *)>]", true)>]
[<TestCase ("[<AnAttr(* marker *)>]", true)>]
[<TestCase ("[<type:(* marker *)>]", true)>]
[<TestCase ("[<type:AnAttr(* marker *)>]", true)>]
[<TestCase ("[< (* marker *)>]", true)>]
[<TestCase ("[<AnAttribute>][<(* marker *)>]", true)>]
[<TestCase ("[<AnAttribute>][< (* marker *)>]", true)>]
[<TestCase ("[<AnAttribute;(* marker *)>]", true)>]
[<TestCase ("[<AnAttribute; (* marker *) >]", true)>]
[<TestCase ("[<AnAttribute>][<AnAttribute;(* marker *)>]", true)>]
[<TestCase ("[<AnAttribute((* marker *)>]", false)>]
[<TestCase ("[<AnAttribute (* marker *) >]", false)>]
[<TestCase ("[<AnAttribute>][<AnAttribute((* marker *)>]", false)>]
[<TestCase ("[<AnAttribute; AnAttribute((* marker *)>]", false)>]
[<TestCase ("[<AnAttribute; AnAttribute( (* marker *)>]", false)>]
[<TestCase ("[<AnAttribute>][<AnAttribute; AnAttribute((* marker *)>]", false)>]
let ``complete``(lineStr: string, expectAttributeApplicationContext: bool) =
(sprintf """
%s
type T =
{ F: int }
""" lineStr) => (if expectAttributeApplicationContext then Some CompletionContext.AttributeApplication else None)