Skip to content

Commit ecc16d5

Browse files
author
Paul van Brenk
committed
PR feedback and fix build break
1 parent 7ba0b1e commit ecc16d5

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Common/Product/SharedProject/CommonUtils.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ internal static Uri MakeUri(string path, bool isDirectory, UriKind kind, string
4646
}
4747

4848
return new Uri(path, kind);
49-
5049
} catch (UriFormatException ex) {
5150
throw new ArgumentException("Path was invalid", throwParameterName, ex);
5251
} catch (ArgumentException ex) {
@@ -62,6 +61,13 @@ public static string NormalizePath(string path) {
6261
return null;
6362
}
6463

64+
const string MdhaPrefix = "mdha:";
65+
66+
// webkit debugger prepends with 'mdha'
67+
if (path.StartsWith(MdhaPrefix, StringComparison.OrdinalIgnoreCase)) {
68+
path = path.Substring(MdhaPrefix.Length);
69+
}
70+
6571
var uri = MakeUri(path, false, UriKind.RelativeOrAbsolute);
6672
if (uri.IsAbsoluteUri) {
6773
if (uri.IsFile) {

Common/Product/SharedProject/ProjectNode.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5596,10 +5596,6 @@ public virtual int GetBuildSystemKind(out uint kind) {
55965596
internal HierarchyNode FindNodeByFullPath(string name) {
55975597
Site.GetUIThread().MustBeCalledFromUIThread();
55985598

5599-
if (name.StartsWith("mdha:", StringComparison.OrdinalIgnoreCase)) {
5600-
return default(HierarchyNode);
5601-
}
5602-
56035599
Debug.Assert(Path.IsPathRooted(name));
56045600

56055601
HierarchyNode node;

Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ private string GetFullUrl() {
247247
}
248248
}
249249

250-
private static string GetFullUrl(string host, int port) {
250+
internal static string GetFullUrl(string host, int port) {
251251
UriBuilder builder;
252252
Uri uri;
253253
if (Uri.TryCreate(host, UriKind.Absolute, out uri)) {

0 commit comments

Comments
 (0)