Skip to content

Commit 3550b1a

Browse files
committed
Parse and ignore private members
1 parent 6c47bd3 commit 3550b1a

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

samples/modifiers.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ declare module modifiers {
3737
readonly scheme: string;
3838
readonly authority: string;
3939
readonly path: string;
40+
private cache;
41+
private updateCache();
4042
}
4143

4244
}

src/main/scala/org/scalajs/tools/tsimporter/Importer.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,8 @@ class Importer(val output: java.io.PrintWriter) {
188188
setterSym.resultType = TypeRef.Unit
189189
setterSym.isBracketAccess = true
190190

191+
case PrivateMember => // ignore
192+
191193
case _ =>
192194
owner.members += new CommentSymbol("??? "+member)
193195
}

src/main/scala/org/scalajs/tools/tsimporter/Trees.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,6 @@ object Trees {
174174

175175
case class FunctionMember(name: PropertyName, optional: Boolean,
176176
signature: FunSignature, modifiers: Modifiers) extends MemberTree
177+
178+
case object PrivateMember extends MemberTree
177179
}

src/main/scala/org/scalajs/tools/tsimporter/parser/TSDefParser.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,14 @@ class TSDefParser extends StdTokenParsers with ImplicitConversions {
276276
lazy val indexMember: Parser[MemberTree] =
277277
("[" ~> identifier ~ typeAnnotation <~ "]") ~ typeAnnotation ^^ IndexMember
278278

279-
lazy val namedMember: Parser[MemberTree] =
279+
lazy val namedMember: Parser[MemberTree] = {
280280
modifiers ~ propertyName ~ optionalMarker >> {
281281
case mods ~ name ~ optional => (
282282
functionSignature ^^ (FunctionMember(name, optional, _, mods))
283283
| typeAnnotation ^^ (PropertyMember(name, optional, _, mods))
284284
)
285-
}
285+
} | "private" ~> propertyName ~ (functionSignature | ";") ^^^ PrivateMember
286+
}
286287

287288
lazy val modifiers: Parser[Modifiers] =
288289
rep(modifier).map(_.toSet)

0 commit comments

Comments
 (0)