JShell Integration: Improve handling of "var" support

ide/lexer/src/org/netbeans/lib/lexer/token/JoinToken.java

@@ -126,4 +126,8 @@ protected String dumpInfoTokenType() {
         return "JoiT"; // NOI18N
     }
 
+    @Override
+    public String toString() {
+        return "JoinToken{" + "joinedParts=" + joinedParts + ", completeLength=" + completeLength + ", extraTokenListSpanCount=" + extraTokenListSpanCount + '}';
+    }
 }

ide/lexer/src/org/netbeans/lib/lexer/token/PartToken.java

@@ -83,4 +83,9 @@ protected String dumpInfoTokenType() {
         return "ParT[" + (partTokenIndex+1) + "/" + joinToken().joinedParts().size() + "]"; // NOI18N
     }
 
+    @Override
+    public String toString() {
+        return dumpInfoTokenType();
+    }
+
 }

ide/lexer/test/unit/src/org/netbeans/lib/lexer/test/join/JoinRandomTest.java

@@ -56,7 +56,8 @@ protected Level logLevel() {
 
     public void testRandom() throws Exception {
         test(1214497020179L);
-//        test(1212495582649L);
+        test(1212495582649L);
+        test(1740600568165L);
 //        test(0L);
     }
 

java/jshell.support/src/org/netbeans/modules/jshell/resources/layer.xml

@@ -123,6 +123,7 @@
                         <attr name="inherit.rules" boolvalue="true"/>
                         <file name="org-netbeans-modules-jshell-support-LocationSuppressRule.instance"/>
                         <file name="org-netbeans-modules-jshell-support-SemicolonMissingRule.instance"/>
+                        <file name="org-netbeans-modules-jshell-support-VarNotAllowedHereRule.instance"/>
                     </folder>
                 </folder>
             </folder>

java/jshell.support/src/org/netbeans/modules/jshell/support/SemicolonMissingRule.java

@@ -60,7 +60,7 @@ public String createMessage(CompilationInfo info, Diagnostic d, int offset, Tree
             off++;
         }
         final Document doc = info.getSnapshot().getSource().getDocument(false);
-        if (info.getSnapshot().getOriginalOffset(off) == -1) {
+        if (info.getSnapshot().getOriginalOffset(off) == -1  || info.getSnapshot().getOriginalOffset(off + 1) == -1) {
             // suppress semicolon message for end-of-snippet location.
             return ""; // NOI18N
         }
@@ -70,10 +70,10 @@ public String createMessage(CompilationInfo info, Diagnostic d, int offset, Tree
             doc.render(new Runnable() {
                 public void run() {
                     if (foff < doc.getLength()) {
-                        match[0] = true;
+                    match[0] = true;
                     } else try {
                         if (seq.charAt(foff) != doc.getText(foff, 1).charAt(0)) {
-                            match[0] = true;
+                    match[0] = true;
                         }
                     } catch (BadLocationException ex) {
                     }

java/jshell.support/src/org/netbeans/modules/jshell/support/VarNotAllowedHereRule.java

@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jshell.support;
+
+import com.sun.source.util.TreePath;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.tools.Diagnostic;
+import org.netbeans.api.editor.mimelookup.MimePath;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.SourceUtils;
+import org.netbeans.modules.java.hints.friendapi.OverrideErrorMessage;
+
+/**
+ * Suppresses error warning that var is not allowed here. The parsing of a
+ * `var x = ...` statement without a trailing semicolon leads to this warning,
+ * which is invalid.
+ */
+public class VarNotAllowedHereRule implements OverrideErrorMessage {
+    private static final Set<String> CODES = new HashSet<>(Arrays.asList("compiler.err.restricted.type.not.allowed.here"));
+
+    @Override
+    public String createMessage(CompilationInfo info, Diagnostic d, int offset, TreePath treePath, Data data) {
+        if (!info.getSnapshot().getMimeType().equals("text/x-repl")) {
+            MimePath mp = info.getSnapshot().getMimePath();
+            if (!"text/x-repl".equals(mp.getMimeType(0))) {
+                return null;
+            }
+        }
+        Object dp = SourceUtils.getDiagnosticParam(d, 0);
+        if("var".equals(String.valueOf(dp))) {
+            return "";
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public Set getCodes() {
+        return CODES;
+    }
+
+    @Override
+    public List run(CompilationInfo compilationInfo, String diagnosticKey, int offset, TreePath treePath, Data data) {
+        return null;
+    }
+
+    @Override
+    public String getId() {
+        return getClass().getName();
+    }
+
+    @Override
+    public String getDisplayName() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public void cancel() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+}

java/jshell.support/test/unit/src/org/netbeans/modules/jshell/parsing/LexerTest.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jshell.parsing;
+
+import org.junit.Test;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenHierarchy;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.modules.jshell.model.JShellToken;
+
+public class LexerTest {
+
+    @Test
+    public void testVarLexing() {
+        TokenHierarchy<?> hi = TokenHierarchy.create("[1]-> var ", JShellToken.language());
+        enumerateTokenSequence(hi.tokenSequence(), "", false);
+    }
+
+    @Test
+    public void testVarLexing2() {
+        TokenHierarchy<?> hi = TokenHierarchy.create("[1]-> var String = \"Hallo Welt\"", JShellToken.language());
+        enumerateTokenSequence(hi.tokenSequence(), "", false);
+    }
+
+    private void enumerateTokenSequence(TokenSequence<?> ts, String indent, boolean debug) {
+        ts.moveStart();
+        while (ts.moveNext()) {
+            Token t = ts.token();
+            if (debug) {
+                System.out.printf("%s%s/%s%n", indent, t.id().primaryCategory(), t.id().name());
+            }
+            if (t != null) {
+                TokenSequence embeddedTs = ts.embedded();
+                if (embeddedTs != null) {
+                    enumerateTokenSequence(embeddedTs, indent + "  ", debug);
+                }
+            }
+        }
+    }
+}