paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 11:20:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: editor macros: fixed laod/save under unix

Browse Source 
git-svn-id: trunk@38460 -
This commit is contained in:
mattias 2012-08-31 14:14:57 +00:00
parent b40557bc9c
commit 8e1f047f4a
2 changed files with 69 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/editormacrolistviewer.pas
View File

@ -242,7 +242,7 @@ var
SelectedEditorMacro: TEditorMacro = nil;
const
EditorMacroVirtualDrive = '//EMacro:/';
EditorMacroVirtualDrive = '%Macro:/';
implementation
@ -1342,19 +1342,22 @@ begin
end;
function TMacroListView.MacroByFullName(AName: String): TEditorMacro;
const
FolderStart = length(EditorMacroVirtualDrive)+1;
NameStart = FolderStart+length('PRJ/');
var
Alist: TEditorMacroList;
i: Integer;
begin
Result := nil;
If (copy(AName, 1, 10) <> '//EMacro:/') or
(copy(AName, 14, 1) <> '/')
If (copy(AName, 1, length(EditorMacroVirtualDrive)) <> EditorMacroVirtualDrive) or
(copy(AName, NameStart-1, 1) <> '/')
then exit;
Alist := NameToMacroList(copy(AName, 11, 3));
Alist := NameToMacroList(copy(AName, FolderStart, 3));
if (Alist = nil) then exit;
i := Alist.IndexOfName(copy(AName, 15, length(AName)));
i := Alist.IndexOfName(copy(AName, NameStart, length(AName)));
if i < 0 then exit;
Result := Alist.Macros[i]
Result := Alist.Macros[i];
end;
procedure TMacroListView.DoEditorMacroStateChanged;

111
ide/main.pp
View File

