Merge pull request #184 from royqh1979/develop

* fix: show value of the variable under cursor when debugging

Author: royqh1979

Source/DataFrm.pas

@@ -429,6 +429,9 @@ function TdmMain.GetHighlighter(const FileName: AnsiString): TSynCustomHighlight
       else if (CompareText(ext, '.html')  = 0)
         or (CompareText(ext, '.htm')  = 0)then
         result := HTMLSyn
+      else if (CompareText(ext, '.s')  = 0)
+        or (CompareText(ext, '.asm')  = 0)then
+        result := AsmSyn
       else if (CompareText(ext, '.js')  = 0) then
         result := JSSyn
       else if CompareText(ext, '.css') = 0 then

Source/Editor.pas

@@ -100,6 +100,7 @@   TEditor = class(TObject)
     fActiveLine: integer;
     fDebugGutter: TDebugGutter;
     fCurrentWord: AnsiString;
+    fCurrentHintReason : THandPointReason;
     fCurrentEvalWord: AnsiString;
     fIgnoreCaretChange: boolean;
     fPreviousEditors: TList;
@@ -373,6 +374,7 @@ constructor TEditor.Create(const Filename: AnsiString; Encoding:TFileEncodingTyp
   fUpdateLock := 0;
   fSelChanged:=False;
   fLineCount:=-1;
+  fCurrentHintReason := hprNone;
   fLastMatchingBeginLine:=-1;
   fLastMatchingEndLine:=-1;
   fLastIdCharPressed := 0;
@@ -2993,7 +2995,7 @@ procedure TEditor.EditorMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Int
   begin
     kind := fParser.FindKindOfStatementOf(fFileName, s, p.Line);
 
-    if kind in [skVariable, skParameter] then begin //only show debug info of variables;
+    if kind in [skVariable, skGlobalVariable, skLocalVariable, skParameter] then begin //only show debug info of variables;
       if MainForm.Debugger.Reader.CommandRunning then
         Exit;
 
@@ -3017,6 +3019,7 @@ procedure TEditor.EditorMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Int
     // disable editor hint
     Application.CancelHint;
     fCurrentWord := '';
+    fCurrentHintReason := Reason;
     fText.Hint := '';
 
     // disable page control hint
@@ -3071,12 +3074,13 @@ procedure TEditor.EditorMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Int
   // Don't rescan the same stuff over and over again (that's slow)
 //  if (s = fCurrentWord) and (fText.Hint<>'') then
   s:=trim(s);
-  if (s = fCurrentWord) then
+  if ((s = fCurrentWord) and (fCurrentHintReason = Reason)) then
     Exit; // do NOT remove hint when subject stays the same
 
   // Remove hint
   CancelHint;
   fCurrentWord := s;
+  fCurrentHintReason := Reason;
 
   // We are allowed to change the cursor
   if (ssCtrl in Shift) then
@@ -3422,7 +3426,7 @@ function TEditor.HandpointAllowed(var MousePos: TBufferCoord; ShiftState: TShift
 
   // Only allow in the text area...
   if fText.GetPositionOfMouse(mousepos) then begin
-    if Assigned(GetErrorAtPosition(mousepos)) then begin
+    if not MainForm.Debugger.Executing and Assigned(GetErrorAtPosition(mousepos)) then begin
       Result := hprError;
       Exit;
     end;

Source/Utils.pas

@@ -37,6 +37,7 @@ interface
     utresSrc, // resource source (.rc)
     utPrj, // project file (.dev)
     utMakefile, // makefile (.win)
+    utasmSrc, // asm source file
     utOther // any others
     );
 
@@ -943,6 +944,8 @@ function GetFileTyp(const FileName: AnsiString): TExUnitType;
     result := utresSrc
   else if AnsiMatchText(ext, ['.rh']) then
     result := utresHead
+  else if AnsiMatchText(ext, ['.asm','.s']) then
+    result := utasmSrc
   else
     result := utOther;
 end;

Source/Version.pas

@@ -32,7 +32,7 @@ interface
 
   // exe properties
   DEVCPP = 'Red Panda Dev-C++';
-  DEVCPP_VERSION = '6.7.1';
+  DEVCPP_VERSION = '6.7.2';
 
   // delimiters
   DEV_INTERNAL_OPEN = '$__DEV_INTERNAL_OPEN';