github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Only check network reachability when we know there are remote grammars

Browse Source 
Previously we would check network reachability for all unknown file types, even if it lead to no grammar suggestion.
This commit is contained in:
Allan Odgaard
2016-08-19 11:05:07 +02:00
parent 196db13f1d
commit e457c8834f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -1038,7 +1038,7 @@ namespace
{
OakDocument* document = doc->document();
BOOL showBundleSuggestions = ![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableBundleSuggestionsKey];
if(!document.fileType && showBundleSuggestions && network::can_reach_host([[[NSURL URLWithString:@(REST_API)] host] UTF8String]))
if(!document.fileType && showBundleSuggestions)
{
NSArray<BundleGrammar*>* grammars = document.proposedGrammars;
if(NSArray* excludedGrammars = [[NSUserDefaults standardUserDefaults] arrayForKey:kUserDefaultsGrammarsToNeverSuggestKey])
@@ -1046,7 +1046,7 @@ namespace
if(_bundlesAlreadySuggested)
grammars = [grammars filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"!(bundle IN %@)", _bundlesAlreadySuggested]];
if([grammars count])
if([grammars count] && network::can_reach_host([[[NSURL URLWithString:@(REST_API)] host] UTF8String]))
{
self.bundlesAlreadySuggested = [(_bundlesAlreadySuggested ?: @[ ]) arrayByAddingObject:[grammars firstObject].bundle];