Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d4504b92
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,发现更多精彩内容 >>
提交
d4504b92
编写于
3月 21, 2017
作者:
J
Johannes Rieken
提交者:
GitHub
3月 21, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22460 from katainaka0503/someFix
Refactor to fix compile error with noImplicitAny
上级
82d5d43a
0962f8a0
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
32 addition
and
25 deletion
+32
-25
src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+6
-1
src/vs/base/common/diagnostics.ts
src/vs/base/common/diagnostics.ts
+3
-3
src/vs/base/common/htmlContent.ts
src/vs/base/common/htmlContent.ts
+4
-4
src/vs/base/common/json.ts
src/vs/base/common/json.ts
+1
-1
src/vs/base/common/map.ts
src/vs/base/common/map.ts
+6
-6
src/vs/editor/browser/standalone/standaloneServices.ts
src/vs/editor/browser/standalone/standaloneServices.ts
+1
-0
src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts
...ditor/contrib/referenceSearch/browser/referencesWidget.ts
+1
-1
src/vs/editor/electron-browser/textMate/TMSyntax.ts
src/vs/editor/electron-browser/textMate/TMSyntax.ts
+3
-3
src/vs/monaco.d.ts
src/vs/monaco.d.ts
+1
-0
src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
...onfigurationResolver/node/configurationResolverService.ts
+1
-1
src/vs/workbench/services/themes/electron-browser/themeService.ts
...orkbench/services/themes/electron-browser/themeService.ts
+5
-5
未找到文件。
src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
浏览文件 @
d4504b92
...
...
@@ -15,8 +15,13 @@ import DOM = require('vs/base/browser/dom');
import
{
DomScrollableElement
}
from
'
vs/base/browser/ui/scrollbar/scrollableElement
'
;
import
{
BoundedLinkedMap
}
from
'
vs/base/common/map
'
;
interface
MapExtToMediaMimes
{
[
index
:
string
]:
string
;
}
// Known media mimes that we can handle
const
mapExtToMediaMimes
=
{
const
mapExtToMediaMimes
:
MapExtToMediaMimes
=
{
'
.bmp
'
:
'
image/bmp
'
,
'
.gif
'
:
'
image/gif
'
,
'
.jpg
'
:
'
image/jpg
'
,
...
...
src/vs/base/common/diagnostics.ts
浏览文件 @
d4504b92
...
...
@@ -18,7 +18,7 @@ if (!globals.Monaco) {
globals
.
Monaco
.
Diagnostics
=
{};
var
switches
=
globals
.
Monaco
.
Diagnostics
;
var
map
=
{}
;
var
map
=
new
Map
<
string
,
Function
[]
>
()
;
var
data
:
any
[]
=
[];
function
fifo
(
array
:
any
[],
size
:
number
)
{
...
...
@@ -41,9 +41,9 @@ export function register(what: string, fn: Function): (...args: any[]) => void {
switches
[
what
]
=
flag
;
// register function
var
tracers
=
map
[
what
]
||
[];
var
tracers
=
map
.
get
(
what
)
||
[];
tracers
.
push
(
fn
);
map
[
what
]
=
tracers
;
map
.
set
(
what
,
tracers
)
;
var
result
=
function
(...
args
:
any
[])
{
...
...
src/vs/base/common/htmlContent.ts
浏览文件 @
d4504b92
...
...
@@ -58,12 +58,12 @@ function markedStringEqual(a: MarkedString, b: MarkedString): boolean {
if
(
!
a
||
!
b
)
{
return
false
;
}
if
(
typeof
a
===
'
string
'
)
{
return
typeof
b
===
'
string
'
&&
a
===
b
;
if
(
typeof
a
===
'
string
'
||
typeof
b
===
'
string
'
)
{
return
typeof
a
===
'
string
'
&&
typeof
b
===
'
string
'
&&
a
===
b
;
}
return
(
a
[
'
language
'
]
===
b
[
'
language
'
]
&&
a
[
'
value
'
]
===
b
[
'
value
'
]
a
.
language
===
b
.
language
&&
a
.
value
===
b
.
value
);
}
...
...
src/vs/base/common/json.ts
浏览文件 @
d4504b92
...
...
@@ -972,7 +972,7 @@ export function getNodeValue(node: Node): any {
if
(
node
.
type
===
'
array
'
)
{
return
node
.
children
.
map
(
getNodeValue
);
}
else
if
(
node
.
type
===
'
object
'
)
{
let
obj
=
{};
let
obj
:
any
=
{};
for
(
let
prop
of
node
.
children
)
{
obj
[
prop
.
children
[
0
].
value
]
=
getNodeValue
(
prop
.
children
[
1
]);
}
...
...
src/vs/base/common/map.ts
浏览文件 @
d4504b92
...
...
@@ -305,7 +305,7 @@ export class LRUCache<T> extends BoundedLinkedMap<T> {
class
Node
<
E
>
{
element
?:
E
;
readonly
children
=
new
Map
<
string
,
E
>
();
readonly
children
=
new
Map
<
string
,
Node
<
E
>
>
();
}
/**
...
...
@@ -330,7 +330,7 @@ export class TrieMap<E> {
// find insertion node
let
node
=
this
.
_root
;
for
(;
i
<
parts
.
length
;
i
++
)
{
let
child
=
node
.
children
[
parts
[
i
]]
;
let
child
=
node
.
children
.
get
(
parts
[
i
])
;
if
(
child
)
{
node
=
child
;
continue
;
...
...
@@ -342,7 +342,7 @@ export class TrieMap<E> {
let
newNode
:
Node
<
E
>
;
for
(;
i
<
parts
.
length
;
i
++
)
{
newNode
=
new
Node
<
E
>
();
node
.
children
[
parts
[
i
]]
=
newNode
;
node
.
children
.
set
(
parts
[
i
],
newNode
)
;
node
=
newNode
;
}
...
...
@@ -355,7 +355,7 @@ export class TrieMap<E> {
let
{
children
}
=
this
.
_root
;
let
node
:
Node
<
E
>
;
for
(
const
part
of
parts
)
{
node
=
children
[
part
]
;
node
=
children
.
get
(
part
)
;
if
(
!
node
)
{
return
undefined
;
}
...
...
@@ -371,7 +371,7 @@ export class TrieMap<E> {
let
lastNode
:
Node
<
E
>
;
let
{
children
}
=
this
.
_root
;
for
(
const
part
of
parts
)
{
const
node
=
children
[
part
]
;
const
node
=
children
.
get
(
part
)
;
if
(
!
node
)
{
break
;
}
...
...
@@ -395,7 +395,7 @@ export class TrieMap<E> {
let
{
children
}
=
this
.
_root
;
let
node
:
Node
<
E
>
;
for
(
const
part
of
parts
)
{
node
=
children
[
part
]
;
node
=
children
.
get
(
part
)
;
if
(
!
node
)
{
return
undefined
;
}
...
...
src/vs/editor/browser/standalone/standaloneServices.ts
浏览文件 @
d4504b92
...
...
@@ -47,6 +47,7 @@ export interface IEditorContextViewService extends IContextViewService {
}
export
interface
IEditorOverrideServices
{
[
index
:
string
]:
any
;
}
export
module
StaticServices
{
...
...
src/vs/editor/contrib/referenceSearch/browser/referencesWidget.ts
浏览文件 @
d4504b92
...
...
@@ -144,7 +144,7 @@ class DecorationsManager implements IDisposable {
this
.
_editor
.
changeDecorations
((
accessor
)
=>
{
for
(
let
i
=
0
,
len
=
toRemove
.
length
;
i
<
len
;
i
++
)
{
delete
this
.
_decorations
[
toRemove
[
i
]]
;
this
.
_decorations
.
delete
(
toRemove
[
i
])
;
}
accessor
.
deltaDecorations
(
toRemove
,
[]);
});
...
...
src/vs/editor/electron-browser/textMate/TMSyntax.ts
浏览文件 @
d4504b92
...
...
@@ -146,7 +146,7 @@ export class MainProcessTextMateSyntax implements ITextMateService {
this
.
_modeService
.
onDidCreateMode
((
mode
)
=>
{
let
modeId
=
mode
.
getId
();
if
(
this
.
_languageToScope
[
modeId
]
)
{
if
(
this
.
_languageToScope
.
has
(
modeId
)
)
{
this
.
registerDefinition
(
modeId
);
}
});
...
...
@@ -234,7 +234,7 @@ export class MainProcessTextMateSyntax implements ITextMateService {
let
modeId
=
syntax
.
language
;
if
(
modeId
)
{
this
.
_languageToScope
[
modeId
]
=
syntax
.
scopeName
;
this
.
_languageToScope
.
set
(
modeId
,
syntax
.
scopeName
)
;
}
}
...
...
@@ -257,7 +257,7 @@ export class MainProcessTextMateSyntax implements ITextMateService {
}
private
_createGrammar
(
modeId
:
string
):
TPromise
<
ICreateGrammarResult
>
{
let
scopeName
=
this
.
_languageToScope
[
modeId
]
;
let
scopeName
=
this
.
_languageToScope
.
get
(
modeId
)
;
let
languageRegistration
=
this
.
_scopeRegistry
.
getLanguageRegistration
(
scopeName
);
if
(
!
languageRegistration
)
{
// No TM grammar defined
...
...
src/vs/monaco.d.ts
浏览文件 @
d4504b92
...
...
@@ -973,6 +973,7 @@ declare module monaco.editor {
}
export
interface
IEditorOverrideServices
{
[
index
:
string
]:
any
;
}
/**
...
...
src/vs/workbench/services/configurationResolver/node/configurationResolverService.ts
浏览文件 @
d4504b92
...
...
@@ -150,7 +150,7 @@ export class ConfigurationResolverService implements IConfigurationResolverServi
private
resolveConfigVariable
(
value
:
string
,
originalValue
:
string
):
string
{
const
replacer
=
(
match
:
string
,
name
:
string
)
=>
{
let
config
=
this
.
configurationService
.
getConfiguration
();
let
config
=
this
.
configurationService
.
getConfiguration
<
any
>
();
let
newValue
:
any
;
try
{
const
keys
:
string
[]
=
name
.
split
(
'
.
'
);
...
...
src/vs/workbench/services/themes/electron-browser/themeService.ts
浏览文件 @
d4504b92
...
...
@@ -462,7 +462,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
findThemeData
(
themeId
:
string
,
defaultId
?:
string
):
TPromise
<
ColorThemeData
>
{
return
this
.
getColorThemes
().
then
(
allThemes
=>
{
let
defaultTheme
=
void
0
;
let
defaultTheme
:
IColorTheme
=
void
0
;
for
(
let
t
of
allThemes
)
{
if
(
t
.
id
===
themeId
)
{
return
t
;
...
...
@@ -477,7 +477,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
private
findThemeDataBySettingsId
(
settingsId
:
string
,
defaultId
:
string
):
TPromise
<
ColorThemeData
>
{
return
this
.
getColorThemes
().
then
(
allThemes
=>
{
let
defaultTheme
=
void
0
;
let
defaultTheme
:
IColorTheme
=
void
0
;
for
(
let
t
of
allThemes
)
{
if
(
t
.
settingsId
===
settingsId
)
{
return
t
;
...
...
@@ -591,10 +591,10 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
});
}
private
themeExtensionsActivated
=
{}
;
private
themeExtensionsActivated
=
new
Map
<
string
,
boolean
>
()
;
private
sendTelemetry
(
themeId
:
string
,
themeData
:
ExtensionData
,
themeType
:
string
)
{
let
key
=
themeType
+
themeData
.
extensionId
;
if
(
!
this
.
themeExtensionsActivated
[
key
]
)
{
if
(
!
this
.
themeExtensionsActivated
.
get
(
key
)
)
{
this
.
telemetryService
.
publicLog
(
'
activatePlugin
'
,
{
id
:
themeData
.
extensionId
,
name
:
themeData
.
extensionName
,
...
...
@@ -602,7 +602,7 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
publisherDisplayName
:
themeData
.
extensionPublisher
,
themeId
:
themeId
});
this
.
themeExtensionsActivated
[
key
]
=
true
;
this
.
themeExtensionsActivated
.
set
(
key
,
true
)
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录