erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-13 04:09:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

fix(developer): Encoding for .model.ts files

Browse source 
Fixes #3000.

The model editor would save .model.ts files with Windows-1252 (aka ANSI)
encoding, losing non-ANSI characters in the process.

While fixing this, noted that the class member `model` was not being
used apart from in Load (no longer in Save), so reduced its
scope accordingly.
This commit is contained in:
Marc Durdin 2020-12-22 12:30:22 +11:00
parent ed6f6bcf00
commit 718c19a80c
1 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
windows/src/developer/TIKE/child/Keyman.Developer.UI.UfrmModelEditor.pas
View file

@ -102,7 +102,6 @@ type
function IndexOfFilename(const Filename: string): Integer;
end;
private
model: TStrings;
parser: TLexicalModelParser;
wordlists: TWordlists;
frameSource: TframeTextEditor;
@ -180,10 +179,33 @@ end;
{ TfrmModelEditor }
function TfrmModelEditor.DoOpenFile: Boolean;
var
model: TStringList;
begin
model := TStringList.Create;
model.LoadFromFile(FileName);
parser := TLexicalModelParser.Create(model.Text);
try
model.DefaultEncoding := TEncoding.UTF8;
try
model.LoadFromFile(FileName);
except
on E:EEncodingError do
begin
try
model.LoadFromFile(FileName, TEncoding.Default);
except
on E:EEncodingError do
begin
ShowMessage('Could not load file, does not appear to be a valid encoding.');
Exit(False);
end;
end;
end;
end;
parser := TLexicalModelParser.Create(model.Text);
finally
model.Free;
end;
wordlists := TWordlists.Create;
Inc(FSetup);
@ -200,6 +222,7 @@ end;
function TfrmModelEditor.DoSaveFile: Boolean;
var
wordlist: TWordlist;
stream: TStringStream;
begin
if pages.ActivePage = pageSource then
begin
@ -211,8 +234,14 @@ begin
wordlist.Frame.SaveToFile(wordlist.Frame.Filename);
end;
model.Text := parser.Text;
model.SaveToFile(FileName);
// We use TStringStream instead of TStringList so we don't get
// a BOM on the saved file
stream := TStringStream.Create(parser.Text, TEncoding.UTF8);
try
stream.SaveToFile(FileName);
finally
stream.Free;
end;
editOutPath.Text := (ProjectFile as TmodelTsProjectFile).TargetFilename; // I4688
@ -291,7 +320,6 @@ procedure TfrmModelEditor.FormDestroy(Sender: TObject);
begin
inherited;
FreeAndNil(parser);
FreeAndNil(model);
FreeAndNil(wordlists);
end;