Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6af29879
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,发现更多精彩内容 >>
提交
6af29879
编写于
6月 11, 2020
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
html/json: compute server module without server package.json
上级
4b9f0916
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
38 deletion
+16
-38
extensions/html-language-features/client/src/htmlMain.ts
extensions/html-language-features/client/src/htmlMain.ts
+8
-20
extensions/json-language-features/client/src/jsonMain.ts
extensions/json-language-features/client/src/jsonMain.ts
+8
-18
未找到文件。
extensions/html-language-features/client/src/htmlMain.ts
浏览文件 @
6af29879
...
...
@@ -3,7 +3,6 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
path
from
'
path
'
;
import
*
as
fs
from
'
fs
'
;
import
*
as
nls
from
'
vscode-nls
'
;
const
localize
=
nls
.
loadMessageBundle
();
...
...
@@ -51,6 +50,7 @@ interface IPackageInfo {
name
:
string
;
version
:
string
;
aiKey
:
string
;
main
:
string
;
}
let
telemetryReporter
:
TelemetryReporter
|
null
;
...
...
@@ -59,11 +59,11 @@ let telemetryReporter: TelemetryReporter | null;
export
function
activate
(
context
:
ExtensionContext
)
{
let
toDispose
=
context
.
subscriptions
;
let
packageInfo
=
getPackageInfo
(
context
);
telemetryReporter
=
packageInfo
&&
new
TelemetryReporter
(
packageInfo
.
name
,
packageInfo
.
version
,
packageInfo
.
aiKey
);
let
clientPackageJSON
=
getPackageInfo
(
context
);
telemetryReporter
=
new
TelemetryReporter
(
clientPackageJSON
.
name
,
clientPackageJSON
.
version
,
clientPackageJSON
.
aiKey
);
let
serverMain
=
readJSONFile
(
context
.
asAbsolutePath
(
'
./server/package.json
'
)).
main
;
let
serverModule
=
context
.
asAbsolutePath
(
path
.
join
(
'
server
'
,
serverMain
)
);
const
serverMain
=
`./server/
${
clientPackageJSON
.
main
.
indexOf
(
'
/dist/
'
)
!==
-
1
?
'
dist
'
:
'
out
'
}
/htmlServerMain`
;
const
serverModule
=
context
.
asAbsolutePath
(
serverMain
);
// The debug options for the server
let
debugOptions
=
{
execArgv
:
[
'
--nolazy
'
,
'
--inspect=6045
'
]
};
...
...
@@ -320,25 +320,13 @@ export function activate(context: ExtensionContext) {
toDispose
.
push
();
}
function
getPackageInfo
(
context
:
ExtensionContext
):
IPackageInfo
|
null
{
let
extensionPackage
=
readJSONFile
(
context
.
asAbsolutePath
(
'
./package.json
'
));
if
(
extensionPackage
)
{
return
{
name
:
extensionPackage
.
name
,
version
:
extensionPackage
.
version
,
aiKey
:
extensionPackage
.
aiKey
};
}
return
null
;
}
function
readJSONFile
(
location
:
string
)
{
function
getPackageInfo
(
context
:
ExtensionContext
):
IPackageInfo
{
const
location
=
context
.
asAbsolutePath
(
'
./package.json
'
);
try
{
return
JSON
.
parse
(
fs
.
readFileSync
(
location
).
toString
());
}
catch
(
e
)
{
console
.
log
(
`Problems reading
${
location
}
:
${
e
}
`
);
return
{};
return
{
name
:
''
,
version
:
''
,
aiKey
:
''
,
main
:
''
};
}
}
...
...
extensions/json-language-features/client/src/jsonMain.ts
浏览文件 @
6af29879
...
...
@@ -57,6 +57,7 @@ interface IPackageInfo {
name
:
string
;
version
:
string
;
aiKey
:
string
;
main
:
string
;
}
interface
Settings
{
...
...
@@ -91,11 +92,11 @@ export function activate(context: ExtensionContext) {
let
rangeFormatting
:
Disposable
|
undefined
=
undefined
;
const
packageInfo
=
getPackageInfo
(
context
);
telemetryReporter
=
packageInfo
&&
new
TelemetryReporter
(
packageInfo
.
name
,
packageInfo
.
version
,
packageInfo
.
aiKey
);
let
clientPackageJSON
=
getPackageInfo
(
context
);
telemetryReporter
=
new
TelemetryReporter
(
clientPackageJSON
.
name
,
clientPackageJSON
.
version
,
clientPackageJSON
.
aiKey
);
const
serverMain
=
readJSONFile
(
context
.
asAbsolutePath
(
'
./server/package.json
'
)).
main
;
const
serverModule
=
context
.
asAbsolutePath
(
path
.
join
(
'
server
'
,
serverMain
)
);
const
serverMain
=
`./server/
${
clientPackageJSON
.
main
.
indexOf
(
'
/dist/
'
)
!==
-
1
?
'
dist
'
:
'
out
'
}
/jsonServerMain`
;
const
serverModule
=
context
.
asAbsolutePath
(
serverMain
);
// The debug options for the server
const
debugOptions
=
{
execArgv
:
[
'
--nolazy
'
,
'
--inspect=
'
+
(
9000
+
Math
.
round
(
Math
.
random
()
*
10000
))]
};
...
...
@@ -520,24 +521,13 @@ function getSchemaId(schema: JSONSchemaSettings, folderUri?: Uri) {
return
url
;
}
function
getPackageInfo
(
context
:
ExtensionContext
):
IPackageInfo
|
undefined
{
const
extensionPackage
=
readJSONFile
(
context
.
asAbsolutePath
(
'
./package.json
'
));
if
(
extensionPackage
)
{
return
{
name
:
extensionPackage
.
name
,
version
:
extensionPackage
.
version
,
aiKey
:
extensionPackage
.
aiKey
};
}
return
undefined
;
}
function
readJSONFile
(
location
:
string
)
{
function
getPackageInfo
(
context
:
ExtensionContext
):
IPackageInfo
{
const
location
=
context
.
asAbsolutePath
(
'
./package.json
'
);
try
{
return
JSON
.
parse
(
fs
.
readFileSync
(
location
).
toString
());
}
catch
(
e
)
{
console
.
log
(
`Problems reading
${
location
}
:
${
e
}
`
);
return
{};
return
{
name
:
''
,
version
:
''
,
aiKey
:
''
,
main
:
''
};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录