sorting completion list

TurboBird.lpi

@@ -60,11 +60,7 @@
         <Filename Value="TurboBird.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TurboBird"/>
-<<<<<<< HEAD
-        <IsVisibleTab Value="True"/>
-=======
->>>>>>> upstream/master
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="25" Y="5"/>
@@ -121,26 +117,15 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="QueryWindow"/>
-<<<<<<< HEAD
-        <EditorIndex Value="0"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="1509"/>
-        <CursorPos X="1" Y="1533"/>
-        <UsageCount Value="200"/>
-        <Bookmarks Count="2">
-          <Item0 X="3" Y="1007" ID="0"/>
-          <Item1 X="3" Y="1829" ID="1"/>
-=======
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1896"/>
-        <CursorPos X="3" Y="920"/>
+        <TopLine Value="1892"/>
+        <CursorPos X="13" Y="1896"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="2">
-          <Item0 X="3" Y="1032" ID="0"/>
-          <Item1 X="3" Y="1857" ID="1"/>
->>>>>>> upstream/master
+          <Item0 X="3" Y="1034" ID="0"/>
+          <Item1 X="3" Y="1859" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -742,7 +727,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="37"/>
         <CursorPos X="31" Y="63"/>
-        <UsageCount Value="186"/>
+        <UsageCount Value="189"/>
       </Unit71>
       <Unit72>
         <Filename Value="../../lazarus/lazarus/lcl/include/menuitem.inc"/>
@@ -768,7 +753,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="51" Y="14"/>
-        <UsageCount Value="157"/>
+        <UsageCount Value="160"/>
       </Unit74>
       <Unit75>
         <Filename Value="/usr/lib/lazarus/0.9.30/lcl/comctrls.pp"/>
@@ -961,7 +946,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="64"/>
         <CursorPos X="16" Y="66"/>
-        <UsageCount Value="125"/>
+        <UsageCount Value="128"/>
       </Unit98>
       <Unit99>
         <Filename Value="../../FromInternet/fpc2.4/fpc-2.4.4/packages/ibase/src/ibase60dyn.pp"/>
@@ -996,7 +981,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="15" Y="255"/>
-        <UsageCount Value="112"/>
+        <UsageCount Value="115"/>
       </Unit102>
       <Unit103>
         <Filename Value="/usr/share/fpcsrc/2.6.0/rtl/inc/systemh.inc"/>
@@ -1030,7 +1015,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="58"/>
+        <UsageCount Value="61"/>
       </Unit106>
       <Unit107>
         <Filename Value="../../../lazarus/lcl/interfaces/win32/win32object.inc"/>
@@ -1104,10 +1089,12 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Update"/>
+        <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="151"/>
-        <CursorPos X="40" Y="171"/>
-        <UsageCount Value="22"/>
+        <TopLine Value="1"/>
+        <CursorPos X="20" Y="9"/>
+        <UsageCount Value="25"/>
+        <Loaded Value="True"/>
       </Unit116>
       <Unit117>
         <Filename Value="querycomplition.txt"/>
@@ -1121,239 +1108,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="1866" Column="10" TopLine="1861"/>
+        <Caret Line="483" Column="38" TopLine="451"/>
       </Position1>
       <Position2>
         <Filename Value="querywindow.pas"/>
