Skip to content

Commit c3f97b9

Browse files
committed
Revert "Merge pull request #1854 from matthewbastien/documentation-language-service"
This reverts commit 9bbb8f3, reversing changes made to 21dfaf0.
1 parent 85828ee commit c3f97b9

File tree

8 files changed

+1
-318
lines changed

8 files changed

+1
-318
lines changed

Contributor Documentation/LSP Extensions.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,3 @@ export interface GetReferenceDocumentResult {
622622
content: string;
623623
}
624624
```
625-
626-
## Languages
627-
628-
Added a new language with the identifier `tutorial` to support the `*.tutorial` files that
629-
Swift DocC uses to define tutorials and tutorial overviews in its documentation catalogs.
630-
It is expected that editors send document events for `tutorial` and `markdown` files if
631-
they wish to request information about these files from SourceKit-LSP.

Sources/BuildSystemIntegration/BuildSystemManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ package actor BuildSystemManager: QueueBasedMessageHandler {
635635
}
636636

637637
switch language {
638-
case .swift, .markdown, .tutorial:
638+
case .swift:
639639
return await toolchainRegistry.preferredToolchain(containing: [\.sourcekitd, \.swift, \.swiftc])
640640
case .c, .cpp, .objective_c, .objective_cpp:
641641
return await toolchainRegistry.preferredToolchain(containing: [\.clang, \.clangd])

Sources/LanguageServerProtocol/SupportTypes/Language.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ extension Language: CustomStringConvertible, CustomDebugStringConvertible {
9292
case .shellScript: return "Shell Script (Bash)"
9393
case .sql: return "SQL"
9494
case .swift: return "Swift"
95-
case .tutorial: return "Tutorial"
9695
case .typeScript: return "TypeScript"
9796
case .typeScriptReact: return "TypeScript React"
9897
case .tex: return "TeX"
@@ -154,7 +153,6 @@ public extension Language {
154153
static let shellScript = Language(rawValue: "shellscript") // Shell Script (Bash)
155154
static let sql = Language(rawValue: "sql")
156155
static let swift = Language(rawValue: "swift")
157-
static let tutorial = Language(rawValue: "tutorial") // LSP Extension: Swift DocC Tutorial
158156
static let typeScript = Language(rawValue: "typescript")
159157
static let typeScriptReact = Language(rawValue: "typescriptreact") // TypeScript React
160158
static let tex = Language(rawValue: "tex")

Sources/SKTestSupport/Utils.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ extension Language {
2626
var fileExtension: String {
2727
switch self {
2828
case .objective_c: return "m"
29-
case .markdown: return "md"
30-
case .tutorial: return "tutorial"
3129
default: return self.rawValue
3230
}
3331
}
@@ -39,8 +37,6 @@ extension Language {
3937
case "m": self = .objective_c
4038
case "mm": self = .objective_cpp
4139
case "swift": self = .swift
42-
case "md": self = .markdown
43-
case "tutorial": self = .tutorial
4440
default: return nil
4541
}
4642
}

Sources/SourceKitLSP/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ target_sources(SourceKitLSP PRIVATE
2424
Clang/ClangLanguageService.swift
2525
Clang/SemanticTokenTranslator.swift
2626
)
27-
target_sources(SourceKitLSP PRIVATE
28-
Documentation/DocumentationLanguageService.swift
29-
)
3027
target_sources(SourceKitLSP PRIVATE
3128
Swift/AdjustPositionToStartOfIdentifier.swift
3229
Swift/ClosureCompletionFormat.swift

Sources/SourceKitLSP/Documentation/DocumentationLanguageService.swift

Lines changed: 0 additions & 255 deletions
This file was deleted.

Sources/SourceKitLSP/LanguageServerType.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ import LanguageServerProtocol
1717
enum LanguageServerType: Hashable {
1818
case clangd
1919
case swift
20-
case documentation
2120

2221
init?(language: Language) {
2322
switch language {
2423
case .c, .cpp, .objective_c, .objective_cpp:
2524
self = .clangd
2625
case .swift:
2726
self = .swift
28-
case .markdown, .tutorial:
29-
self = .documentation
3027
default:
3128
return nil
3229
}
@@ -47,8 +44,6 @@ enum LanguageServerType: Hashable {
4744
return ClangLanguageService.self
4845
case .swift:
4946
return SwiftLanguageService.self
50-
case .documentation:
51-
return DocumentationLanguageService.self
5247
}
5348
}
5449
}

Tests/SourceKitLSPTests/DocumentationLanguageServiceTests.swift

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)