Merge remote-tracking branch 'upstream/master' into fix-1019

Author: gjsjohnmurray

docs/Gemfile.lock

@@ -234,16 +234,18 @@ GEM
       jekyll-seo-tag (~> 2.1)
     minitest (5.15.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.10-x64-mingw32)
+      racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.0)
+    racc (1.6.1)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -274,6 +276,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.1)
+    unf_ext (0.0.8.1-x64-mingw32)
     unicode-display_width (1.8.0)
     wdm (0.1.1)
     webrick (1.7.0)

src/providers/FileSystemProvider/TextSearchProvider.ts

@@ -251,50 +251,72 @@ export class TextSearchProvider implements vscode.TextSearchProvider {
               // Find all lines that we have matches on
               const lines = file.matches
                 .map((match: SearchMatch) => {
-                  let line = Number(match.line);
+                  let line = match.line ? Number(match.line) : null;
                   if (match.member !== undefined) {
                     // This is an attribute of a class member
-                    const memberMatchPattern = new RegExp(
-                      `^((?:Class|Client)?Method|Property|XData|Query|Trigger|Parameter|Relationship|Index|ForeignKey|Storage|Projection) ${match.member}`
-                    );
-                    for (let i = 0; i < content.length; i++) {
-                      if (content[i].match(memberMatchPattern)) {
-                        let memend = i + 1;
-                        if (
-                          config("multilineMethodArgs", api.configName) &&
-                          content[i].match(/^(?:Class|Client)?Method|Query /)
-                        ) {
-                          // The class member definition is on multiple lines so update the end
-                          for (let j = i + 1; j < content.length; j++) {
-                            if (content[j].trim() === "{") {
-                              memend = j;
-                              break;
-                            }
-                          }
+                    if (match.member == "Storage" && match.attr.includes(",") && match.attrline == undefined) {
+                      // This is inside a Storage definition
+                      const xmlTags = match.attr.split(",");
+                      const storageRegex = new RegExp(`^Storage ${xmlTags[0]}`);
+                      let inStorage = false;
+                      for (let i = 0; i < content.length; i++) {
+                        if (!inStorage && content[i].match(storageRegex)) {
+                          inStorage = true;
+                          xmlTags.shift();
                         }
-                        if (match.attr === undefined) {
-                          if (match.line === undefined) {
-                            // This is in the class member definition
+                        if (inStorage) {
+                          if (xmlTags.length > 0 && content[i].includes(xmlTags[0])) {
+                            xmlTags.shift();
+                          }
+                          if (xmlTags.length == 0 && content[i].includes(match.text)) {
                             line = i;
-                          } else {
-                            // This is in the implementation
-                            line = memend + Number(match.line);
+                            break;
                           }
-                        } else {
-                          if (match.attrline === undefined) {
-                            // This is in the class member definition
-                            line = 1;
-                          } else {
-                            if (match.attr === "Description") {
-                              // This is in the description
-                              line = descLineToDocLine(content, match.attrline, i);
+                        }
+                      }
+                    } else {
+                      const memberMatchPattern = new RegExp(
+                        `^((?:Class|Client)?Method|Property|XData|Query|Trigger|Parameter|Relationship|Index|ForeignKey|Storage|Projection) ${match.member}`
+                      );
+                      for (let i = 0; i < content.length; i++) {
+                        if (content[i].match(memberMatchPattern)) {
+                          let memend = i + 1;
+                          if (
+                            config("multilineMethodArgs", api.configName) &&
+                            content[i].match(/^(?:Class|Client)?Method|Query /)
+                          ) {
+                            // The class member definition is on multiple lines so update the end
+                            for (let j = i + 1; j < content.length; j++) {
+                              if (content[j].trim() === "{") {
+                                memend = j;
+                                break;
+                              }
+                            }
+                          }
+                          if (match.attr === undefined) {
+                            if (match.line === undefined) {
+                              // This is in the class member definition
+                              line = i;
                             } else {
                               // This is in the implementation
-                              line = memend + match.attrline;
+                              line = memend + Number(match.line);
+                            }
+                          } else {
+                            if (match.attrline === undefined) {
+                              // This is in the class member definition
+                              line = 1;
+                            } else {
+                              if (match.attr === "Description") {
+                                // This is in the description
+                                line = descLineToDocLine(content, match.attrline, i);
+                              } else {
+                                // This is in the implementation
+                                line = memend + match.attrline;
+                              }
                             }
                           }
+                          break;
                         }
-                        break;
                       }
                     }
                   } else if (match.attr !== undefined) {