-<<<<<<< HEAD
-        <Caret Line="11" Column="25" TopLine="1"/>
-      </Position2>
-      <Position3>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="82" Column="30" TopLine="51"/>
-      </Position3>
-      <Position4>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="128" Column="38" TopLine="97"/>
-      </Position4>
-      <Position5>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="642" Column="49" TopLine="610"/>
-      </Position5>
-      <Position6>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="646" Column="11" TopLine="614"/>
-      </Position6>
-      <Position7>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="737" Column="23" TopLine="705"/>
-      </Position7>
-      <Position8>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1070" Column="42" TopLine="1039"/>
-      </Position8>
-      <Position9>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1126" Column="39" TopLine="1095"/>
-      </Position9>
-      <Position10>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1153" Column="39" TopLine="1122"/>
-      </Position10>
-      <Position11>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1522" Column="27" TopLine="1499"/>
-      </Position11>
-      <Position12>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1527" Column="13" TopLine="1499"/>
-      </Position12>
-      <Position13>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position13>
-      <Position14>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1522" Column="13" TopLine="1490"/>
-      </Position14>
-      <Position15>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1568" Column="15" TopLine="1536"/>
-      </Position15>
-      <Position16>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1690" Column="15" TopLine="1658"/>
-      </Position16>
-      <Position17>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position17>
-      <Position18>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1522" Column="13" TopLine="1490"/>
-      </Position18>
-      <Position19>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1568" Column="15" TopLine="1536"/>
-      </Position19>
-      <Position20>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1690" Column="15" TopLine="1658"/>
-      </Position20>
-      <Position21>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position21>
-      <Position22>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1522" Column="13" TopLine="1490"/>
-      </Position22>
-      <Position23>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position23>
-      <Position24>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="103" Column="15" TopLine="85"/>
-      </Position24>
-      <Position25>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="849" Column="9" TopLine="826"/>
-      </Position25>
-      <Position26>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1840" Column="14" TopLine="1808"/>
-      </Position26>
-      <Position27>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1897" Column="5" TopLine="1863"/>
-      </Position27>
-      <Position28>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
-      </Position28>
-      <Position29>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="1531" Column="26" TopLine="1493"/>
-      </Position29>
-      <Position30>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="191" Column="15" TopLine="160"/>
-=======
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="489" Column="58" TopLine="457"/>
       </Position2>
       <Position3>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="89" Column="13" TopLine="58"/>
+        <Caret Line="529" Column="32" TopLine="497"/>
       </Position3>
       <Position4>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="91" Column="13" TopLine="60"/>
+        <Caret Line="531" Column="18" TopLine="499"/>
       </Position4>
       <Position5>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="132" Column="23" TopLine="101"/>
+        <Caret Line="585" Column="23" TopLine="553"/>
       </Position5>
       <Position6>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="133" Column="23" TopLine="102"/>
+        <Caret Line="586" Column="20" TopLine="554"/>
       </Position6>
       <Position7>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="168" Column="27" TopLine="137"/>
+        <Caret Line="588" Column="23" TopLine="556"/>
       </Position7>
       <Position8>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="175" Column="24" TopLine="145"/>
+        <Caret Line="589" Column="20" TopLine="557"/>
       </Position8>
       <Position9>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="188" Column="21" TopLine="158"/>
+        <Caret Line="655" Column="34" TopLine="623"/>
       </Position9>
       <Position10>
-        <Filename Value="querywindow.pas"/>
-        <Caret Line="190" Column="13" TopLine="159"/>
+        <Filename Value="update.pas"/>
+        <Caret Line="171" Column="40" TopLine="150"/>
       </Position10>
       <Position11>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="221" Column="35" TopLine="204"/>
+        <Caret Line="1546" Column="9" TopLine="1542"/>
       </Position11>
       <Position12>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="223" Column="9" TopLine="204"/>
+        <Caret Line="1547" Column="17" TopLine="1543"/>
       </Position12>
       <Position13>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="225" Column="9" TopLine="204"/>
+        <Caret Line="1560" Column="59" TopLine="1550"/>
       </Position13>
       <Position14>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="226" Column="9" TopLine="204"/>
+        <Caret Line="1569" Column="18" TopLine="1554"/>
       </Position14>
       <Position15>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="227" Column="27" TopLine="204"/>
+        <Caret Line="1555" Column="35" TopLine="1545"/>
       </Position15>
       <Position16>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="228" Column="9" TopLine="204"/>
+        <Caret Line="1554" Column="58" TopLine="1547"/>
       </Position16>
       <Position17>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="229" Column="9" TopLine="204"/>
+        <Caret Line="1560" Column="41" TopLine="1546"/>
       </Position17>
       <Position18>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="230" Column="27" TopLine="204"/>
+        <Caret Line="865" Column="42" TopLine="859"/>
       </Position18>
       <Position19>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="231" Column="9" TopLine="204"/>
+        <Caret Line="920" Column="44" TopLine="919"/>
       </Position19>
       <Position20>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="232" Column="32" TopLine="204"/>
+        <Caret Line="1563" Column="23" TopLine="1555"/>
       </Position20>
       <Position21>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="443" Column="23" TopLine="412"/>
+        <Caret Line="1893" Column="3" TopLine="1888"/>
       </Position21>
       <Position22>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="483" Column="38" TopLine="451"/>
