Fix language server nonstdsymbol support

Author: CppCXY

crates/emmylua_ls/src/handlers/semantic_token/build_semantic_tokens.rs

@@ -184,7 +184,10 @@ fn build_tokens_semantic_token(
                 SemanticTokenModifier::DOCUMENTATION,
             );
         }
-        LuaTokenKind::TkDocDetail | LuaTokenKind::TkNormalStart => {
+        LuaTokenKind::TkNormalStart | LuaTokenKind::TKNonStdComment => {
+            builder.push(token, SemanticTokenType::COMMENT);
+        }
+        LuaTokenKind::TkDocDetail => {
             // We're rendering a description. If description parsing is enabled,
             // this token will be handled by the corresponding description parser.
             let rendering_description = token

crates/emmylua_parser/src/kind/lua_token_kind.rs

@@ -100,6 +100,7 @@ pub enum LuaTokenKind {
     TKDocTriviaStart,   // --------------
     TkDocTrivia,        // other can not parsed
     TkLongCommentEnd,   // ]] or ]===]
+    TKNonStdComment,    // // comment, non-standard lua comment
 
     // tag
     TkTagClass,     // class

crates/emmylua_parser/src/lexer/lua_doc_lexer.rs

@@ -119,6 +119,15 @@ impl LuaDocLexer<'_> {
                     }
                 }
             }
+            '/' if reader.is_start_of_line() => {
+                let count = reader.consume_char_n_times('/', 3);
+                if count >= 2 {
+                    // "//" is a non-standard lua comment
+                    return LuaTokenKind::TkNormalStart;
+                }
+
+                LuaTokenKind::TKNonStdComment
+            }
             _ => {
                 reader.eat_while(|_| true);
                 LuaTokenKind::TkDocTrivia
@@ -537,6 +546,15 @@ impl LuaDocLexer<'_> {
                     }
                 }
             }
+            '/' if reader.is_start_of_line() => {
+                let count = reader.consume_char_n_times('/', 3);
+                if count >= 2 {
+                    // "//" is a non-standard lua comment
+                    return LuaTokenKind::TkNormalStart;
+                }
+
+                LuaTokenKind::TKNonStdComment
+            }
             _ => {
                 reader.eat_while(|_| true);
                 LuaTokenKind::TkDocDetail

crates/emmylua_parser/src/lexer/lua_lexer.rs

@@ -300,6 +300,7 @@ impl<'a> LuaLexer<'a> {
                     _ if self.support_non_std_symbol(LuaNonStdSymbol::DoubleSlash) => {
                         // "//" is a short comment
                         self.reader.bump();
+                        self.reader.eat_while(|ch| ch != '\n' && ch != '\r');
                         return LuaTokenKind::TkShortComment;
                     }
                     _ => {
@@ -382,10 +383,6 @@ impl<'a> LuaLexer<'a> {
                 LuaTokenKind::TkNot
             }
             '&' => {
-                if !self.lexer_config.support_integer_operation() {
-                    self.error(|| t!("bitwise operation is not supported"));
-                }
-
                 self.reader.bump();
                 if self.reader.current_char() == '&'
                     && self.support_non_std_symbol(LuaNonStdSymbol::DoubleAmp)
@@ -399,26 +396,31 @@ impl<'a> LuaLexer<'a> {
                     self.reader.bump();
                     return LuaTokenKind::TkAmpAssign;
                 }
-                LuaTokenKind::TkBitAnd
-            }
-            '|' => {
+
                 if !self.lexer_config.support_integer_operation() {
                     self.error(|| t!("bitwise operation is not supported"));
                 }
-
+                LuaTokenKind::TkBitAnd
+            }
+            '|' => {
                 self.reader.bump();
                 if self.reader.current_char() == '|'
                     && self.support_non_std_symbol(LuaNonStdSymbol::DoublePipe)
                 {
                     self.reader.bump();
                     return LuaTokenKind::TkOr;
                 }
+
                 if self.reader.current_char() == '='
                     && self.support_non_std_symbol(LuaNonStdSymbol::PipeAssign)
                 {
                     self.reader.bump();
                     return LuaTokenKind::TkPipeAssign;
                 }
+
+                if !self.lexer_config.support_integer_operation() {
+                    self.error(|| t!("bitwise operation is not supported"));
+                }
                 LuaTokenKind::TkBitOr
             }
             '(' => {