feat(selectionRange): add if for while try range support

Author: iamcco

.vim/coc-settings.json

@@ -3,13 +3,19 @@
     "Runtimepath",
     "Vimruntime",
     "Workdir",
+    "argpos",
+    "cmdpos",
+    "cond",
+    "endfor",
     "endfunction",
+    "endwhile",
     "fitem",
     "fitems",
     "flist",
     "fname",
     "fpath",
     "iskeyword",
+    "linepos",
     "lnum",
     "msglog",
     "neco",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vim-language-server",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "vim language server",
   "keywords": [
     "viml",

src/handles/selectionRange.ts

@@ -14,31 +14,26 @@ export const selectionRangeProvider = (params: SelectionRangeParams): SelectionR
   if (!buffer || !document) {
     return selectRanges;
   }
-  const globalFunctions = buffer.getGlobalFunctions();
-  const scriptFunctions = buffer.getScriptFunctions();
+  const vimRanges = buffer.getRanges()
+  if (vimRanges.length === 0) {
+    return selectRanges
+  }
 
-  const funcs = Object.values(globalFunctions).concat(Object.values(scriptFunctions))
-    .reduce((pre, cur) => {
-      return pre.concat(cur);
-    }, [])
   let range = Range.create(positions[0], positions[0])
   if (positions.length > 1) {
     range = Range.create(positions[0], positions[positions.length - 1])
   }
-  const ranges: Range[] = []
-  funcs.forEach(item => {
-    const p = item.range
+  let ranges: Range[] = []
+  vimRanges.forEach(vimRange => {
     const line = document.getText(Range.create(
-      Position.create(p.endLine - 1, 0),
-      Position.create(p.endLine, 0)
+      Position.create(vimRange.endLine - 1, 0),
+      Position.create(vimRange.endLine, 0)
     ))
     const newRange = Range.create(
-      Position.create(p.startLine - 1, p.startCol - 1),
-      Position.create(p.endLine - 1, p.endCol - 1 + line.slice(p.endCol - 1).split(' ')[0].length)
+      Position.create(vimRange.startLine - 1, vimRange.startCol - 1),
+      Position.create(vimRange.endLine - 1, vimRange.endCol - 1 + line.slice(vimRange.endCol - 1).split(' ')[0].length)
     )
-    if (range.start.line >= newRange.start.line
-      && range.end.line <= newRange.end.line
-      && !(range.start.line === newRange.start.line && range.end.line === newRange.end.line)) {
+    if (range.start.line >= newRange.start.line && range.end.line <= newRange.end.line) {
       if (ranges.length === 0) {
         ranges.push(newRange)
       } else {
@@ -56,6 +51,11 @@ export const selectionRangeProvider = (params: SelectionRangeParams): SelectionR
     }
   })
   if (ranges.length) {
+    if (ranges.length > 1) {
+      ranges = ranges.filter(newRange => {
+        return range.start.line !== newRange.start.line || range.end.line !== newRange.end.line
+      })
+    }
     selectRanges.push(
       ranges.reverse().reduce((pre, cur, idx) => {
         if (idx === 0) {

src/lib/vimparser.d.ts

@@ -28,6 +28,9 @@ export declare interface INode {
   str: string;
   value?: any;
   endfunction?: INode;
+  endif?: INode;
+  endfor?: INode;
+  endwhile?: INode;
   list?: INode[];
 }
 

src/server/buffer.ts

@@ -132,6 +132,18 @@ export interface IIdentifier {
   startCol: number;
 }
 
+/*
+ * xxxx
+ * endxxx
+ *
+ */
+export interface IRange {
+  startLine: number
+  startCol: number
+  endLine: number
+  endCol: number
+}
+
 const globalFuncPattern = /^(g:\w+(\.\w+)*|[a-zA-Z_]\w*(\.\w+)*|\w+(#\w+)+)$/;
 const scriptFuncPattern = /^(s:\w+(\.\w+)*|<SID>\w+(\.\w+)*)$/i;
 const globalVariablePattern = /^(g:\w+(\.\w+)*|b:\w+(\.\w+)*|\w{1,}(\.\w+)*|\w+(#\w+)+)$/;
@@ -153,6 +165,8 @@ export class Buffer {
   private envs: Record<string, IIdentifier[]> = {};
   private envRefs: Record<string, IIdentifier[]> = {};
 
+  private ranges: IRange[] = []
+
   constructor(
     private uri: string,
     private projectRoot: string,
@@ -193,6 +207,10 @@ export class Buffer {
     return this.localVariableRefs;
   }
 
+  public getRanges() {
+    return this.ranges
+  }
+
   public getProjectRoot() {
     return this.projectRoot;
   }
@@ -402,6 +420,7 @@ export class Buffer {
     this.localVariableRefs = {};
     this.envs = {};
     this.envRefs = {};
+    this.ranges = []
   }
 
   private resolveCompletionItems(nodes: INode | INode[]) {
@@ -446,6 +465,7 @@ export class Buffer {
         case NODE_ELSEIF:
         case NODE_ELSE:
         case NODE_WHILE:
+          this.takeRange(node, ['endif', 'endwhile'])
           nodeList = nodeList.concat(node.body || []);
           nodeList = nodeList.concat(node.cond || []);
           nodeList = nodeList.concat(node.elseif || []);
@@ -501,10 +521,12 @@ export class Buffer {
           nodeList = nodeList.concat(node.body || []);
           nodeList = nodeList.concat(node.right || []);
           this.takeFor([].concat(node.left || []).concat(node.list || []));
+          this.takeRange(node, 'endfor')
           break;
         case NODE_TRY:
         case NODE_CATCH:
         case NODE_FINALLY:
+          this.takeRange(node, 'endtry')
           nodeList = nodeList.concat(node.body || []);
           nodeList = nodeList.concat(node.catch || []);
           nodeList = nodeList.concat(node._finally || []);
@@ -515,6 +537,7 @@ export class Buffer {
             nodeList = nodeList.concat(node.left.left);
           }
           this.takeFunction(node);
+          this.takeRange(node, 'endfunction')
           break;
         case NODE_LIST:
           nodeList = nodeList.concat(node.value || []);
@@ -810,6 +833,19 @@ export class Buffer {
     }
   }
 
+  private takeRange(node: INode, keys: string | string[]) {
+    [].concat(keys).forEach(key => {
+      if (node.pos && node[key] && node[key].pos) {
+        this.ranges.push({
+          startLine: node.pos.lnum,
+          startCol: node.pos.col,
+          endLine: node[key].pos.lnum,
+          endCol: node[key].pos.col
+        })
+      }
+    })
+  }
+
   private takeFor(nodes: INode[]) {
     nodes.forEach((node) => {
       if (node.type !== NODE_IDENTIFIER || !node.pos) {