scope 增加类标记，忽略 super／Self／Super 在的 outline 的显示

Author: lalawue

Diff for: luahelper-lsp/langserver/check/analysis/analysis.go

@@ -8,7 +8,6 @@ import (
 	"luahelper-lsp/langserver/check/projects"
 	"luahelper-lsp/langserver/check/results"
 	"luahelper-lsp/langserver/log"
-	"strings"
 )
 
 // IgnoreInfo 忽略的信息
@@ -141,15 +140,18 @@ func (a *Analysis) exitScope() {
 
 	fileResult := a.curResult
 
-	isMooc := strings.HasSuffix(fileResult.Name, ".mooc")
-
 	// 扫描当前scope，判断哪些局部变量定义了未使用
 	for varName, varInfoList := range scope.LocVarMap {
 		// _ 局部变量忽略, _G也忽略
 		if varName == "_" || varName == "_G" {
 			continue
 		}
 
+		// class/struct/extension 中的 super / Self / Super 忽略
+		if a.curScope.ExtMark == "class" && (varName == "__st" || varName == "Self" || varName == "Super") {
+			continue
+		}
+
 		if common.GConfig.IsIgnoreLocNotUseVar(varName) {
 			// 如果为系统忽略的局部变量定义了，未使用的，忽略掉
 			continue
@@ -191,10 +193,6 @@ func (a *Analysis) exitScope() {
 				}
 			}
 
-			if isMooc && (varName == "Self" || varName == "Super") {
-				continue
-			}
-
 			errorStr := fmt.Sprintf("%s declared and not used", varName)
 			fileResult.InsertError(common.CheckErrorLocalNoUse, errorStr, oneVar.Loc)
 

Diff for: luahelper-lsp/langserver/check/analysis/analysis_stat.go

@@ -1243,6 +1243,7 @@ func (a *Analysis) cgClassStat(node *ast.ClassDefStat) {
 	subScope := common.CreateScopeInfo(backupScope, nil, node.Loc)
 	backupScope.AppendSubScope(subScope)
 	a.curScope = subScope
+	a.curScope.ExtMark = "class"
 
 	for _, nf := range node.Vars {
 		a.cgLocalVarDeclStat(nf)

Diff for: luahelper-lsp/langserver/check/common/scope_info.go

@@ -20,6 +20,7 @@ type ScopeInfo struct {
 	NotVarMap    map[string]NotValStruct // 存放这个块中所有的 if not a ; a这样的局部变量，检查后面的语法
 	MidNotVarMap map[string]NotValStruct // 中间存放的，例如某一个模块里面 if not a or b then，后面又有if not a then，在这个块里面存放临时的数据
 	Loc          lexer.Location          // 位置信息
+	ExtMark      string                  // 标记 class/struct/extension 信息
 }
 
 // CreateScopeInfo 创建一个ScopeInfo指针
@@ -31,6 +32,7 @@ func CreateScopeInfo(parent *ScopeInfo, funcInfo *FuncInfo, loc lexer.Location)
 		LocVarMap:    nil,
 		NotVarMap:    nil,
 		MidNotVarMap: nil,
+		ExtMark:      "",
 	}
 }
 
@@ -417,6 +419,11 @@ func (scope *ScopeInfo) FindAllLocalVal(gScopes []*ScopeInfo) (allSymbolStruct [
 			continue
 		}
 
+		// 过滤 class/struct/extenstion 中的 super / Self / Super
+		if scope.ExtMark == "class" && (strVar == "__st" || strVar == "Self" || strVar == "Super") {
+			continue
+		}
+
 		oneSymbol := FileSymbolStruct{
 			Name:          strVar,
 			Kind:          IKVariable,

Diff for: luahelper-lsp/langserver/check/compiler/parser/mooc_parse_stat.go

@@ -1068,7 +1068,7 @@ func (p *moocParser) parserClassDefStat(global bool, keyToken lexer.TkKind) ast.
 	// 取巧使用 Super
 	if super != nil {
 		varList = append(varList, &ast.LocalVarDeclStat{
-			NameList:   []string{"_"},
+			NameList:   []string{"__st"},
 			VarLocList: locList,
 			AttrList:   attrList,
 			ExpList:    []ast.Exp{super},