Skip to content

Commit 888069e

Browse files
authored
Merge pull request #166 from Krzmbrzl/plugin
Updated to 0.7.7
2 parents fff1330 + 40df184 commit 888069e

18 files changed

+272
-286
lines changed

plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Editors
44
Bundle-SymbolicName: raven.sqdev.editors;singleton:=true
5-
Bundle-Version: 0.7.2.stable
5+
Bundle-Version: 0.7.3.stable
66
Bundle-Activator: raven.sqdev.editors.activator.Activator
77
Require-Bundle: org.eclipse.ui,
88
org.eclipse.core.runtime,

plugin/Raven.SQDev.Editors/src/raven/sqdev/editors/BasicSourceViewerConfiguration.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.eclipse.jface.util.IPropertyChangeListener;
2424
import org.eclipse.jface.util.PropertyChangeEvent;
2525

26-
import raven.sqdev.constants.ISQDevColorConstants;
2726
import raven.sqdev.constants.SQDevPreferenceConstants;
2827
import raven.sqdev.infoCollection.base.Keyword;
2928
import raven.sqdev.misc.SQDevPreferenceUtil;
@@ -248,15 +247,15 @@ public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceVie
248247
if (containsString) {
249248
// colorize strings
250249
NonRuleBasedDamagerRepairer ndr_String = new NonRuleBasedDamagerRepairer(
251-
new TextAttribute(colorManager.getColor(ISQDevColorConstants.STRING)));
250+
new TextAttribute(SQDevPreferenceUtil.getStringHighlightingColor()));
252251
reconciler.setDamager(ndr_String, BasicPartitionScanner.BASIC_STRING);
253252
reconciler.setRepairer(ndr_String, BasicPartitionScanner.BASIC_STRING);
254253
}
255254

