From e2d1e9461a224a280549007a9f02ea364a3dca49 Mon Sep 17 00:00:00 2001 From: Abhi Beckert Date: Sat, 6 Sep 2014 17:29:06 +1000 Subject: Add pref to disable backticks in completions Add a checkbox to the Editor preferences to disable placing backticks around attributes when completing in the custom query pane. Resolves #764 --- Source/SPConstants.h | 1 + Source/SPConstants.m | 1 + Source/SPNarrowDownCompletion.m | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'Source') diff --git a/Source/SPConstants.h b/Source/SPConstants.h index 76f51f49..6c9f4a68 100644 --- a/Source/SPConstants.h +++ b/Source/SPConstants.h @@ -342,6 +342,7 @@ extern NSString *SPCustomQueryUpdateAutoHelp; extern NSString *SPCustomQueryAutoHelpDelay; extern NSString *SPCustomQueryHighlightCurrentQuery; extern NSString *SPCustomQueryEditorTabStopWidth; +extern NSString *SPCustomQueryEditorCompleteWithBackticks; extern NSString *SPCustomQueryAutoComplete; extern NSString *SPCustomQueryAutoCompleteDelay; extern NSString *SPCustomQueryFunctionCompletionInsertsArguments; diff --git a/Source/SPConstants.m b/Source/SPConstants.m index 6b986506..eb11ac11 100644 --- a/Source/SPConstants.m +++ b/Source/SPConstants.m @@ -148,6 +148,7 @@ NSString *SPCustomQueryUpdateAutoHelp = @"CustomQueryUpdateAutoHelp"; NSString *SPCustomQueryAutoHelpDelay = @"CustomQueryAutoHelpDelay"; NSString *SPCustomQueryHighlightCurrentQuery = @"CustomQueryHighlightCurrentQuery"; NSString *SPCustomQueryEditorTabStopWidth = @"CustomQueryEditorTabStopWidth"; +NSString *SPCustomQueryEditorCompleteWithBackticks = @"SPCustomQueryEditorCompleteWithBackticks"; NSString *SPCustomQueryAutoComplete = @"CustomQueryAutoComplete"; NSString *SPCustomQueryAutoCompleteDelay = @"CustomQueryAutoCompleteDelay"; NSString *SPCustomQueryFunctionCompletionInsertsArguments = @"CustomQueryFunctionCompletionInsertsArguments"; diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index 0f16ed61..77ea9fbe 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -1124,7 +1124,11 @@ // Is completion string a schema name for current connection if([selectedItem objectForKey:@"isRef"]) { backtickMode = 100; // suppress move the caret one step rightwards - [self insert_text:[candidateMatch backtickQuotedString]]; + if ([prefs boolForKey:SPCustomQueryEditorCompleteWithBackticks]) { + [self insert_text:[candidateMatch backtickQuotedString]]; + } else { + [self insert_text:candidateMatch]; + } } else { [self insert_text:candidateMatch]; } -- cgit v1.2.3