diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/FSharpElements.kt b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/FSharpElements.kt index 5f0470b5ed..7b2ae501e7 100644 --- a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/FSharpElements.kt +++ b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/FSharpElements.kt @@ -3,7 +3,7 @@ package com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.jetbrains.rider.ideaInterop.fileTypes.common.psi.ClrLanguageStringLiteralExpression -import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType +import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenNodeType interface FSharpElement : PsiElement @@ -16,7 +16,7 @@ interface FSharpStringLiteralExpression : FSharpElement, ClrLanguageStringLitera } interface FSharpInterpolatedStringLiteralExpressionPart : FSharpElement { - val tokenType: FSharpTokenType + val tokenType: FSharpTokenNodeType } interface FSharpInterpolatedStringLiteralExpression : FSharpStringLiteralExpression diff --git a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpInterpolatedStringLiteralExpressionPartImpl.kt b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpInterpolatedStringLiteralExpressionPartImpl.kt index c2e32ff405..a4f60646c8 100644 --- a/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpInterpolatedStringLiteralExpressionPartImpl.kt +++ b/rider-fsharp/src/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/psi/impl/FSharpInterpolatedStringLiteralExpressionPartImpl.kt @@ -1,12 +1,12 @@ package com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.impl import com.intellij.psi.util.elementType -import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenType +import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.lexer.FSharpTokenNodeType import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpElementType import com.jetbrains.rider.ideaInterop.fileTypes.fsharp.psi.FSharpInterpolatedStringLiteralExpressionPart class FSharpInterpolatedStringLiteralExpressionPartImpl(type: FSharpElementType) : FSharpPsiElementBase(type), FSharpInterpolatedStringLiteralExpressionPart { - override val tokenType: FSharpTokenType - get() = firstChild?.elementType as FSharpTokenType + override val tokenType: FSharpTokenNodeType + get() = firstChild?.elementType as FSharpTokenNodeType } diff --git a/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/gold/Program.gold b/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/gold/Program.gold index a03107a468..9df77143bf 100644 --- a/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/gold/Program.gold +++ b/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/gold/Program.gold @@ -1,4 +1,5 @@ // https://jetbrains.com -let url = "https://jetbrains.com" +let url1 = "https://jetbrains.com" +let url2 = $"https://jetbrains.com" let nonUrl = "123" diff --git a/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/source/Program.fs b/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/source/Program.fs index e58dd06b9c..086cf07601 100644 --- a/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/source/Program.fs +++ b/rider-fsharp/testData/markup/injections/UrlInStringsTest/simple/source/Program.fs @@ -1,4 +1,5 @@ // https://jetbrains.com -let url = "https://jetbrains.com" +let url1 = "https://jetbrains.com" +let url2 = $"https://jetbrains.com" let nonUrl = "123"