Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
eff472bd
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eff472bd
编写于
10月 08, 2018
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not try to convert interpolated string format specifiers into virtual chars.
上级
4bb1ffe5
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
36 addition
and
10 deletion
+36
-10
src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
...ures/CSharpTest/Classification/SemanticClassifierTests.cs
+10
-0
src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb
...VisualBasicTest/Classification/SemanticClassifierTests.vb
+8
-0
src/Workspaces/CSharp/Portable/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
...mbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
+13
-9
src/Workspaces/VisualBasic/Portable/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb
...edLanguages/VirtualChars/VisualBasicVirtualCharService.vb
+5
-1
未找到文件。
src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs
浏览文件 @
eff472bd
...
...
@@ -3079,5 +3079,15 @@ public async Task TestDirectiveStringLiteral()
{
await
TestInMethodAsync
(
@"#line 1 ""a\b"""
);
}
[
WorkItem
(
30378
,
"https://github.com/dotnet/roslyn/issues/30378"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Classification
)]
public
async
Task
TestFormatSpecifierInInterpolation
()
{
await
TestInMethodAsync
(
@"var goo = $""goo{{1:0000}}bar"";"
,
Keyword
(
"var"
),
Escape
(
@"{{"
),
Escape
(
@"}}"
));
}
}
}
src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb
浏览文件 @
eff472bd
...
...
@@ -721,5 +721,13 @@ End Operator"
Await TestAsync("
#
region
""
goo
"
""
"
bar
"
""
,
Escape(
""""""
))
End Function
<WorkItem(30378, "
https
:
//
github
.
com
/
dotnet
/
roslyn
/
issues
/
30378
")>
<Fact, Trait(Traits.Feature, Traits.Features.Classification)>
Public Async Function TestFormatSpecifierInInterpolation() As Task
Await TestInMethodAsync("
dim
goo
=
$
""
goo
{{
1
:
0000
}}
bar
"
""
,
Escape("
{{
"),
Escape("
}}
"))
End Function
End Class
End Namespace
src/Workspaces/CSharp/Portable/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
浏览文件 @
eff472bd
...
...
@@ -48,17 +48,21 @@ protected override ImmutableArray<VirtualChar> TryConvertToVirtualCharsWorker(Sy
?
TryConvertVerbatimStringToVirtualChars
(
token
,
"@\""
,
"\""
,
escapeBraces
:
false
)
:
TryConvertStringToVirtualChars
(
token
,
"\""
,
"\""
,
escapeBraces
:
false
);
}
else
if
(
token
.
Kind
()
==
SyntaxKind
.
InterpolatedStringTextToken
)
if
(
token
.
Kind
()
==
SyntaxKind
.
InterpolatedStringTextToken
)
{
// The sections between `}` and `{` are InterpolatedStringTextToken *as are* the
// format specifiers in an interpolated string. We only want to get the virtual
// chars for this first type.
if
(
token
.
Parent
.
Parent
is
InterpolatedStringExpressionSyntax
interpolatedString
)
{
var
interpolatedString
=
(
InterpolatedStringExpressionSyntax
)
token
.
Parent
.
Parent
;
return
interpolatedString
.
StringStartToken
.
Kind
()
==
SyntaxKind
.
InterpolatedVerbatimStringStartToken
?
TryConvertVerbatimStringToVirtualChars
(
token
,
""
,
""
,
escapeBraces
:
true
)
:
TryConvertStringToVirtualChars
(
token
,
""
,
""
,
escapeBraces
:
true
);
}
else
{
return
default
;
}
return
default
;
}
private
bool
IsInDirective
(
SyntaxNode
node
)
...
...
src/Workspaces/VisualBasic/Portable/EmbeddedLanguages/VirtualChars/VisualBasicVirtualCharService.vb
浏览文件 @
eff472bd
...
...
@@ -4,6 +4,7 @@ Imports System.Collections.Immutable
Imports
System.Composition
Imports
Microsoft.CodeAnalysis.Host.Mef
Imports
Microsoft.CodeAnalysis.EmbeddedLanguages.VirtualChars
Imports
Microsoft.CodeAnalysis.VisualBasic.Syntax
Namespace
Microsoft.CodeAnalysis.VisualBasic.EmbeddedLanguages.VirtualChars
<
ExportLanguageService
(
GetType
(
IVirtualCharService
),
LanguageNames
.
VisualBasic
),
[
Shared
]
>
...
...
@@ -21,7 +22,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EmbeddedLanguages.VirtualChars
If
token
.
Kind
()
=
SyntaxKind
.
StringLiteralToken
Then
Return
TryConvertSimpleDoubleQuoteString
(
token
,
"
""
"
,
"
""
"
,
escapeBraces
:
=
False
)
ElseIf
token
.
Kind
()
=
SyntaxKind
.
InterpolatedStringTextToken
Then
End
If
If
token
.
Kind
()
=
SyntaxKind
.
InterpolatedStringTextToken
AndAlso
TypeOf
token
.
Parent
.
Parent
Is
InterpolatedStringExpressionSyntax
Then
Return
TryConvertSimpleDoubleQuoteString
(
token
,
""
,
""
,
escapeBraces
:
=
True
)
End
If
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录