Skip to content

Commit 340cfa9

Browse files
tomblachutintellij-monorepo-bot
authored andcommitted
[ts] WEB-68026 return TypeScriptServiceStandardOutputProtocol from createProtocol
GitOrigin-RevId: 8807c162e540560e097c45a4bb93e15b24157469
1 parent f9b1f18 commit 340cfa9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Angular/src/org/angular2/lang/expr/service/Angular2TypeScriptService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import com.intellij.lang.javascript.integration.JSAnnotationRangeError
1010
import com.intellij.lang.javascript.psi.JSElement
1111
import com.intellij.lang.javascript.psi.JSType
1212
import com.intellij.lang.javascript.service.JSLanguageServiceUtil
13-
import com.intellij.lang.javascript.service.protocol.JSLanguageServiceProtocol
1413
import com.intellij.lang.javascript.service.withScopedServiceTraceSpan
1514
import com.intellij.lang.javascript.service.withServiceTraceSpan
1615
import com.intellij.lang.typescript.compiler.TypeScriptService
@@ -19,6 +18,7 @@ import com.intellij.lang.typescript.compiler.languageService.TypeScriptLanguageS
1918
import com.intellij.lang.typescript.compiler.languageService.TypeScriptServerServiceImpl
2019
import com.intellij.lang.typescript.compiler.languageService.TypeScriptServiceWidgetItem
2120
import com.intellij.lang.typescript.compiler.languageService.protocol.TypeScriptLanguageServiceCache
21+
import com.intellij.lang.typescript.compiler.languageService.protocol.TypeScriptServiceStandardOutputProtocol
2222
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.Position
2323
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.Range
2424
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.TypeScriptTypeRequestKind
@@ -155,7 +155,7 @@ class Angular2TypeScriptService(project: Project) : TypeScriptServerServiceImpl(
155155
private fun isAngularServiceAvailableByContext(context: VirtualFile): Boolean =
156156
isAngularTypeScriptServiceEnabled(myProject, context)
157157

158-
override fun createProtocol(tsServicePath: String): JSLanguageServiceProtocol =
158+
override fun createProtocol(tsServicePath: String): TypeScriptServiceStandardOutputProtocol =
159159
Angular2TypeScriptServiceProtocol(myProject, mySettings, createEventConsumer(), serviceName, tsServicePath)
160160

161161
override fun createWidgetItem(currentFile: VirtualFile?): LanguageServiceWidgetItem =

vuejs/src/org/jetbrains/vuejs/lang/typescript/service/classic/VueClassicTypeScriptService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import com.intellij.lang.javascript.integration.JSAnnotationError
66
import com.intellij.lang.javascript.psi.JSEmbeddedContent
77
import com.intellij.lang.javascript.service.JSLanguageServiceAnnotationResult
88
import com.intellij.lang.javascript.service.JSLanguageServiceFileCommandCache
9-
import com.intellij.lang.javascript.service.protocol.JSLanguageServiceProtocol
109
import com.intellij.lang.javascript.service.protocol.JSLanguageServiceSimpleCommand
1110
import com.intellij.lang.typescript.compiler.TypeScriptService
1211
import com.intellij.lang.typescript.compiler.languageService.TypeScriptLanguageServiceAnnotationResult
1312
import com.intellij.lang.typescript.compiler.languageService.TypeScriptServerServiceImpl
1413
import com.intellij.lang.typescript.compiler.languageService.TypeScriptServiceWidgetItem
1514
import com.intellij.lang.typescript.compiler.languageService.codeFixes.TypeScriptLanguageServiceFixSet
15+
import com.intellij.lang.typescript.compiler.languageService.protocol.TypeScriptServiceStandardOutputProtocol
1616
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.ConfigureRequest
1717
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.ConfigureRequestArguments
1818
import com.intellij.lang.typescript.compiler.languageService.protocol.commands.FileExtensionInfo
@@ -63,7 +63,7 @@ class VueClassicTypeScriptService(project: Project) : TypeScriptServerServiceImp
6363
return service.getDirectIncludePreferableConfig(virtualFile) != null
6464
}
6565

66-
override fun createProtocol(tsServicePath: String): JSLanguageServiceProtocol {
66+
override fun createProtocol(tsServicePath: String): TypeScriptServiceStandardOutputProtocol {
6767
return VueTypeScriptServiceProtocol(myProject, mySettings, createEventConsumer(), serviceName, tsServicePath)
6868
}
6969

0 commit comments

Comments
 (0)