Skip to content

Implement SE-0039 (Modernizing Playground Literals) #2215

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
merged 14 commits into from
Apr 25, 2016
Merged

Implement SE-0039 (Modernizing Playground Literals) #2215

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d37dafa
Implement the majority of parsing support for SE-0039.
tkremenek Apr 16, 2016
1156672
Parse old object literals names using new syntax and provide FixIt.
tkremenek Apr 19, 2016
c05962e
Add back pieces of syntax map for object literals.
tkremenek Apr 19, 2016
d7f1f69
Add parsing support for old object literal syntax.
tkremenek Apr 22, 2016
074eca2
Improve parsing of invalid object literals with old syntax.
tkremenek Apr 23, 2016
48af582
Do not include bracket in code completion results.
tkremenek Apr 23, 2016
d08b8a7
Remove defunct code in SyntaxModel.
tkremenek Apr 23, 2016
08ec512
Add tests for migration fixits.
tkremenek Apr 25, 2016
56004b4
Add literals to code completion overload tests.
tkremenek Apr 25, 2016
21308a5
Clean up response tests not to include full paths.
tkremenek Apr 25, 2016
082034c
Further adjust offsets.
tkremenek Apr 25, 2016
87eeef2
Merge branch 'master' into master-PR-SE-0039
tkremenek Apr 25, 2016
d54472f
Mark initializer for _ColorLiteralConvertible in UIKit as @nonobjc.
tkremenek Apr 25, 2016
9820a2e
Put attribute in the correct place.
tkremenek Apr 25, 2016
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
Next Next commit
Do not include bracket in code completion results.
  • Loading branch information
@tkremenek
tkremenek committed Apr 23, 2016
commit 48af5823122ab4e8d396451112b832fe4edfa880
4 changes: 0 additions & 4 deletions lib/IDE/CodeCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3212,7 +3212,6 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {

auto floatType = context.getFloatDecl()->getDeclaredType();
addFromProto(LK::ColorLiteral, "", [&](Builder &builder) {
builder.addLeftBracket();
builder.addTextChunk("#colorLiteral");
builder.addLeftParen();
builder.addCallParameter(context.getIdentifier("red"),
Expand All @@ -3227,18 +3226,15 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
builder.addCallParameter(context.getIdentifier("alpha"), floatType,
false, true);
builder.addRightParen();
builder.addRightBracket();
});

auto stringType = context.getStringDecl()->getDeclaredType();
addFromProto(LK::ImageLiteral, "", [&](Builder &builder) {
builder.addLeftBracket();
builder.addTextChunk("#imageLiteral");
builder.addLeftParen();
builder.addCallParameter(context.getIdentifier("resourceName"),
stringType, false, true);
builder.addRightParen();
builder.addRightBracket();
});

// Add tuple completion (item, item).
Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %sourcekitd-test -req=syntax-map %s > %t.response
// RUN: diff -u %s.response %t.response

let x = [#Cloud(tube: true)#]
let x = #Cloud(tube: true)
51 changes: 47 additions & 4 deletions test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
key.offset: 0,
key.length: 129,
key.length: 126,
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.syntaxmap: [
{
Expand All @@ -24,9 +24,52 @@
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.objectliteral,
key.offset: 107,
key.length: 21
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 108,
key.length: 5
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.offset: 114,
key.length: 4
},
{
key.kind: source.lang.swift.syntaxtype.keyword,
key.offset: 120,
key.length: 4
}
],
key.diagnostics: [
{
key.line: 4,
key.column: 8,
key.filepath: "/Volumes/Data/Users/kremenek/Desktop/sources/swift-tkremenek/test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift",
key.severity: source.diagnostic.severity.error,
key.description: "consecutive statements on a line must be separated by ';'",
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.fixits: [
{
key.offset: 106,
key.length: 0,
key.sourcetext: ";"
}
]
},
{
key.line: 4,
key.column: 9,
key.filepath: "/Volumes/Data/Users/kremenek/Desktop/sources/swift-tkremenek/test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift",
key.severity: source.diagnostic.severity.error,
key.description: "expected initial value after '='",
key.diagnostic_stage: source.diagnostic.stage.swift.parse
},
{
key.line: 4,
key.column: 9,
key.filepath: "/Volumes/Data/Users/kremenek/Desktop/sources/swift-tkremenek/test/SourceKit/SyntaxMapData/syntaxmap-object-literals.swift",
key.severity: source.diagnostic.severity.error,
key.description: "expected expression",
key.diagnostic_stage: source.diagnostic.stage.swift.parse
}
]
}