Revert "[javascript] fix problem with continue/break/return statements #3772 (#3773)" (#3806)

This reverts commit a2c72ef.

Author: meraedit

javascript/javascript/CSharp/JavaScriptParserBase.cs

@@ -138,10 +138,4 @@ protected bool popHtmlTagName(string tagName)
     {
         return string.Equals(_tagNames.Pop(),tagName, System.StringComparison.InvariantCulture);
     }
-    
-        
-    protected bool notLineTerminatorAhead()
-    {
-        return !lineTerminatorAhead();
-    }
 }

javascript/javascript/Cpp/JavaScriptParserBase.cpp

@@ -88,8 +88,3 @@ bool JavaScriptParserBase::lineTerminatorAhead()
     return (type == JavaScriptParser::MultiLineComment && (text.find("\r") != std::string::npos || text.find("\n") != std::string::npos)) ||
             (type == JavaScriptParser::LineTerminator);
 }
-
-bool JavaScriptParserBase::notLineTerminatorAhead()
-{
-    return !notLineTerminatorAhead();
-}

javascript/javascript/Cpp/JavaScriptParserBase.h

@@ -14,5 +14,4 @@ class JavaScriptParserBase : public antlr4::Parser {
     bool closeBrace();
     bool here(int type);
     bool lineTerminatorAhead();
-    bool notLineTerminatorAhead();
 };

javascript/javascript/Go/javascript_parser_base.go

@@ -103,7 +103,3 @@ func (p *JavaScriptParserBase) lineTerminatorAhead() bool {
 	return (_type == JavaScriptParserMultiLineComment && (strings.Contains(text, "\r") || strings.Contains(text, "\n"))) ||
 		(_type == JavaScriptParserLineTerminator)
 }
-
-func (p *JavaScriptParserBase) notLineTerminatorAhead() bool {
-	return !p.lineTerminatorAhead()
-}

javascript/javascript/Java/JavaScriptParserBase.java

@@ -124,8 +124,4 @@ protected boolean lineTerminatorAhead() {
         return (type == JavaScriptParser.MultiLineComment && (text.contains("\r") || text.contains("\n"))) ||
                 (type == JavaScriptParser.LineTerminator);
     }
-    
-    protected boolean notLineTerminatorAhead() {
-    	return !lineTerminatorAhead();
-    }
 }

javascript/javascript/JavaScript/JavaScriptParserBase.js

@@ -82,8 +82,4 @@ export default class JavaScriptParserBase extends antlr4.Parser {
                 type === JavaScriptParser.LineTerminator
                );
     }
-    
-    notLineTerminatorAhead() {
-        return !this.lineTerminatorAhead();
-    }
 }

javascript/javascript/JavaScriptParser.g4

@@ -185,15 +185,15 @@ varModifier  // let, const - ECMAScript 6
     ;
 
 continueStatement
-    : Continue ({this.notLineTerminatorAhead()}? identifier)? eos
+    : Continue ({this.notLineTerminator()}? identifier)? eos
     ;
 
 breakStatement
-    : Break ({this.notLineTerminatorAhead()}? identifier)? eos
+    : Break ({this.notLineTerminator()}? identifier)? eos
     ;
 
 returnStatement
-    : Return ({this.notLineTerminatorAhead()}? expressionSequence)? eos
+    : Return ({this.notLineTerminator()}? expressionSequence)? eos
     ;
 
 yieldStatement

javascript/javascript/Python3/JavaScriptParserBase.py

@@ -114,8 +114,3 @@ def lineTerminatorAhead(self) -> bool:
 
         return (tokenType == JavaScriptParser.MultiLineComment and (("\r" in text) or ("\n" in text))) or \
             (tokenType == JavaScriptParser.LineTerminator)
-
-    def notLineTerminatorAhead(self) -> bool:
-        JavaScriptParser = self.parser()
-
-        return not self.lineTerminatorAhead()