Revert "fix, dcd ddoc mouse hint, decl finder, location is not based on the speific document line ending kind but on the system one"

This reverts commit 6aed308035.
This commit is contained in:
Basile Burg 2015-03-17 03:34:42 +01:00
parent 6aed308035
commit d6d6fab659
3 changed files with 38 additions and 3 deletions

View File

@ -205,8 +205,10 @@ type
function AppIsRunning(const ExeName: string):Boolean;
(**
* Returns the length of the line ending of the system
* Returns the length of the line ending in aFilename;
*)
//function getLineEndingLength(const aFilename: string): byte;
function getSysLineEndLen: byte;
implementation
@ -756,6 +758,36 @@ begin
aProcess.Options := aProcess.Options + [poNewConsole];
end;
// TODO-cbugfix: confirm that DCD location info are based on system Line ending and not the one existing in a specific file
//function getLineEndingLength(const aFilename: string): byte;
//var
// value: char;
// le: string;
//begin
// value := #0;
// le := LineEnding;
// result := length(le);
// if not fileExists(aFilename) then
// exit;
// with TMemoryStream.Create do
// try
// LoadFromFile(aFilename);
// while true do
// begin
// if Position = Size then
// exit;
// read(value,1);
// if value = #10 then
// exit(1);
// if value = #13 then
// exit(2);
// end;
// finally
// Free;
// end;
//end;
function getSysLineEndLen: byte;
begin
{$IFDEF WINDOWS}

View File

@ -375,7 +375,10 @@ begin
openDocument(fname);
if srcpos <> -1 then
begin
// note: SelStart only matches srcpos if the target file has the same line ending
// as the operating system: the pos has to be found manually.
sum := 0;
//len := getLineEndingLength(fDoc.fileName);
len := getSysLineEndLen;
for i := 0 to fDoc.Lines.Count-1 do
begin

View File

@ -620,9 +620,9 @@ var
i, len: Integer;
begin
result := 0;
len := getSysLineEndLen;
//len := getLineEndingLength(fFilename);
for i:= 0 to fMousePos.y-2 do
result += length(Lines.Strings[i]) + len;
result += length(Lines.Strings[i]) + getSysLineEndLen;
result += fMousePos.x;
end;