Resolves a case where a missing semicolon was not inferred (#12792)

A rule used in includeDirective has been rewritten so that it is called
when it may be needed.

Change-Id: I6705f478a40727984b644cd2da96a7aae03b7a99