averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libSyntax] Remove the C++ SyntaxClassifier

Browse Source 
The recommended way forward is to use the SyntaxClassifier on the Swift
side.

By removing the C++ SyntaxClassifier, we can also eliminate the
-force-libsyntax-based-processing option that was used to bootstrap
incremental parsing and would generate the syntax map from a syntax
tree.
This commit is contained in:
Alex Hoppen
2018-07-27 14:14:25 -07:00
parent bae048123d
commit 749a13a6fe
38 changed files with 200 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
test/SourceKit/SyntaxMapData/syntaxmap-edit-nested-token.swift
View File

@@ -1,7 +1,5 @@
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift -pos=10:43 -replace='impact' -length=6 | %sed_clean > %t.response
// RUN: %FileCheck -input-file=%t.response %s --check-prefixes CHECK,CHECK-OLD
// RUN: %sourcekitd-test -req=open -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift -force-libsyntax-based-processing == -req=edit -print-raw-response %S/Inputs/syntaxmap-edit-nested-token.swift -pos=10:43 -replace='impact' -length=6 -force-libsyntax-based-processing | %sed_clean > %t.libsyntax.response
// RUN: %FileCheck -input-file=%t.libsyntax.response %s --check-prefixes CHECK,CHECK-NEW
// RUN: %FileCheck -input-file=%t.response %s
// Original file contents
@@ -13,61 +11,48 @@
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 0,
// CHECK-OLD-NEXT: key.length: 29
// CHECK-NEW-NEXT: key.length: 28
// CHECK-NEXT: key.length: 29
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 29,
// CHECK-OLD-NEXT: key.length: 4
// CHECK-NEW-NEXT: key.length: 3
// CHECK-NEXT: key.length: 4
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 33,
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-NEXT: key.offset: 39,
// CHECK-NEXT: key.length: 9
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 48,
// CHECK-NEXT: key.length: 28
// CHECK-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 33,
// CHECK-OLD-NEXT: key.length: 6
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-OLD-NEXT: key.offset: 39,
// CHECK-OLD-NEXT: key.length: 9
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 48,
// CHECK-OLD-NEXT: key.length: 28
// CHECK-OLD-NEXT: },
// CHECK-NEW-NEXT: {
// CHECK-NEW-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEW-NEXT: key.offset: 33,
// CHECK-NEW-NEXT: key.length: 42
// CHECK-NEW-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 76,
// CHECK-OLD-NEXT: key.length: 4
// CHECK-NEW-NEXT: key.length: 3
// CHECK-NEXT: key.length: 4
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 80,
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-NEXT: key.offset: 86,
// CHECK-NEXT: key.length: 7
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 93,
// CHECK-NEXT: key.length: 19
// CHECK-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 80,
// CHECK-OLD-NEXT: key.length: 6
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-OLD-NEXT: key.offset: 86,
// CHECK-OLD-NEXT: key.length: 7
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 93,
// CHECK-OLD-NEXT: key.length: 19
// CHECK-OLD-NEXT: },
// CHECK-NEW-NEXT: {
// CHECK-NEW-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEW-NEXT: key.offset: 80,
// CHECK-NEW-NEXT: key.length: 31
// CHECK-NEW-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.keyword,
// CHECK-NEXT: key.offset: 112,
@@ -121,61 +106,48 @@
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 221,
// CHECK-OLD-NEXT: key.length: 35
// CHECK-NEW-NEXT: key.length: 34
// CHECK-NEXT: key.length: 35
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 256,
// CHECK-OLD-NEXT: key.length: 4
// CHECK-NEW-NEXT: key.length: 3
// CHECK-NEXT: key.length: 4
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 260,
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-NEXT: key.offset: 266,
// CHECK-NEXT: key.length: 9
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 275,
// CHECK-NEXT: key.length: 28
// CHECK-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 260,
// CHECK-OLD-NEXT: key.length: 6
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-OLD-NEXT: key.offset: 266,
// CHECK-OLD-NEXT: key.length: 9
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 275,
// CHECK-OLD-NEXT: key.length: 28
// CHECK-OLD-NEXT: },
// CHECK-NEW-NEXT: {
// CHECK-NEW-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEW-NEXT: key.offset: 260,
// CHECK-NEW-NEXT: key.length: 42
// CHECK-NEW-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 303,
// CHECK-OLD-NEXT: key.length: 4
// CHECK-NEW-NEXT: key.length: 3
// CHECK-NEXT: key.length: 4
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 307,
// CHECK-NEXT: key.length: 6
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-NEXT: key.offset: 313,
// CHECK-NEXT: key.length: 7
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEXT: key.offset: 320,
// CHECK-NEXT: key.length: 19
// CHECK-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 307,
// CHECK-OLD-NEXT: key.length: 6
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment.field,
// CHECK-OLD-NEXT: key.offset: 313,
// CHECK-OLD-NEXT: key.length: 7
// CHECK-OLD-NEXT: },
// CHECK-OLD-NEXT: {
// CHECK-OLD-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-OLD-NEXT: key.offset: 320,
// CHECK-OLD-NEXT: key.length: 19
// CHECK-OLD-NEXT: },
// CHECK-NEW-NEXT: {
// CHECK-NEW-NEXT: key.kind: source.lang.swift.syntaxtype.doccomment,
// CHECK-NEW-NEXT: key.offset: 307,
// CHECK-NEW-NEXT: key.length: 31
// CHECK-NEW-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: key.kind: source.lang.swift.syntaxtype.keyword,
// CHECK-NEXT: key.offset: 339,