Detect when we are in the uses section or elsewhere

Author: graemeg

apps/ide/sourcepage.pas

@@ -1202,8 +1202,20 @@ procedure tsourcepage.hidehint;
 end;
 
 procedure tsourcepage.showlink(const apos: gridcoordty);
+var
+ pos1: sourceposty;
+ str1: msestring;
+ startword: gridcoordty;
 begin
- edit.showlink(apos,pascaldelims + '[]');
+ pos1.pos:= apos;
+ if inusessection(edit,pos1) then
+ begin
+  // In uses statements, don't use dot as delimiter to support namespace units
+  startword := edit.wordatpos(pos1.pos,str1,defaultdelimchars + ',;{}/',[]);
+  edit.showlink(startword,pascaldelims + '[]')
+ end
+ else
+  edit.showlink(apos,pascaldelims + '.[]');
 end;
 
 procedure tsourcepage.editontextmouseevent(const sender: tobject;
@@ -1253,6 +1265,8 @@ procedure tsourcepage.editontextmouseevent(const sender: tobject;
     if (shiftstate1 = [ss_ctrl,ss_left]) {and active} then begin
 //     include(info.mouseeventinfopo^.eventstate,es_processed);
      pos1.pos:= info.pos;
+     if inusessection(edit,pos1) then
+      pos1.pos:= edit.wordatpos(info.pos,str1,defaultdelimchars + ',;{}/',[]);
      pos1.filename:= designer.designfiles.find(edit.filename);
      if findlinkdest(edit,pos1,str1) then begin
       fshowsourcepos:= pos1;

apps/ide/sourceupdate.pas

@@ -256,6 +256,9 @@ function completeclass(const filename: filenamety; var pos: sourceposty): boolea
 function getimplementationtext(const amodule: tmsecomponent; out aunit: punitinfoty;
                 out start,stop: sourceposty; out adest: msestring): boolean;
                 //false if not found
+
+function inusessection(const edit: tsyntaxedit; var apos: sourceposty): Boolean;
+
 implementation
 uses
  sysutils,msesys,msefileutils,sourceform,sourcepage,projectoptionsform,
@@ -269,6 +272,34 @@ implementation
  {$endif}
 {$endif}
 
+function inusessection(const edit: tsyntaxedit; var apos: sourceposty): Boolean;
+var
+  po1: punitinfoty;
+  po2: psourceitemty;
+  str1: msestring;
+  startword: gridcoordty;
+  apos2: sourceposty;
+begin
+  Result := False;
+
+  startword := edit.wordatpos(apos.pos,str1,defaultdelimchars + ',;{}/',[]);
+  apos2.pos := startword;
+
+  with sourceupdater do
+    if not application.waitcanceled then
+    begin
+      po1 := updatesourceunit(edit.filename, apos2.filenum, false);
+
+      if updateline(po1, apos2) then
+      begin
+        po2 := findsourceitem(po1, apos2);
+        if po2 <> nil then
+          if po2^.kind = sik_uses then
+            Result := True;
+       end;
+    end;
+end;
+
 function findprogramlanguage(const afilename: filenamety): proglangty;
 var
  mstr1: msestring;