256255
if (containsComment) {
257256
// colorize comments
258257
NonRuleBasedDamagerRepairer ndr_Comment = new NonRuleBasedDamagerRepairer(
259-
new TextAttribute(colorManager.getColor(ISQDevColorConstants.COMMENT)));
258+
new TextAttribute(SQDevPreferenceUtil.getCommentHighlightingColor()));
260259
reconciler.setDamager(ndr_Comment, BasicPartitionScanner.BASIC_COMMENT);
261260
reconciler.setRepairer(ndr_Comment, BasicPartitionScanner.BASIC_COMMENT);
262261
}
@@ -301,6 +300,11 @@ public void propertyChange(PropertyChangeEvent event) {
301300
case SQDevPreferenceConstants.SQDEV_EDITOR_ENABLE_AUTOCOMPLETE_KEY:
302301
assistant.enableAutoActivation((boolean) event.getNewValue());
303302
break;
303+
304+
case SQDevPreferenceConstants.SQDEV_EDITOR_STRINGHIGHLIGHTING_COLOR_KEY:
305+
case SQDevPreferenceConstants.SQDEV_EDITOR_COMMENTHIGHLIGHTING_COLOR_KEY:
306+
editor.update(false);
307+
break;
304308

305309
default:
306310
if (configuredKeywordScanners.containsKey(event.getProperty())) {

plugin/Raven.SQDev.Misc/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Misc
44
Bundle-SymbolicName: raven.sqdev.misc;singleton:=true
5-
Bundle-Version: 0.7.0.stable2
5+
Bundle-Version: 0.7.1.stable
66
Bundle-Activator: raven.sqdev.activator.Activator
77
Require-Bundle: org.eclipse.core.runtime,
88
org.eclipse.swt,

plugin/Raven.SQDev.Misc/src/raven/sqdev/constants/SQDevPreferenceConstants.java

+45-36
Original file line numberDiff line numberDiff line change
@@ -6,130 +6,139 @@
66
* @author Raven
77
*/
88
public class SQDevPreferenceConstants {
9-
9+
1010
/**
1111
* The name of the preference holding the location to the ArmA folder on the
1212
* local disk
1313
*/
1414
public static final String SQDEV_INFO_ARMA_MAIN_DIRECTORY = "raven.sqdev.ArmAProgramDirectory";
15-
15+
1616
/**
1717
* The name of the preference holding the location of the ArmA folder in the
1818
* documents directory on the local disk
1919
*/
2020
public static final String SQDEV_INFO_ARMA_DOCUMENTS_DIRECTORY = "raven.sqdev.ArmADocumentsDirectory";
21-
21+
2222
/**
2323
* The name of the preference holding the default profile of the user
2424
*/
2525
public static final String SQDEV_INFO_DEFAULT_PROFILE = "raven.sqdev.defaultProfile";
26-
26+
2727
/**
2828
* The name of the preference holding the default terrain
2929
*/
3030
public static final String SQDEV_INFO_DEFAULT_TERRAIN = "raven.sqdev.defaultTerrain";
31-
31+
3232
/**
3333
* The name of the preference indicating if autoExport is enabled by default
3434
*/
3535
public static final String SQDEV_INFO_DEFAULT_AUTOEXPORT = "raven.sqdev.defaultAutoExport";
36-
36+
3737
/**
38-
* The name of the preference indicating whether the preference page should
39-
* ask to save unsaved preferences when clicking OK
38+
* The name of the preference indicating whether the preference page should ask
39+
* to save unsaved preferences when clicking OK
4040
*/
4141
public static final String SQDEV_PROMPT_ALWAYS_SAVE_ON_EXIT = "raven.sqdev.AlwaysSaveOnExit";
42-
42+
4343
/**
44-
* The name of the preference indicating whether the user should be asked
45-
* again if he selected an action that will delete a file
44+
* The name of the preference indicating whether the user should be asked again
45+
* if he selected an action that will delete a file
4646
*/
4747
public static final String SQDEV_PROMPT_ASK_FOR_DELETION = "raven.sqdev.askForDeletion";
48-
48+
4949
/**
50-
* The name of the preference indicating whether matching brackets should
51-
* get highlighted
50+
* The name of the preference indicating whether matching brackets should get
51+
* highlighted
5252
*/
5353
public static final String SQDEV_EDITOR_MATCHING_BRACKETS_KEY = "raven.sqdev.enableBracketMatch";
54-
54+
5555
/**
5656
* The name of the preference indicating the color of the highlight of a
5757
* matching bracket
5858
*/
5959
public static final String SQDEV_EDITOR_MATCHING_BRACKETS_COLOR_KEY = "raven.sqdev.matchingBracketsColor";
60-
60+
6161
/**
6262
* The name of the preference indicating whether autoCompletion should be
6363
* enabled
6464
*/
6565
public static final String SQDEV_EDITOR_ENABLE_AUTOCOMPLETE_KEY = "raven.sqdev.enableAutoComplete";
66-
66+
6767
/**
6868
* The name of the preference indicating whether the current line should get
6969
* highlighted
7070
*/
7171
public static final String SQDEV_EDITOR_HIGHLIGHT_CURRENTLINE_KEY = "raven.sqdev.highlightCurrentLine";
72-
72+
7373
/**
7474
* The preferences indicating the color of the current line highlighting
7575
*/
7676
public static final String SQDEV_EDITOR_HIGHLIGHT_CURRENTLINE_COLOR_KEY = "raven.sqdev.currentLineHighlightingColor";
77-
77+
7878
/**
7979
* The preferences indicating the color of the keyword highlighting
8080
*/
8181
public static final String SQDEV_EDITOR_KEYWORDHIGHLIGHTING_COLOR_KEY = "raven.sqdev.keywordHighlightingColor";
82-
82+
8383
/**
8484
* The preference indicating the color of the local variable highlighting
8585
*/
8686
public static final String SQDEV_EDITOR_LOCALVARIABLEHIGHLIGHTING_COLOR_KEY = "raven.sqdev.localVariableHighlightingColor";
87-
87+
8888
/**
8989
* The preference indicating the color of the global variable highlighting
9090
*/
9191
public static final String SQDEV_EDITOR_GLOBALVARIABLEHIGHLIGHTING_COLOR_KEY = "raven.sqdev.globalVariableHighlightingColor";
92-
92+
9393
/**
9494
* The preference indicating the color of the magic variable highlighting
9595
*/
9696
public static final String SQDEV_EDITOR_MAGICVARIABLEHIGHLIGHTING_COLOR_KEY = "raven.sqdev.magicVariableHighlightingColor";
97-
97+
9898
/**
9999
* The preference indicating the color of the macro highlighting
100100
*/
101101
public static final String SQDEV_EDITOR_MACROHIGHLIGHTING_COLOR_KEY = "raven.sqdev.macroHighlightingColor";
102-
102+
103+
/**
104+
* The preference indicating the color of the string highlighting
105+
*/
106+
public static final String SQDEV_EDITOR_STRINGHIGHLIGHTING_COLOR_KEY = "raven.sqdev.stringHighlightingColor";
107+
103108
/**
104-
* The preference indicating the delay before parsing after the user typed
105-
* in something
109+
* The preference indicating the color of the string highlighting
110+
*/
111+
public static final String SQDEV_EDITOR_COMMENTHIGHLIGHTING_COLOR_KEY = "raven.sqdev.commentHighlightingColor";
112+
113+
/**
114+
* The preference indicating the delay before parsing after the user typed in
115+
* something
106116
*/
107117
public static final String SQDEV_EDITOR_PARSE_DELAY = "raven.sqdev.parsingInterval";
108-
118+
109119
/**
110-
* The preference indicating if a directory should be cleaned without asking
111-
* for permission when exporting a project
120+
* The preference indicating if a directory should be cleaned without asking for
121+
* permission when exporting a project
112122
*/
113123
public static final String SQDEV_EXPORT_AUTOCLEAN = "raven.sqdev.autoClean";
114-
124+
115125
/**
116126
* The preference holding the web adress to the BIKI API
117127
*/
118128
public static final String SQDEV_COLLECTION_API_ADRESS = "raven.sqdev.collection.apiAdress";
119-
129+
120130
/**
121131
* The preference holding the wname of the main page that lists all the SQF
122132
* commands
123133
*/
124134
public static final String SQDEV_COLLECTION_API_MAINPAGE = "raven.sqdev.collection.apiMainPage";
125-
135+
126136
/**
127137
* The preference holding the path to the folder where ArmA stores it's RPTs
128138
*/
129139
public static final String SQDEV_VIEWS_RPTVIEWER_RPT_PATH = "raven.sqdev.rptViewer.rptPath";
130140
/**
131-
* The preference indicating whether the RPTViewer should format it's
132-
* content
141+
* The preference indicating whether the RPTViewer should format it's content
133142
*/
134143
public static final String SQDEV_VIEWS_RPTVIEWER_FORMAT = "raven.sqdev.views.rptViewer.autoFormatRPTContent";
135144
/**
@@ -138,8 +147,8 @@ public class SQDevPreferenceConstants {
138147
*/
139148
public static final String SQDEV_VIEWS_RPTVIEWER_FORMAT_PREFIXES = "raven.sqdev.views.rptViewer.formatPrefixes";
140149
/**
141-
* The preferences storing the maximum amount of blank lines that may occur
142-
* in a formatted RPT in a row
150+
* The preferences storing the maximum amount of blank lines that may occur in a
151+
* formatted RPT in a row
143152
*/
144153
public static final String SQDEV_VIEWS_RPTVIEWER_MAX_BLANK_REPETITION = "raven.sqdev.views.rptViewer.maxBlankRepetition";
145154
}

0 commit comments

Comments
 (0)