Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
34cdf9f9
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
34cdf9f9
编写于
4月 21, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #21550
上级
372ca2ee
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
29 addition
and
48 deletion
+29
-48
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
...editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+29
-48
未找到文件。
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
浏览文件 @
34cdf9f9
...
...
@@ -13,7 +13,6 @@ import { MarkedString } from 'vs/base/common/htmlContent';
import
{
KeyCode
,
KeyMod
,
KeyChord
}
from
'
vs/base/common/keyCodes
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
browser
from
'
vs/base/browser/browser
'
;
import
{
IKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
...
...
@@ -374,7 +373,7 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
static
TRIGGER_MODIFIER
=
platform
.
isMacintosh
?
'
metaKey
'
:
'
ctrlKey
'
;
static
TRIGGER_SIDEBYSIDE_KEY_VALUE
=
KeyCode
.
Alt
;
static
TRIGGER_KEY_VALUE
=
platform
.
isMacintosh
?
KeyCode
.
Meta
:
KeyCode
.
Ctrl
;
static
MAX_SOURCE_PREVIEW_LINES
=
7
;
static
MAX_SOURCE_PREVIEW_LINES
=
8
;
private
editor
:
ICodeEditor
;
private
toUnhook
:
IDisposable
[];
...
...
@@ -474,59 +473,41 @@ class GotoDefinitionWithMouseEditorContribution implements editorCommon.IEditorC
}
this
.
textModelResolverService
.
createModelReference
(
result
.
uri
).
then
(
ref
=>
{
const
model
=
ref
.
object
;
let
hoverMessage
:
MarkedString
;
if
(
model
&&
model
.
textEditorModel
)
{
const
editorModel
=
model
.
textEditorModel
;
let
from
=
Math
.
max
(
1
,
result
.
range
.
startLineNumber
);
let
to
:
number
;
// if we have a range, take that into consideration for the "to" position, otherwise fallback to MAX_SOURCE_PREVIEW_LINES
if
(
!
Range
.
isEmpty
(
result
.
range
))
{
to
=
Math
.
min
(
result
.
range
.
endLineNumber
,
result
.
range
.
startLineNumber
+
GotoDefinitionWithMouseEditorContribution
.
MAX_SOURCE_PREVIEW_LINES
,
editorModel
.
getLineCount
());
}
else
{
to
=
Math
.
min
(
from
+
GotoDefinitionWithMouseEditorContribution
.
MAX_SOURCE_PREVIEW_LINES
,
editorModel
.
getLineCount
());
}
let
source
=
editorModel
.
getValueInRange
({
startLineNumber
:
from
,
startColumn
:
1
,
endLineNumber
:
to
,
endColumn
:
editorModel
.
getLineMaxColumn
(
to
)
}).
trim
();
// remove common leading whitespace
let
min
=
Number
.
MAX_VALUE
,
regexp
=
/^
[
\t]
*/
,
match
:
RegExpExecArray
,
contents
:
string
;
while
(
from
<=
to
&&
min
>
0
)
{
contents
=
editorModel
.
getLineContent
(
from
++
);
if
(
contents
.
trim
().
length
===
0
)
{
// empty or whitespace only
continue
;
}
match
=
regexp
.
exec
(
contents
);
min
=
Math
.
min
(
min
,
match
[
0
].
length
);
if
(
!
ref
.
object
||
!
ref
.
object
.
textEditorModel
)
{
ref
.
dispose
();
return
;
}
source
=
source
.
replace
(
new
RegExp
(
`^([ \\t]{
${
min
}
})`
,
'
gm
'
),
strings
.
empty
);
const
{
object
:
{
textEditorModel
}
}
=
ref
;
const
{
startLineNumber
}
=
result
.
range
;
if
(
to
<
editorModel
.
getLineCount
())
{
source
+=
'
\n\
u2026
'
;
if
(
textEditorModel
.
getLineMaxColumn
(
startLineNumber
)
===
0
)
{
ref
.
dispose
();
return
;
}
const
language
=
this
.
modeService
.
getModeIdByFilenameOrFirstLine
(
editorModel
.
uri
.
fsPath
);
hoverMessage
=
{
language
,
value
:
source
};
const
startIndent
=
textEditorModel
.
getLineFirstNonWhitespaceColumn
(
startLineNumber
);
const
maxLineNumber
=
Math
.
min
(
textEditorModel
.
getLineCount
(),
startLineNumber
+
GotoDefinitionWithMouseEditorContribution
.
MAX_SOURCE_PREVIEW_LINES
);
let
endLineNumber
=
startLineNumber
+
1
;
let
minIndent
=
startIndent
;
for
(;
endLineNumber
<
maxLineNumber
;
endLineNumber
++
)
{
let
endIndent
=
textEditorModel
.
getLineFirstNonWhitespaceColumn
(
endLineNumber
);
minIndent
=
Math
.
min
(
minIndent
,
endIndent
);
if
(
startIndent
===
endIndent
)
{
break
;
}
}
ref
.
dispose
();
const
previewRange
=
new
Range
(
startLineNumber
,
1
,
endLineNumber
+
1
,
1
);
const
value
=
textEditorModel
.
getValueInRange
(
previewRange
).
replace
(
new
RegExp
(
`^\\s{
${
minIndent
-
1
}
}`
,
'
gm
'
),
''
).
trim
();
this
.
addDecoration
(
new
Range
(
position
.
lineNumber
,
word
.
startColumn
,
position
.
lineNumber
,
word
.
endColumn
),
hoverMessage
);
this
.
addDecoration
(
new
Range
(
position
.
lineNumber
,
word
.
startColumn
,
position
.
lineNumber
,
word
.
endColumn
),
{
language
:
this
.
modeService
.
getModeIdByFilenameOrFirstLine
(
textEditorModel
.
uri
.
fsPath
),
value
});
ref
.
dispose
();
});
}
}).
done
(
undefined
,
onUnexpectedError
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录