Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
85d48955
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
85d48955
编写于
7月 20, 2019
作者:
P
pi1024e
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactored code to make "WhiteSpace" into "Whitespace"
上级
73c6419c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
31 deletion
+27
-31
extensions/css-language-features/server/src/pathCompletion.ts
...nsions/css-language-features/server/src/pathCompletion.ts
+20
-23
extensions/html-language-features/server/src/modes/pathCompletion.ts
...html-language-features/server/src/modes/pathCompletion.ts
+5
-6
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+1
-1
src/vs/editor/contrib/hover/modesContentHover.ts
src/vs/editor/contrib/hover/modesContentHover.ts
+1
-1
未找到文件。
extensions/css-language-features/server/src/pathCompletion.ts
浏览文件 @
85d48955
...
...
@@ -144,27 +144,23 @@ const isDir = (p: string) => {
};
function
pathToReplaceRange
(
valueBeforeCursor
:
string
,
fullValue
:
string
,
fullValueRange
:
Range
)
{
let
replaceRange
:
Range
;
const
lastIndexOfSlash
=
valueBeforeCursor
.
lastIndexOf
(
'
/
'
);
if
(
lastIndexOfSlash
===
-
1
)
{
replaceRange
=
fullValueRange
;
}
else
{
// For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
// Find the last slash before cursor, and calculate the start of replace range from there
const
valueAfterLastSlash
=
fullValue
.
slice
(
lastIndexOfSlash
+
1
);
const
startPos
=
shiftPosition
(
fullValueRange
.
end
,
-
valueAfterLastSlash
.
length
);
// If whitespace exists, replace until it
const
whiteSpaceIndex
=
valueAfterLastSlash
.
indexOf
(
'
'
);
let
endPos
;
if
(
whiteSpaceIndex
!==
-
1
)
{
endPos
=
shiftPosition
(
startPos
,
whiteSpaceIndex
);
}
else
{
endPos
=
fullValueRange
.
end
;
}
replaceRange
=
Range
.
create
(
startPos
,
endPos
);
return
fullValueRange
;
}
// For cases where cursor is in the middle of attribute value, like <script src="./s|rc/test.js">
// Find the last slash before cursor, and calculate the start of replace range from there
const
valueAfterLastSlash
=
fullValue
.
slice
(
lastIndexOfSlash
+
1
);
const
startPos
=
shiftPosition
(
fullValueRange
.
end
,
-
valueAfterLastSlash
.
length
);
// If whitespace exists, replace until it
const
whitespaceIndex
=
valueAfterLastSlash
.
indexOf
(
'
'
);
if
(
whitespaceIndex
===
-
1
)
{
return
Range
.
create
(
startPos
,
shiftPosition
(
startPos
,
whitespaceIndex
));
}
return
replaceRange
;
return
Range
.
create
(
startPos
,
fullValueRange
.
end
);
}
function
pathToSuggestion
(
p
:
string
,
replaceRange
:
Range
):
CompletionItem
{
...
...
@@ -180,13 +176,14 @@ function pathToSuggestion(p: string, replaceRange: Range): CompletionItem {
command
:
'
editor.action.triggerSuggest
'
}
};
}
else
{
return
{
label
:
escapePath
(
p
),
kind
:
CompletionItemKind
.
File
,
textEdit
:
TextEdit
.
replace
(
replaceRange
,
escapePath
(
p
))
};
}
return
{
label
:
escapePath
(
p
),
kind
:
CompletionItemKind
.
File
,
textEdit
:
TextEdit
.
replace
(
replaceRange
,
escapePath
(
p
))
};
}
// Escape https://www.w3.org/TR/CSS1/#url
...
...
extensions/html-language-features/server/src/modes/pathCompletion.ts
浏览文件 @
85d48955
...
...
@@ -109,14 +109,13 @@ function pathToSuggestion(p: string, valueBeforeCursor: string, fullValue: strin
const
valueAfterLastSlash
=
fullValue
.
slice
(
lastIndexOfSlash
+
1
);
const
startPos
=
shiftPosition
(
range
.
end
,
-
1
-
valueAfterLastSlash
.
length
);
// If whitespace exists, replace until it
const
white
S
paceIndex
=
valueAfterLastSlash
.
indexOf
(
'
'
);
let
endPos
;
if
(
whiteSpaceIndex
!==
-
1
)
{
endPos
=
shiftPosition
(
startPos
,
whiteSpaceIndex
);
const
white
s
paceIndex
=
valueAfterLastSlash
.
indexOf
(
'
'
);
if
(
whitespaceIndex
===
-
1
)
{
replaceRange
=
Range
.
create
(
startPos
,
shiftPosition
(
range
.
end
,
-
1
));
}
else
{
endPos
=
shiftPosition
(
range
.
end
,
-
1
);
replaceRange
=
Range
.
create
(
startPos
,
shiftPosition
(
startPos
,
whitespaceIndex
)
);
}
replaceRange
=
Range
.
create
(
startPos
,
endPos
);
}
if
(
isDir
)
{
...
...
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
85d48955
...
...
@@ -904,7 +904,7 @@ const editorConfiguration: IConfigurationNode = {
'
enum
'
:
[
'
none
'
,
'
boundary
'
,
'
selection
'
,
'
all
'
],
'
enumDescriptions
'
:
[
''
,
nls
.
localize
(
'
renderWhite
S
pace.boundary
'
,
"
Render whitespace characters except for single spaces between words.
"
),
nls
.
localize
(
'
renderWhite
s
pace.boundary
'
,
"
Render whitespace characters except for single spaces between words.
"
),
nls
.
localize
(
'
renderWhitespace.selection
'
,
"
Render whitespace characters only on selected text.
"
),
''
],
...
...
src/vs/editor/contrib/hover/modesContentHover.ts
浏览文件 @
85d48955
...
...
@@ -480,7 +480,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget {
this
.
_editor
.
applyFontInfo
(
markerElement
);
const
messageElement
=
dom
.
append
(
markerElement
,
$
(
'
span
'
));
messageElement
.
style
.
white
S
pace
=
'
pre-wrap
'
;
messageElement
.
style
.
white
s
pace
=
'
pre-wrap
'
;
messageElement
.
innerText
=
message
;
if
(
source
||
code
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录