Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
936742b5
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,发现更多精彩内容 >>
提交
936742b5
编写于
10月 01, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Onboard npm to use shared tsconfig
上级
6769079c
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
13 addition
and
25 deletion
+13
-25
extensions/npm/src/features/bowerJSONContribution.ts
extensions/npm/src/features/bowerJSONContribution.ts
+1
-1
extensions/npm/src/features/packageJSONContribution.ts
extensions/npm/src/features/packageJSONContribution.ts
+1
-1
extensions/npm/src/main.ts
extensions/npm/src/main.ts
+3
-3
extensions/npm/src/npmView.ts
extensions/npm/src/npmView.ts
+1
-2
extensions/npm/src/scriptHover.ts
extensions/npm/src/scriptHover.ts
+0
-2
extensions/npm/src/tasks.ts
extensions/npm/src/tasks.ts
+5
-7
extensions/npm/tsconfig.json
extensions/npm/tsconfig.json
+2
-9
未找到文件。
extensions/npm/src/features/bowerJSONContribution.ts
浏览文件 @
936742b5
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
MarkedString
,
CompletionItemKind
,
CompletionItem
,
DocumentSelector
,
SnippetString
,
workspace
}
from
'
vscode
'
;
import
{
IJSONContribution
,
ISuggestionsCollector
,
xhrDisabled
}
from
'
./jsonContributions
'
;
import
{
IJSONContribution
,
ISuggestionsCollector
}
from
'
./jsonContributions
'
;
import
{
XHRRequest
}
from
'
request-light
'
;
import
{
Location
}
from
'
jsonc-parser
'
;
import
{
textToMarkedString
}
from
'
./markedTextUtil
'
;
...
...
extensions/npm/src/features/packageJSONContribution.ts
浏览文件 @
936742b5
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
MarkedString
,
CompletionItemKind
,
CompletionItem
,
DocumentSelector
,
SnippetString
,
workspace
}
from
'
vscode
'
;
import
{
IJSONContribution
,
ISuggestionsCollector
,
xhrDisabled
}
from
'
./jsonContributions
'
;
import
{
IJSONContribution
,
ISuggestionsCollector
}
from
'
./jsonContributions
'
;
import
{
XHRRequest
}
from
'
request-light
'
;
import
{
Location
}
from
'
jsonc-parser
'
;
import
{
textToMarkedString
}
from
'
./markedTextUtil
'
;
...
...
extensions/npm/src/main.ts
浏览文件 @
936742b5
...
...
@@ -13,9 +13,9 @@ import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHov
import
{
runSelectedScript
}
from
'
./commands
'
;
export
async
function
activate
(
context
:
vscode
.
ExtensionContext
):
Promise
<
void
>
{
const
taskProvider
=
registerTaskProvider
(
context
);
registerTaskProvider
(
context
);
const
treeDataProvider
=
registerExplorer
(
context
);
const
hoverProvider
=
registerHoverProvider
(
context
);
registerHoverProvider
(
context
);
configureHttpRequest
();
let
d
=
vscode
.
workspace
.
onDidChangeConfiguration
((
e
)
=>
{
...
...
@@ -59,7 +59,7 @@ function registerTaskProvider(context: vscode.ExtensionContext): vscode.Disposab
let
workspaceWatcher
=
vscode
.
workspace
.
onDidChangeWorkspaceFolders
((
_e
)
=>
invalidateScriptCaches
());
context
.
subscriptions
.
push
(
workspaceWatcher
);
let
provider
:
vscode
.
TaskProvider
=
new
NpmTaskProvider
(
context
);
let
provider
:
vscode
.
TaskProvider
=
new
NpmTaskProvider
();
let
disposable
=
vscode
.
workspace
.
registerTaskProvider
(
'
npm
'
,
provider
);
context
.
subscriptions
.
push
(
disposable
);
return
disposable
;
...
...
extensions/npm/src/npmView.ts
浏览文件 @
936742b5
...
...
@@ -43,7 +43,7 @@ class PackageJSON extends TreeItem {
folder
:
Folder
;
scripts
:
NpmScript
[]
=
[];
static
getLabel
(
folderName
:
string
,
relativePath
:
string
):
string
{
static
getLabel
(
_
folderName
:
string
,
relativePath
:
string
):
string
{
if
(
relativePath
.
length
>
0
)
{
return
path
.
join
(
relativePath
,
packageName
);
}
...
...
@@ -338,7 +338,6 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
folder
.
addPackage
(
packageJson
);
packages
.
set
(
fullPath
,
packageJson
);
}
let
fullScriptPath
=
path
.
join
(
packageJson
.
path
,
each
.
name
);
let
script
=
new
NpmScript
(
this
.
extensionContext
,
packageJson
,
each
);
packageJson
.
addScript
(
script
);
}
...
...
extensions/npm/src/scriptHover.ts
浏览文件 @
936742b5
...
...
@@ -29,10 +29,8 @@ export function invalidateHoverScriptsCache(document?: TextDocument) {
}
export
class
NpmScriptHoverProvider
implements
HoverProvider
{
private
extensionContext
:
ExtensionContext
;
constructor
(
context
:
ExtensionContext
)
{
this
.
extensionContext
=
context
;
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
'
npm.runScriptFromHover
'
,
this
.
runScriptFromHover
,
this
));
context
.
subscriptions
.
push
(
commands
.
registerCommand
(
'
npm.debugScriptFromHover
'
,
this
.
debugScriptFromHover
,
this
));
}
...
...
extensions/npm/src/tasks.ts
浏览文件 @
936742b5
...
...
@@ -6,7 +6,7 @@
import
{
TaskDefinition
,
Task
,
TaskGroup
,
WorkspaceFolder
,
RelativePattern
,
ShellExecution
,
Uri
,
workspace
,
DebugConfiguration
,
debug
,
TaskProvider
,
ExtensionContext
,
TextDocument
,
tasks
DebugConfiguration
,
debug
,
TaskProvider
,
TextDocument
,
tasks
}
from
'
vscode
'
;
import
*
as
path
from
'
path
'
;
import
*
as
fs
from
'
fs
'
;
...
...
@@ -26,10 +26,8 @@ type AutoDetect = 'on' | 'off';
let
cachedTasks
:
Task
[]
|
undefined
=
undefined
;
export
class
NpmTaskProvider
implements
TaskProvider
{
private
extensionContext
:
ExtensionContext
;
constructor
(
context
:
ExtensionContext
)
{
this
.
extensionContext
=
context
;
constructor
()
{
}
public
provideTasks
()
{
...
...
@@ -373,7 +371,7 @@ async function findAllScripts(buffer: string): Promise<StringMap> {
}
else
if
(
inScripts
&&
!
script
)
{
script
=
property
;
}
else
{
// nested object which is invalid, ignore the script
}
else
{
// nested object which is invalid, ignore the script
script
=
undefined
;
}
}
...
...
@@ -444,14 +442,14 @@ export function findScriptAtPosition(buffer: string, offset: number): string | u
}
}
},
onObjectProperty
(
property
:
string
,
nodeOffset
:
number
,
nodeLength
:
number
)
{
onObjectProperty
(
property
:
string
,
nodeOffset
:
number
)
{
if
(
property
===
'
scripts
'
)
{
inScripts
=
true
;
}
else
if
(
inScripts
)
{
scriptStart
=
nodeOffset
;
script
=
property
;
}
else
{
// nested object which is invalid, ignore the script
}
else
{
// nested object which is invalid, ignore the script
script
=
undefined
;
}
}
...
...
extensions/npm/tsconfig.json
浏览文件 @
936742b5
{
"extends"
:
"../shared.tsconfig.json"
,
"compilerOptions"
:
{
"target"
:
"es6"
,
"module"
:
"commonjs"
,
"lib"
:
[
"es2016"
],
"outDir"
:
"./out"
,
"noImplicitAny"
:
true
,
"noImplicitReturns"
:
true
,
"strict"
:
true
"outDir"
:
"./out"
},
"include"
:
[
"src/**/*"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录