Skip to content

Better outlining spans for prototype methods #32782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 29, 2019
Merged

Better outlining spans for prototype methods #32782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e860897
Changed outlining to better outline ES5 classes (functions assigned t…
dragomirtitian Jul 22, 2019
6769b97
Changed outlining to better outline ES5 classes (properties assigned …
dragomirtitian Jul 24, 2019
2216892
Fixed some small bugs when merging es5 class nodes. Added tests for n…
dragomirtitian Aug 9, 2019
84ce34c
Added support for interlaced ES5 classes (where an ES5 class's member…
dragomirtitian Aug 15, 2019
a7b3146
Fixed crash in outline when assigning {} to the prototype.
dragomirtitian Aug 15, 2019
0488fea
Added support for nested es5 declarations.
dragomirtitian Aug 25, 2019
f852f00
Added support for prototype assignment for es5 classes.
dragomirtitian Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 236 additions & 18 deletions src/services/navigationBar.ts
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 81 additions & 11 deletions tests/cases/fourslash/navigationBarFunctionPrototype.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,69 @@
// @Filename: foo.js
////function f() {}
////f.prototype.x = 0;
////f.y = 0;
////f.prototype.method = function () {};
////Object.defineProperty(f, 'staticProp', {
//// set: function() {},
//// get: function(){
//// }
////});
////Object.defineProperty(f.prototype, 'name', {
//// set: function() {},
//// get: function(){
//// }
////});

verify.navigationTree({
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "f",
"kind": "function"
},
{
"text": "x",
"kind": "property"
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "x",
"kind": "property"
},
{
"text": "y"
},
{
"text": "method",
"kind": "function"
},
{
"text": "staticProp",
"childItems": [
{
"text": "get",
"kind": "function"
},
{
"text": "set",
"kind": "function"
}
]
},
{
"text": "name",
"childItems": [
{
"text": "get",
"kind": "function"
},
{
"text": "set",
"kind": "function"
}
]
}
]
}
]
});
Expand All @@ -26,17 +77,36 @@ verify.navigationBar([
"childItems": [
{
"text": "f",
"kind": "function"
},
{
"text": "x",
"kind": "property"
"kind": "class"
}
]
},
{
"text": "f",
"kind": "function",
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "x",
"kind": "property"
},
{
"text": "y"
},
{
"text": "method",
"kind": "function"
},
{
"text": "staticProp"
},
{
"text": "name"
}
],
"indent": 1
}
]);
64 changes: 64 additions & 0 deletions tests/cases/fourslash/navigationBarFunctionPrototype2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/// <reference path="fourslash.ts"/>

// @Filename: foo.js

////A.prototype.a = function() { };
////A.prototype.b = function() { };
////function A() {}

verify.navigationTree({
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
},
{
"text": "constructor",
"kind": "constructor"
}
]
}
]
});

verify.navigationBar([
{
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class"
}
]
},
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
},
{
"text": "constructor",
"kind": "constructor"
}
],
"indent": 1
}
]);
64 changes: 64 additions & 0 deletions tests/cases/fourslash/navigationBarFunctionPrototype3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/// <reference path="fourslash.ts"/>

// @Filename: foo.js

////var A;
////A.prototype.a = function() { };
////A.b = function() { };

verify.navigationTree({
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
}
]
}
]
});

verify.navigationBar([
{
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class"
}
]
},
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
}
],
"indent": 1
}
]);
74 changes: 74 additions & 0 deletions tests/cases/fourslash/navigationBarFunctionPrototype4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/// <reference path="fourslash.ts"/>

// @Filename: foo.js

////var A;
////A.prototype = { };
////A.prototype = { m() {} };
////A.prototype.a = function() { };
////A.b = function() { };

verify.navigationTree({
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "m",
"kind": "method"
},
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
}
]
}
]
});

verify.navigationBar([
{
"text": "<global>",
"kind": "script",
"childItems": [
{
"text": "A",
"kind": "class"
}
]
},
{
"text": "A",
"kind": "class",
"childItems": [
{
"text": "constructor",
"kind": "constructor"
},
{
"text": "m",
"kind": "method"
},
{
"text": "a",
"kind": "function"
},
{
"text": "b",
"kind": "function"
}
],
"indent": 1
}
]);
Loading