From e732b27eebed81b336e8dafcc621cd8cd4be3f18 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Tue, 21 Apr 2020 03:33:40 +0200
Subject: [PATCH] remove remaining refs to dastworx

---
 src/u_infos.pas   |  5 -----
 src/u_symlist.pas | 29 ++++++++---------------------
 src/u_synmemo.pas |  3 ---
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/u_infos.pas b/src/u_infos.pas
index 591e7990..7dadac7c 100644
--- a/src/u_infos.pas
+++ b/src/u_infos.pas
@@ -259,11 +259,6 @@ begin
     'mandatory, provides IDE-grade features such as the completion');
   itm.Parent := boxTools;
   itm.ReAlign;
-  itm := TToolInfo.Construct(self, tikFindable, 'dastworx',
-    'background tool that processes the D modules to extract informations' +
-    LineEnding + 'such as the declarations, the imports, the "TODO" comments, etc.');
-  itm.Parent := boxTools;
-  itm.ReAlign;
   itm := TToolInfo.Construct(self, tikOptional, 'dub',
     'the D package manager, mandatory to compile project in DUB format');
   itm.Parent := boxTools;
diff --git a/src/u_symlist.pas b/src/u_symlist.pas
index e27ba582..56abd9a6 100644
--- a/src/u_symlist.pas
+++ b/src/u_symlist.pas
@@ -150,10 +150,7 @@ type
     procedure updateVisibleCat;
     procedure clearTree;
     procedure smartExpand;
-
-    procedure checkIfHasToolExe;
-    procedure callToolProc;
-
+    procedure getSymbols;
     procedure docNew(document: TDexedMemo);
     procedure docClosing(document: TDexedMemo);
     procedure docFocused(document: TDexedMemo);
@@ -187,7 +184,6 @@ implementation
 
 const
   OptsFname = 'symbollist.txt';
-  toolExeName = 'dastworx' + exeExt;
 
 {$REGION Serializable symbols---------------------------------------------------}
 constructor TSymbol.create(ACollection: TCollection);
@@ -329,7 +325,6 @@ begin
   fAutoRefresh := false;
   fRefreshOnFocus := true;
   fRefreshOnChange := false;
-  checkIfHasToolExe;
 
   fActCopyIdent := TAction.Create(self);
   fActCopyIdent.OnExecute:=@actCopyIdentExecute;
@@ -460,10 +455,9 @@ end;
 procedure TSymbolListWidget.SetVisible(value: boolean);
 begin
   inherited;
-  checkIfHasToolExe;
   getMessageDisplay(fMsgs);
   if value then
-    callToolProc;
+    getSymbols;
 end;
 
 procedure TSymbolListWidget.setToolBarFlat(value: boolean);
@@ -501,7 +495,7 @@ procedure TSymbolListWidget.actRefreshExecute(Sender: TObject);
 begin
   if Updating then
     exit;
-  callToolProc;
+  getSymbols;
 end;
 
 procedure TSymbolListWidget.actAutoRefreshExecute(Sender: TObject);
@@ -551,7 +545,7 @@ begin
   if event <> oeeAccept then
     exit;
   fOptions.AssignTo(self);
-  callToolProc;
+  getSymbols;
 end;
 
 function TSymbolListWidget.optionedOptionsModified: boolean;
@@ -587,7 +581,7 @@ begin
   if fAutoRefresh then
     beginDelayedUpdate
   else if fRefreshOnFocus then
-    callToolProc;
+    getSymbols;
 end;
 
 procedure TSymbolListWidget.docChanged(document: TDexedMemo);
@@ -598,7 +592,7 @@ begin
   if fAutoRefresh then
     beginDelayedUpdate
   else if fRefreshOnChange then
-    callToolProc;
+    getSymbols;
 
   if fSmartExpander then
     smartExpand;
@@ -610,12 +604,11 @@ procedure TSymbolListWidget.updateDelayed;
 begin
   if not fAutoRefresh then
     exit;
-  callToolProc;
+  getSymbols;
 end;
 
 procedure TSymbolListWidget.btnRefreshClick(Sender: TObject);
 begin
-  checkIfHasToolExe;
   fActRefresh.Execute;
 end;
 
@@ -734,13 +727,7 @@ begin
   fDoc.SelectLine;
 end;
 
-procedure TSymbolListWidget.checkIfHasToolExe;
-begin
-  fToolExeName := exeFullName(toolExeName);
-  fHasToolExe := fToolExeName.fileExists;
-end;
-
-procedure TSymbolListWidget.callToolProc;
+procedure TSymbolListWidget.getSymbols;
 
   function getCatNode(node: TTreeNode; stype: TSymbolType ): TTreeNode;
     function newCat(const aCat: string): TTreeNode;
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index bb5f4218..b7f6e499 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -193,7 +193,6 @@ type
     fIdentDialShown: boolean;
     fScrollMemo: TScrollMemo;
     fFilename: string;
-    fDastWorxExename: string;
     fModified: boolean;
     fFileDate: double;
     fCacheLoaded: boolean;
@@ -1215,8 +1214,6 @@ begin
   fAutoCloseCurlyBrace:= autoCloseOnNewLineLexically;
   fAutoClosedPairs:= [autoCloseSquareBracket];
 
-  fDastWorxExename:= exeFullName('dastworx' + exeExt);
-
   fDebugger := EntitiesConnector.getSingleService('IDebugger') as IDebugger;
 
   subjDocNew(TMultiDocSubject(fMultiDocSubject), self);