+        <Caret Line="1563" Column="63" TopLine="1557"/>
       </Position22>
       <Position23>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="489" Column="58" TopLine="457"/>
+        <Caret Line="6" Column="52" TopLine="1"/>
       </Position23>
       <Position24>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="529" Column="32" TopLine="497"/>
+        <Caret Line="82" Column="19" TopLine="70"/>
       </Position24>
       <Position25>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="531" Column="18" TopLine="499"/>
+        <Caret Line="128" Column="29" TopLine="116"/>
       </Position25>
       <Position26>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="585" Column="23" TopLine="553"/>
+        <Caret Line="643" Column="40" TopLine="630"/>
       </Position26>
       <Position27>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="586" Column="20" TopLine="554"/>
+        <Caret Line="647" Column="17" TopLine="634"/>
       </Position27>
       <Position28>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="588" Column="23" TopLine="556"/>
+        <Caret Line="872" Column="21" TopLine="859"/>
       </Position28>
       <Position29>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="589" Column="20" TopLine="557"/>
+        <Caret Line="1512" Column="27" TopLine="1512"/>
       </Position29>
       <Position30>
         <Filename Value="querywindow.pas"/>
-        <Caret Line="655" Column="34" TopLine="623"/>
->>>>>>> upstream/master
+        <Caret Line="1566" Column="9" TopLine="1554"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
@@ -1361,7 +1232,7 @@
     <Version Value="11"/>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="../Synapse/source/lib"/>
+      <OtherUnitFiles Value="G:/dev/lib/Synapse/source/lib/"/>
     </SearchPaths>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>

querywindow.pas

@@ -203,6 +203,7 @@ type
       var SQLSegment: string; var IsDDL: Boolean): Boolean;
     procedure QueryAfterScroll(DataSet: TDataSet);
     procedure CallExecuteQuery(aQueryType: Integer);
+    procedure sortsyncompletion;
     procedure ThreadTerminated(Sender: TObject);
     procedure EnableButtons;
 
@@ -868,6 +869,7 @@ begin
   // Get current database tables to be hilighted in SQL query editor
   SynSQLSyn1.TableNames.CommaText:= fmMain.GetTableNames(dbIndex);
   SynCompletion1.ItemList.AddStrings(SynSQLSyn1.TableNames);
+  sortsyncompletion;
 end;
 
 (************* Is Selectable (Check statement type Select, Update, Alter, etc) *******************)
@@ -1545,21 +1547,6 @@ var
   F:TextFile;
   str:string;
 begin
-<<<<<<< HEAD
-  if FileExists('querycomplition.txt') then
-  begin
-    AssignFile(F,'querycomplition.txt');
-    Reset(F);
-    while not EOF(F) do
-    begin
-      ReadLn(F,str);
-      SynCompletion1.ItemList.Add(str);
-    end;
-    CloseFile(F);
-  end
-  else
-    SynCompletion1.ItemList.CommaText:= 'create,table,Select,From,INTEGER,FLOAT';
-=======
   if FileExists('querycompletion.txt') then
   begin
     AssignFile(F,'querycompletion.txt');
@@ -1576,8 +1563,7 @@ begin
     SynCompletion1.ItemList.CommaText:= 'create,table,Select,From,INTEGER,FLOAT';
     SynCompletion1.ItemList.SaveToFile('querycompletion.txt');
   end;
->>>>>>> upstream/master
-
+    sortsyncompletion;
 end;
 
 procedure TfmQueryWindow.FormShow(Sender: TObject);
@@ -1901,6 +1887,20 @@ begin
   EnableButtons;
 end;
 
+procedure TfmQueryWindow.sortsyncompletion;
+var
+  sortinglis:TStringList;
+  i:Integer;
+begin
+  sortinglis:=TStringList.Create;
+    for i:=0 to SynCompletion1.ItemList.Count-1 do
+        sortinglis.Add(SynCompletion1.ItemList.Strings[i]);
+    sortinglis.Sort;
+    SynCompletion1.ItemList.Clear;
+    for i:=0 to sortinglis.Count-1 do
+    SynCompletion1.ItemList.Add(sortinglis.Strings[i]);
+end;
+
 procedure TfmQueryWindow.ThreadTerminated(Sender: TObject);
 begin
   // Raise exception if an error occured during thread execution (Open)