Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
98f25504
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
Vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
98f25504
编写于
3月 20, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue where the word definition of the right language was used for the left language
上级
4ebe8217
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
37 deletion
+34
-37
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+34
-37
未找到文件。
src/vs/editor/common/model/textModel.ts
浏览文件 @
98f25504
...
...
@@ -1742,11 +1742,41 @@ export class TextModel extends Disposable implements model.ITextModel {
const
position
=
this
.
validatePosition
(
_position
);
const
lineContent
=
this
.
getLineContent
(
position
.
lineNumber
);
const
lineTokens
=
this
.
_getLineTokens
(
position
.
lineNumber
);
const
offset
=
position
.
column
-
1
;
const
tokenIndex
=
lineTokens
.
findTokenIndexAtOffset
(
offset
);
const
tokenIndex
=
lineTokens
.
findTokenIndexAtOffset
(
position
.
column
-
1
);
// (1). First try checking right biased word
const
[
rbStartOffset
,
rbEndOffset
]
=
TextModel
.
_findLanguageBoundaries
(
lineTokens
,
tokenIndex
);
const
rightBiasedWord
=
getWordAtText
(
position
.
column
,
LanguageConfigurationRegistry
.
getWordDefinition
(
lineTokens
.
getLanguageId
(
tokenIndex
)),
lineContent
.
substring
(
rbStartOffset
,
rbEndOffset
),
rbStartOffset
);
if
(
rightBiasedWord
)
{
return
rightBiasedWord
;
}
// (2). Else, if we were at a language boundary, check the left biased word
if
(
tokenIndex
>
0
&&
rbStartOffset
===
position
.
column
-
1
)
{
// edge case, where `position` sits between two tokens belonging to two different languages
const
[
lbStartOffset
,
lbEndOffset
]
=
TextModel
.
_findLanguageBoundaries
(
lineTokens
,
tokenIndex
-
1
);
const
leftBiasedWord
=
getWordAtText
(
position
.
column
,
LanguageConfigurationRegistry
.
getWordDefinition
(
lineTokens
.
getLanguageId
(
tokenIndex
-
1
)),
lineContent
.
substring
(
lbStartOffset
,
lbEndOffset
),
lbStartOffset
);
if
(
leftBiasedWord
)
{
return
leftBiasedWord
;
}
}
return
null
;
}
private
static
_findLanguageBoundaries
(
lineTokens
:
LineTokens
,
tokenIndex
:
number
):
[
number
,
number
]
{
const
languageId
=
lineTokens
.
getLanguageId
(
tokenIndex
);
// First try checking right biased word
// go left until a different language is hit
let
startOffset
:
number
;
for
(
let
i
=
tokenIndex
;
i
>=
0
&&
lineTokens
.
getLanguageId
(
i
)
===
languageId
;
i
--
)
{
...
...
@@ -1759,40 +1789,7 @@ export class TextModel extends Disposable implements model.ITextModel {
endOffset
=
lineTokens
.
getEndOffset
(
i
);
}
const
rightBiasedWord
=
getWordAtText
(
position
.
column
,
LanguageConfigurationRegistry
.
getWordDefinition
(
languageId
),
lineContent
.
substring
(
startOffset
,
endOffset
),
startOffset
);
if
(
rightBiasedWord
)
{
return
rightBiasedWord
;
}
if
(
tokenIndex
===
0
)
{
return
null
;
}
// Else, if we were at a language boundary, check the left biased word
const
cursorLang
=
lineTokens
.
getLanguageId
(
tokenIndex
);
const
preLang
=
lineTokens
.
getLanguageId
(
tokenIndex
-
1
);
if
(
cursorLang
!==
preLang
&&
tokenIndex
<
lineTokens
.
getCount
())
{
// go left until a different language is hit
let
startOffset
:
number
;
for
(
let
i
=
tokenIndex
-
1
;
i
>=
0
&&
lineTokens
.
getLanguageId
(
i
)
===
preLang
;
i
--
)
{
startOffset
=
lineTokens
.
getStartOffset
(
i
);
}
return
getWordAtText
(
position
.
column
,
LanguageConfigurationRegistry
.
getWordDefinition
(
languageId
),
lineContent
.
substring
(
startOffset
,
lineTokens
.
getEndOffset
(
tokenIndex
)),
startOffset
);
}
return
null
;
return
[
startOffset
,
endOffset
];
}
public
getWordUntilPosition
(
position
:
IPosition
):
model
.
IWordAtPosition
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录