Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
795c7c60
F
fsharp
项目概览
dotNET Platform
/
fsharp
11 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
795c7c60
编写于
12月 16, 2017
作者:
D
David Wedelich
提交者:
Phillip Carter
12月 16, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not invalidate the BackgroundCompiler config on DocumentChanged (#4121)
上级
351d06b6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
14 deletion
+14
-14
vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
...tion/src/FSharp.Editor/LanguageService/LanguageService.fs
+14
-14
未找到文件。
vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
浏览文件 @
795c7c60
...
...
@@ -143,12 +143,12 @@ type internal FSharpProjectOptionsManager
}
/// Update the info for a project in the project table
member
this
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
,
projectId
,
site
,
userOpName
)
=
member
this
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
,
projectId
,
site
,
userOpName
,
invalidateConfig
)
=
projectOptionsTable
.
AddOrUpdateProject
(
projectId
,
(
fun
isRefresh
->
let
extraProjectInfo
=
Some
(
box
workspace
)
let
tryGetOptionsForReferencedProject
f
=
f
|>
tryGetOrCreateProjectId
|>
Option
.
bind
this
.
TryGetOptionsForProject
|>
Option
.
map
(
fun
(_,
_,
projectOptions
)
->
projectOptions
)
let
referencedProjects
,
projectOptions
=
ProjectSitesAndFiles
.
GetProjectOptionsForProjectSite
(
Settings
.
LanguageServicePerformance
.
EnableInMemoryCrossProjectReferences
,
tryGetOptionsForReferencedProject
,
site
,
serviceProvider
,
(
tryGetOrCreateProjectId
(
site
.
ProjectFileName
)),
site
.
ProjectFileName
,
extraProjectInfo
,
Some
projectOptionsTable
,
true
)
checkerProvider
.
Checker
.
InvalidateConfiguration
(
projectOptions
,
startBackgroundCompileIfAlreadySeen
=
not
isRefresh
,
userOpName
=
userOpName
+
".UpdateProjectInfo"
)
if
invalidateConfig
then
checkerProvider
.
Checker
.
InvalidateConfiguration
(
projectOptions
,
startBackgroundCompileIfAlreadySeen
=
not
isRefresh
,
userOpName
=
userOpName
+
".UpdateProjectInfo"
)
let
referencedProjectIds
=
referencedProjects
|>
Array
.
choose
tryGetOrCreateProjectId
let
parsingOptions
,
_
=
checkerProvider
.
Checker
.
GetParsingOptionsFromProjectOptions
(
projectOptions
)
referencedProjectIds
,
parsingOptions
,
Some
site
,
projectOptions
))
...
...
@@ -205,7 +205,7 @@ type internal FSharpProjectOptionsManager
member
this
.
ProvideProjectSiteProvider
(
project
:
Project
)
=
provideProjectSiteProvider
(
workspace
,
project
,
serviceProvider
,
Some
projectOptionsTable
)
/// Tell the checker to update the project info for the specified project id
member
this
.
UpdateProjectInfoWithProjectId
(
projectId
:
ProjectId
,
userOpName
)
=
member
this
.
UpdateProjectInfoWithProjectId
(
projectId
:
ProjectId
,
userOpName
,
invalidateConfig
)
=
let
hier
=
workspace
.
GetHierarchy
(
projectId
)
match
hier
with
|
null
->
()
...
...
@@ -215,13 +215,13 @@ type internal FSharpProjectOptionsManager
let
siteProvider
=
this
.
ProvideProjectSiteProvider
(
project
)
let
projectSite
=
siteProvider
.
GetProjectSite
()
if
projectSite
.
CompilationSourceFiles
.
Length
<>
0
then
this
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
,
projectId
,
projectSite
,
userOpName
)
this
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
,
projectId
,
projectSite
,
userOpName
,
invalidateConfig
)
|
_
->
()
/// Tell the checker to update the project info for the specified project id
member
this
.
UpdateDocument
tInfoWithProjectId
(
projectId
:
ProjectId
,
documentId
:
DocumentId
,
userOpName
)
=
member
this
.
UpdateDocument
InfoWithProjectId
(
projectId
:
ProjectId
,
documentId
:
DocumentId
,
userOpName
,
invalidateConfig
)
=
if
workspace
.
IsDocumentOpen
(
documentId
)
then
this
.
UpdateProjectInfoWithProjectId
(
projectId
,
userOpName
)
this
.
UpdateProjectInfoWithProjectId
(
projectId
,
userOpName
,
invalidateConfig
)
[<
Export
>]
/// This handles commandline change notifications from the Dotnet Project-system
...
...
@@ -233,7 +233,7 @@ type internal FSharpProjectOptionsManager
let
referencePaths
=
references
|>
Seq
.
map
(
fun
r
->
fullPath
r
.
Reference
)
|>
Seq
.
toArray
let
projectId
=
workspace
.
ProjectTracker
.
GetOrCreateProjectIdForPath
(
path
,
projectDisplayNameOf
path
)
projectOptionsTable
.
SetOptionsWithProjectId
(
projectId
,
sourcePaths
,
referencePaths
,
options
.
ToArray
()
)
this
.
UpdateProjectInfoWithProjectId
(
projectId
,
"HandleCommandLineChanges"
)
this
.
UpdateProjectInfoWithProjectId
(
projectId
,
"HandleCommandLineChanges"
,
invalidateConfig
=
true
)
member
__.
Checker
=
checkerProvider
.
Checker
...
...
@@ -341,11 +341,11 @@ type
let
optionsAssociation
=
ConditionalWeakTable
<
IWorkspaceProjectContext
,
string
[]
>()
member
private
this
.
OnProjectAdded
(
projectId
:
ProjectId
)
=
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
projectId
,
"OnProjectAdded"
)
member
private
this
.
OnProjectReloaded
(
projectId
:
ProjectId
)
=
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
projectId
,
"OnProjectReloaded"
)
member
private
this
.
OnDocumentAdded
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
tInfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentAdded"
)
member
private
this
.
OnDocumentChanged
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
tInfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentChanged"
)
member
private
this
.
OnDocumentReloaded
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
tInfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentReloaded"
)
member
private
this
.
OnProjectAdded
(
projectId
:
ProjectId
)
=
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
projectId
,
"OnProjectAdded"
,
invalidateConfig
=
true
)
member
private
this
.
OnProjectReloaded
(
projectId
:
ProjectId
)
=
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
projectId
,
"OnProjectReloaded"
,
invalidateConfig
=
true
)
member
private
this
.
OnDocumentAdded
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
InfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentAdded"
,
invalidateConfig
=
true
)
member
private
this
.
OnDocumentChanged
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
InfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentChanged"
,
invalidateConfig
=
false
)
member
private
this
.
OnDocumentReloaded
(
projectId
:
ProjectId
,
documentId
:
DocumentId
)
=
projectInfoManager
.
UpdateDocument
InfoWithProjectId
(
projectId
,
documentId
,
"OnDocumentReloaded"
,
invalidateConfig
=
true
)
override
this
.
Initialize
()
=
base
.
Initialize
()
...
...
@@ -473,7 +473,7 @@ type
// update the cached options
if
updated
then
projectInfoManager
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
workspace
,
project
.
Id
,
site
,
userOpName
+
".SyncProject"
)
projectInfoManager
.
UpdateProjectInfo
(
tryGetOrCreateProjectId
workspace
,
project
.
Id
,
site
,
userOpName
+
".SyncProject"
,
invalidateConfig
=
true
)
member
this
.
SetupProjectFile
(
siteProvider
:
IProvideProjectSite
,
workspace
:
VisualStudioWorkspaceImpl
,
userOpName
)
=
let
userOpName
=
userOpName
+
".SetupProjectFile"
...
...
@@ -583,7 +583,7 @@ type
let
fileContents
=
VsTextLines
.
GetFileContents
(
textLines
,
textViewAdapter
)
this
.
SetupStandAloneFile
(
filename
,
fileContents
,
this
.
Workspace
,
hier
)
|
id
->
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
id
.
ProjectId
,
"SetupNewTextView"
)
projectInfoManager
.
UpdateProjectInfoWithProjectId
(
id
.
ProjectId
,
"SetupNewTextView"
,
invalidateConfig
=
true
)
|
_
->
let
fileContents
=
VsTextLines
.
GetFileContents
(
textLines
,
textViewAdapter
)
this
.
SetupStandAloneFile
(
filename
,
fileContents
,
this
.
Workspace
,
hier
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录