github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-22 21:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don’t consult tmProperties in file::save

Browse Source 
The main reason to avoid this is to give a more predictable API. Encoding should be read (from tmProperties) prior to calling file::save and then given as argument.
This commit is contained in:
Allan Odgaard
2012-08-26 14:04:26 +02:00
parent 5e3d973c9b
commit b0c2b69a3d
1 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Frameworks/file/src/save.cc
View File

@@ -21,7 +21,7 @@ namespace
{
struct file_context_t : file::save_context_t
{
file_context_t (file::save_callback_ptr callback, std::string const& path, osx::authorization_t authorization, io::bytes_ptr content, std::map<std::string, std::string> const& attributes, std::string const& fileType, std::string const& encoding, bool bom, std::string const& lineFeeds, std::vector<oak::uuid_t> const& binaryImportFilters, std::vector<oak::uuid_t> const& textImportFilters) : _state(kStateIdle), _next_state(kStateStart), _select_encoding_state(kSelectEncodingStateConsultSettings), _make_writable(false), _saved(false), _callback(callback), _path(path), _authorization(authorization), _content(content), _attributes(attributes), _file_type(fileType), _path_attributes(NULL_STR), _encoding(encoding), _bom(bom), _line_feeds(lineFeeds), _error(NULL_STR), _binary_import_filters(binaryImportFilters), _text_import_filters(textImportFilters) { }
file_context_t (file::save_callback_ptr callback, std::string const& path, osx::authorization_t authorization, io::bytes_ptr content, std::map<std::string, std::string> const& attributes, std::string const& fileType, std::string const& encoding, bool bom, std::string const& lineFeeds, std::vector<oak::uuid_t> const& binaryImportFilters, std::vector<oak::uuid_t> const& textImportFilters) : _state(kStateIdle), _next_state(kStateStart), _make_writable(false), _saved(false), _callback(callback), _path(path), _authorization(authorization), _content(content), _attributes(attributes), _file_type(fileType), _path_attributes(NULL_STR), _encoding(encoding), _bom(bom), _line_feeds(lineFeeds), _error(NULL_STR), _binary_import_filters(binaryImportFilters), _text_import_filters(textImportFilters) { }
~file_context_t ()
{
@@ -72,14 +72,8 @@ namespace
kStateDone
};
enum select_encoding_state_t {
kSelectEncodingStateConsultSettings,
kSelectEncodingStateAskUser
};
state_t _state;
state_t _next_state;
int _select_encoding_state;
bool _make_writable;
bool _saved;
@@ -327,33 +321,7 @@ namespace
_state = kStateIdle;
_next_state = kStateEncodeContent;
if(_select_encoding_state == kSelectEncodingStateConsultSettings)
{
_select_encoding_state = kSelectEncodingStateAskUser;
settings_t const& settings = settings_for_path(_path);
std::string encoding = settings.get(kSettingsEncodingKey, kCharsetNoEncoding);
if(encoding != kCharsetNoEncoding)
{
_encoding = encoding;
_bom = settings.get(kSettingsUseBOMKey, false);
}
else if(_encoding == kCharsetNoEncoding)
{
_encoding = kCharsetUTF8;
_bom = false;
}
else
{
_next_state = kStateSelectEncoding;
}
proceed();
}
else if(_select_encoding_state == kSelectEncodingStateAskUser)
{
_callback->select_encoding(_path, _content, _encoding, shared_from_this());
}
_callback->select_encoding(_path, _content, _encoding, shared_from_this());
}
break;