@ -9311,21 +9311,25 @@ begin
if not (sfProjectSaving in Flags) then
SaveSourceEditorChangesToCodeCache(nil);
if (uifInternalFile in AnUnitInfo.Flags) and
(copy(AnUnitInfo.Filename, 1, length(EditorMacroVirtualDrive)) = EditorMacroVirtualDrive)
then begin
// save to macros
EMacro := MacroListViewer.MacroByFullName(AnUnitInfo.Filename);
if EMacro <> nil then begin
EMacro.SetFromSource(AEditor.SourceText);
if EMacro.IsInvalid and (EMacro.ErrorMsg <> '') then
MessagesView.AddMsg(EMacro.ErrorMsg, '', -1);
if (uifInternalFile in AnUnitInfo.Flags) then
begin
if (copy(AnUnitInfo.Filename, 1, length(EditorMacroVirtualDrive)) = EditorMacroVirtualDrive)
then begin
// save to macros
EMacro := MacroListViewer.MacroByFullName(AnUnitInfo.Filename);
if EMacro <> nil then begin
EMacro.SetFromSource(AEditor.SourceText);
if EMacro.IsInvalid and (EMacro.ErrorMsg <> '') then
MessagesView.AddMsg(EMacro.ErrorMsg, '', -1);
end;
MacroListViewer.UpdateDisplay;
AnUnitInfo.ClearModifieds;
AEditor.Modified:=false;
Result := mrOK;
exit;
end;
MacroListViewer.UpdateDisplay;
AnUnitInfo.ClearModifieds;
AEditor.Modified:=false;
Result := mrOK;
exit;
// unknown internal file => skip
exit(mrOk);
end;
// if this is a new unit then a simple Save becomes a SaveAs
@ -9728,50 +9732,55 @@ begin
UnitIndex:=Project1.IndexOfFilename(AFilename);
if (UnitIndex > 0) then begin
NewUnitInfo:=Project1.Units[UnitIndex];
if (uifInternalFile in NewUnitInfo.Flags) and
(NewUnitInfo.OpenEditorInfoCount > 0)
then begin
NewEditorInfo := NewUnitInfo.OpenEditorInfo[0];
if MacroListViewer.MacroByFullName(AFileName) <> nil then
NewUnitInfo.Source.Source := MacroListViewer.MacroByFullName(AFileName).GetAsSource;
Result:=DoOpenFileInSourceEditor(NewEditorInfo, NewEditorInfo.PageIndex,
NewEditorInfo.WindowIndex, Flags);
exit;
if (uifInternalFile in NewUnitInfo.Flags) then
begin
if (NewUnitInfo.OpenEditorInfoCount > 0) then begin
NewEditorInfo := NewUnitInfo.OpenEditorInfo[0];
if MacroListViewer.MacroByFullName(AFileName) <> nil then
NewUnitInfo.Source.Source := MacroListViewer.MacroByFullName(AFileName).GetAsSource;
Result:=DoOpenFileInSourceEditor(NewEditorInfo, NewEditorInfo.PageIndex,
NewEditorInfo.WindowIndex, Flags);
exit;
end;
// unknown internal file
exit(mrOk);
end;
end;
end;
if (ofInternalFile in Flags) and
(copy(AFileName, 1, length(EditorMacroVirtualDrive)) = EditorMacroVirtualDrive)
then begin
FilenameNoPath := AFileName;
if (ofInternalFile in Flags) then begin
if (copy(AFileName, 1, length(EditorMacroVirtualDrive)) = EditorMacroVirtualDrive)
then begin
FilenameNoPath := AFileName;
UnitIndex:=Project1.IndexOfFilename(AFilename);
if (UnitIndex < 0) then begin
NewBuf := CodeToolBoss.SourceCache.CreateFile(AFileName);
NewBuf.FileName:=AFileName;
if MacroListViewer.MacroByFullName(AFileName) <> nil then
NewBuf.Source := MacroListViewer.MacroByFullName(AFileName).GetAsSource;
NewUnitInfo:=TUnitInfo.Create(NewBuf);
NewUnitInfo.DefaultSyntaxHighlighter := lshFreePascal;
Project1.AddFile(NewUnitInfo,false);
end
else begin
NewUnitInfo:=Project1.Units[UnitIndex];
end;
NewUnitInfo.Flags := NewUnitInfo.Flags + [uifInternalFile];
UnitIndex:=Project1.IndexOfFilename(AFilename);
if (UnitIndex < 0) then begin
NewBuf := CodeToolBoss.SourceCache.CreateFile(AFileName);
if MacroListViewer.MacroByFullName(AFileName) <> nil then
NewBuf.Source := MacroListViewer.MacroByFullName(AFileName).GetAsSource;
NewUnitInfo:=TUnitInfo.Create(NewBuf);
NewUnitInfo.DefaultSyntaxHighlighter := lshFreePascal;
Project1.AddFile(NewUnitInfo,false);
end
else begin
NewUnitInfo:=Project1.Units[UnitIndex];
end;
NewUnitInfo.Flags := NewUnitInfo.Flags + [uifInternalFile];
if NewUnitInfo.OpenEditorInfoCount > 0 then begin
NewEditorInfo := NewUnitInfo.OpenEditorInfo[0];
SourceEditorManager.ActiveSourceWindowIndex := NewEditorInfo.WindowIndex;
SourceEditorManager.ActiveSourceWindow.PageIndex:= NewEditorInfo.PageIndex;
end
else begin
NewEditorInfo := NewUnitInfo.GetClosedOrNewEditorInfo;
Result:=DoOpenFileInSourceEditor(NewEditorInfo, PageIndex, WindowIndex, Flags);
if NewUnitInfo.OpenEditorInfoCount > 0 then begin
NewEditorInfo := NewUnitInfo.OpenEditorInfo[0];
SourceEditorManager.ActiveSourceWindowIndex := NewEditorInfo.WindowIndex;
SourceEditorManager.ActiveSourceWindow.PageIndex:= NewEditorInfo.PageIndex;
end
else begin
NewEditorInfo := NewUnitInfo.GetClosedOrNewEditorInfo;
Result:=DoOpenFileInSourceEditor(NewEditorInfo, PageIndex, WindowIndex, Flags);
end;
Result:=mrOK;
exit;
end;
Result:=mrOK;
exit;
// unknown internal file => ignore
exit(mrOK);
end;
// normalize filename