Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
WLHYW
vscode
提交
c1afd7c2
V
vscode
项目概览
WLHYW
/
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,发现更多精彩内容 >>
未验证
提交
c1afd7c2
编写于
1月 26, 2021
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add `_debugComposition` flag
上级
9e07bfd5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
8 deletion
+31
-8
src/vs/editor/browser/controller/textAreaInput.ts
src/vs/editor/browser/controller/textAreaInput.ts
+14
-1
src/vs/editor/browser/controller/textAreaState.ts
src/vs/editor/browser/controller/textAreaState.ts
+17
-7
未找到文件。
src/vs/editor/browser/controller/textAreaInput.ts
浏览文件 @
c1afd7c2
...
...
@@ -13,7 +13,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import
{
Disposable
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
*
as
strings
from
'
vs/base/common/strings
'
;
import
{
ITextAreaWrapper
,
ITypeData
,
TextAreaState
}
from
'
vs/editor/browser/controller/textAreaState
'
;
import
{
ITextAreaWrapper
,
ITypeData
,
TextAreaState
,
_debugComposition
}
from
'
vs/editor/browser/controller/textAreaState
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
BrowserFeatures
}
from
'
vs/base/browser/canIUse
'
;
...
...
@@ -193,6 +193,10 @@ export class TextAreaInput extends Disposable {
}));
this
.
_register
(
dom
.
addDisposableListener
(
textArea
.
domNode
,
'
compositionstart
'
,
(
e
:
CompositionEvent
)
=>
{
if
(
_debugComposition
)
{
console
.
log
(
`[compositionstart]`
,
e
);
}
if
(
this
.
_isDoingComposition
)
{
return
;
}
...
...
@@ -209,6 +213,9 @@ export class TextAreaInput extends Disposable {
)
{
// Handling long press case on macOS + arrow key => pretend the character was selected
if
(
lastKeyDown
.
code
===
'
ArrowRight
'
||
lastKeyDown
.
code
===
'
ArrowLeft
'
)
{
if
(
_debugComposition
)
{
console
.
log
(
`[compositionstart] Handling long press case on macOS + arrow key`
,
e
);
}
moveOneCharacterLeft
=
true
;
}
}
...
...
@@ -251,6 +258,9 @@ export class TextAreaInput extends Disposable {
};
this
.
_register
(
dom
.
addDisposableListener
(
textArea
.
domNode
,
'
compositionupdate
'
,
(
e
:
CompositionEvent
)
=>
{
if
(
_debugComposition
)
{
console
.
log
(
`[compositionupdate]`
,
e
);
}
const
[
newState
,
typeInput
]
=
deduceComposition
(
e
.
data
||
''
);
this
.
_textAreaState
=
newState
;
this
.
_onType
.
fire
(
typeInput
);
...
...
@@ -258,6 +268,9 @@ export class TextAreaInput extends Disposable {
}));
this
.
_register
(
dom
.
addDisposableListener
(
textArea
.
domNode
,
'
compositionend
'
,
(
e
:
CompositionEvent
)
=>
{
if
(
_debugComposition
)
{
console
.
log
(
`[compositionend]`
,
e
);
}
// https://github.com/microsoft/monaco-editor/issues/1663
// On iOS 13.2, Chinese system IME randomly trigger an additional compositionend event with empty data
if
(
!
this
.
_isDoingComposition
)
{
...
...
src/vs/editor/browser/controller/textAreaState.ts
浏览文件 @
c1afd7c2
...
...
@@ -8,6 +8,8 @@ import { Position } from 'vs/editor/common/core/position';
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
EndOfLinePreference
}
from
'
vs/editor/common/model
'
;
export
const
_debugComposition
=
false
;
export
interface
ITextAreaWrapper
{
getValue
():
string
;
setValue
(
reason
:
string
,
value
:
string
):
void
;
...
...
@@ -59,7 +61,9 @@ export class TextAreaState {
}
public
writeToTextArea
(
reason
:
string
,
textArea
:
ITextAreaWrapper
,
select
:
boolean
):
void
{
// console.log(Date.now() + ': writeToTextArea ' + reason + ': ' + this.toString());
if
(
_debugComposition
)
{
console
.
log
(
'
writeToTextArea
'
+
reason
+
'
:
'
+
this
.
toString
());
}
textArea
.
setValue
(
reason
,
this
.
value
);
if
(
select
)
{
textArea
.
setSelectionRange
(
reason
,
this
.
selectionStart
,
this
.
selectionEnd
);
...
...
@@ -105,9 +109,11 @@ export class TextAreaState {
};
}
// console.log('------------------------deduceInput');
// console.log('PREVIOUS STATE: ' + previousState.toString());
// console.log('CURRENT STATE: ' + currentState.toString());
if
(
_debugComposition
)
{
console
.
log
(
'
------------------------deduceInput
'
);
console
.
log
(
'
PREVIOUS STATE:
'
+
previousState
.
toString
());
console
.
log
(
'
CURRENT STATE:
'
+
currentState
.
toString
());
}
let
previousValue
=
previousState
.
value
;
let
previousSelectionStart
=
previousState
.
selectionStart
;
...
...
@@ -133,8 +139,10 @@ export class TextAreaState {
currentSelectionEnd
-=
prefixLength
;
previousSelectionEnd
-=
prefixLength
;
// console.log('AFTER DIFFING PREVIOUS STATE: <' + previousValue + '>, selectionStart: ' + previousSelectionStart + ', selectionEnd: ' + previousSelectionEnd);
// console.log('AFTER DIFFING CURRENT STATE: <' + currentValue + '>, selectionStart: ' + currentSelectionStart + ', selectionEnd: ' + currentSelectionEnd);
if
(
_debugComposition
)
{
console
.
log
(
'
AFTER DIFFING PREVIOUS STATE: <
'
+
previousValue
+
'
>, selectionStart:
'
+
previousSelectionStart
+
'
, selectionEnd:
'
+
previousSelectionEnd
);
console
.
log
(
'
AFTER DIFFING CURRENT STATE: <
'
+
currentValue
+
'
>, selectionStart:
'
+
currentSelectionStart
+
'
, selectionEnd:
'
+
currentSelectionEnd
);
}
if
(
couldBeEmojiInput
&&
currentSelectionStart
===
currentSelectionEnd
&&
previousValue
.
length
>
0
)
{
// on OSX, emojis from the emoji picker are inserted at random locations
...
...
@@ -196,7 +204,9 @@ export class TextAreaState {
// no current selection
const
replacePreviousCharacters
=
(
previousPrefix
.
length
-
prefixLength
);
// console.log('REMOVE PREVIOUS: ' + (previousPrefix.length - prefixLength) + ' chars');
if
(
_debugComposition
)
{
console
.
log
(
'
REMOVE PREVIOUS:
'
+
(
previousPrefix
.
length
-
prefixLength
)
+
'
chars
'
);
}
return
{
text
:
currentValue
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录