diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.StandardTextDocument.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.StandardTextDocument.cs index d53a0b48528a287903718042ce5a17dcbda7c00a..050c3e36cc2dc4058418db1ad79248b680a3457f 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.StandardTextDocument.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/DocumentProvider.StandardTextDocument.cs @@ -257,8 +257,9 @@ public uint GetItemId() } uint itemId; - Project.Hierarchy.ParseCanonicalName(_itemMoniker, out itemId); - return itemId; + return Project.Hierarchy.ParseCanonicalName(_itemMoniker, out itemId) == VSConstants.S_OK + ? itemId + : (uint)VSConstants.VSITEMID.Nil; } } } diff --git a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs index b2f026a030544bc4e1d84a4338129cdfa8f4f2aa..94ce1e81f8b8e0021efb8ef1f5ef320102cc6be8 100644 --- a/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs +++ b/src/VisualStudio/Core/Def/Implementation/Venus/ContainedDocument.cs @@ -1180,8 +1180,9 @@ public uint GetItemId() } uint itemId; - Project.Hierarchy.ParseCanonicalName(_itemMoniker, out itemId); - return itemId; + return Project.Hierarchy.ParseCanonicalName(_itemMoniker, out itemId) == VSConstants.S_OK + ? itemId + : (uint)VSConstants.VSITEMID.Nil; } private enum RazorCodeBlockType