Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6916ea59
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,发现更多精彩内容 >>
提交
6916ea59
编写于
9月 07, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unused code
上级
3015be92
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
21 addition
and
66 deletion
+21
-66
src/vs/editor/common/editorCommon.ts
src/vs/editor/common/editorCommon.ts
+0
-6
src/vs/editor/common/model/mirrorModel.ts
src/vs/editor/common/model/mirrorModel.ts
+0
-40
src/vs/editor/test/common/model/mirrorModel.test.ts
src/vs/editor/test/common/model/mirrorModel.test.ts
+20
-19
src/vs/languages/html/test/common/html-worker.test.ts
src/vs/languages/html/test/common/html-worker.test.ts
+1
-1
未找到文件。
src/vs/editor/common/editorCommon.ts
浏览文件 @
6916ea59
...
...
@@ -2284,12 +2284,6 @@ export interface IRangeWithText {
export
interface
IMirrorModel
extends
IEventEmitter
,
ITokenizedModel
{
uri
:
URI
;
getOffsetFromPosition
(
position
:
IPosition
):
number
;
getPositionFromOffset
(
offset
:
number
):
Position
;
getOffsetAndLengthFromRange
(
range
:
IRange
):
{
offset
:
number
;
length
:
number
;};
getRangeFromOffsetAndLength
(
offset
:
number
,
length
:
number
):
Range
;
getLineStart
(
lineNumber
:
number
):
number
;
getAllWordsWithRange
():
IRangeWithText
[];
getAllUniqueWords
(
skipWordOnce
?:
string
):
string
[];
...
...
src/vs/editor/common/model/mirrorModel.ts
浏览文件 @
6916ea59
...
...
@@ -11,8 +11,6 @@ import {ModelLine} from 'vs/editor/common/model/modelLine';
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
import
{
TextModelWithTokens
}
from
'
vs/editor/common/model/textModelWithTokens
'
;
import
{
IMode
}
from
'
vs/editor/common/modes
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
export
interface
IMirrorModelEvents
{
contentChanged
:
editorCommon
.
IModelContentChangedEvent
[];
...
...
@@ -54,44 +52,6 @@ export class AbstractMirrorModel extends TextModelWithTokens implements editorCo
return
this
.
_associatedResource
;
}
public
getRangeFromOffsetAndLength
(
offset
:
number
,
length
:
number
):
Range
{
let
startPosition
=
this
.
getPositionAt
(
offset
);
let
endPosition
=
this
.
getPositionAt
(
offset
+
length
);
return
new
Range
(
startPosition
.
lineNumber
,
startPosition
.
column
,
endPosition
.
lineNumber
,
endPosition
.
column
);
}
public
getOffsetAndLengthFromRange
(
range
:
editorCommon
.
IRange
):{
offset
:
number
;
length
:
number
;}
{
let
startOffset
=
this
.
getOffsetAt
(
new
Position
(
range
.
startLineNumber
,
range
.
startColumn
));
let
endOffset
=
this
.
getOffsetAt
(
new
Position
(
range
.
endLineNumber
,
range
.
endColumn
));
return
{
offset
:
startOffset
,
length
:
endOffset
-
startOffset
};
}
public
getPositionFromOffset
(
offset
:
number
):
Position
{
return
this
.
getPositionAt
(
offset
);
}
public
getOffsetFromPosition
(
position
:
editorCommon
.
IPosition
):
number
{
return
this
.
getOffsetAt
(
position
);
}
public
getLineStart
(
lineNumber
:
number
):
number
{
if
(
lineNumber
<
1
)
{
lineNumber
=
1
;
}
if
(
lineNumber
>
this
.
getLineCount
())
{
lineNumber
=
this
.
getLineCount
();
}
return
this
.
getOffsetAt
(
new
Position
(
lineNumber
,
1
));
}
public
getAllWordsWithRange
():
editorCommon
.
IRangeWithText
[]
{
if
(
this
.
_lines
.
length
>
10000
)
{
// This is a very heavy method, unavailable for very heavy models
...
...
src/vs/editor/test/common/model/mirrorModel.test.ts
浏览文件 @
6916ea59
...
...
@@ -6,6 +6,7 @@
import
*
as
assert
from
'
assert
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
IMirrorModelEvents
,
MirrorModel
,
createTestMirrorModelFromString
}
from
'
vs/editor/common/model/mirrorModel
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
function
equalRange
(
left
,
right
)
{
if
(
left
.
startLineNumber
!==
right
.
startLineNumber
)
{
...
...
@@ -84,16 +85,16 @@ suite('Editor Model - MirrorModel', () => {
});
test
(
'
get line start
'
,
()
=>
{
assert
.
equal
(
mirrorModel
.
get
LineStart
(
1
),
0
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
2
),
6
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
3
),
12
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
4
),
18
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
1000
),
mirrorModel
.
getLineStart
(
mirrorModel
.
getLineCount
(
)));
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
1
,
1
)
),
0
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
2
,
1
)
),
6
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
3
,
1
)
),
12
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
4
,
1
)
),
18
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
1000
,
1
)),
mirrorModel
.
getOffsetAt
(
new
Position
(
mirrorModel
.
getLineCount
(),
mirrorModel
.
getLineMaxColumn
(
mirrorModel
.
getLineCount
())
)));
});
test
(
'
get line start /flush event/
'
,
()
=>
{
assert
.
equal
(
mirrorModel
.
get
LineStart
(
2
),
6
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
3
),
12
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
2
,
1
)
),
6
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
3
,
1
)
),
12
);
mirrorModel
.
onEvents
(
mirrorModelEvents
([
contentChangedFlushEvent
({
length
:
-
1
,
...
...
@@ -111,24 +112,24 @@ suite('Editor Model - MirrorModel', () => {
}
})]));
assert
.
equal
(
mirrorModel
.
get
LineStart
(
1
),
0
);
assert
.
equal
(
mirrorModel
.
get
LineStart
(
2
),
4
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
1
,
1
)
),
0
);
assert
.
equal
(
mirrorModel
.
get
OffsetAt
(
new
Position
(
2
,
1
)
),
4
);
});
test
(
'
get offset
'
,
()
=>
{
assert
.
equal
(
mirrorModel
.
getOffset
FromPosition
({
lineNumber
:
1
,
column
:
1
}),
0
);
assert
.
equal
(
mirrorModel
.
getOffset
FromPosition
({
lineNumber
:
1
,
column
:
3
}),
2
);
assert
.
equal
(
mirrorModel
.
getOffset
FromPosition
({
lineNumber
:
2
,
column
:
1
}),
6
);
assert
.
equal
(
mirrorModel
.
getOffset
FromPosition
({
lineNumber
:
4
,
column
:
6
}),
23
);
assert
.
equal
(
mirrorModel
.
getOffset
FromPosition
({
lineNumber
:
4
,
column
:
7
}),
23
);
assert
.
equal
(
mirrorModel
.
getOffset
At
({
lineNumber
:
1
,
column
:
1
}),
0
);
assert
.
equal
(
mirrorModel
.
getOffset
At
({
lineNumber
:
1
,
column
:
3
}),
2
);
assert
.
equal
(
mirrorModel
.
getOffset
At
({
lineNumber
:
2
,
column
:
1
}),
6
);
assert
.
equal
(
mirrorModel
.
getOffset
At
({
lineNumber
:
4
,
column
:
6
}),
23
);
assert
.
equal
(
mirrorModel
.
getOffset
At
({
lineNumber
:
4
,
column
:
7
}),
23
);
});
test
(
'
get position from offset
'
,
()
=>
{
assert
.
deepEqual
(
mirrorModel
.
getPosition
FromOffse
t
(
0
),
{
lineNumber
:
1
,
column
:
1
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
FromOffse
t
(
2
),
{
lineNumber
:
1
,
column
:
3
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
FromOffse
t
(
6
),
{
lineNumber
:
2
,
column
:
1
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
FromOffse
t
(
23
),
{
lineNumber
:
4
,
column
:
6
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
FromOffse
t
(
24
),
{
lineNumber
:
4
,
column
:
6
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
A
t
(
0
),
{
lineNumber
:
1
,
column
:
1
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
A
t
(
2
),
{
lineNumber
:
1
,
column
:
3
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
A
t
(
6
),
{
lineNumber
:
2
,
column
:
1
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
A
t
(
23
),
{
lineNumber
:
4
,
column
:
6
});
assert
.
deepEqual
(
mirrorModel
.
getPosition
A
t
(
24
),
{
lineNumber
:
4
,
column
:
6
});
});
test
(
'
get (all/unique) words
'
,
()
=>
{
...
...
src/vs/languages/html/test/common/html-worker.test.ts
浏览文件 @
6916ea59
...
...
@@ -48,7 +48,7 @@ suite('HTML - worker', () => {
var
url
=
URI
.
parse
(
'
test://1
'
);
var
env
=
mockHtmlWorkerEnv
(
url
,
content
);
var
position
=
env
.
model
.
getPosition
FromOffse
t
(
idx
);
var
position
=
env
.
model
.
getPosition
A
t
(
idx
);
return
env
.
worker
.
provideCompletionItems
(
url
,
position
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录