mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Fix for Bug 170921 - Makefile editor does not respect tab width setting

Browse source
This commit is contained in:
Anton Leherbauer 2007-01-19 11:16:09 +00:00
parent f02257b4dc
commit 10fedfa4d0
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others. * Copyright (c) 2000, 2007 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -103,7 +103,6 @@ public class MakefileEditor extends TextEditor implements ISelectionChangedListe
* @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor() * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeEditor()
*/ */
protected void initializeEditor() { protected void initializeEditor() {
setSourceViewerConfiguration(new MakefileSourceConfiguration(this));
setRangeIndicator(new DefaultRangeIndicator()); setRangeIndicator(new DefaultRangeIndicator());
setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$ setEditorContextMenuId("#MakefileEditorContext"); //$NON-NLS-1$
setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$ setRulerContextMenuId("#MakefileRulerContext"); //$NON-NLS-1$
@ -113,6 +112,7 @@ public class MakefileEditor extends TextEditor implements ISelectionChangedListe
stores[1] = EditorsUI.getPreferenceStore(); stores[1] = EditorsUI.getPreferenceStore();
ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores); ChainedPreferenceStore chainedStore = new ChainedPreferenceStore(stores);
setPreferenceStore(chainedStore); setPreferenceStore(chainedStore);
setSourceViewerConfiguration(new MakefileSourceConfiguration(chainedStore, this));
} }
/* (non-Javadoc) /* (non-Javadoc)

11
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others. * Copyright (c) 2000, 2007 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.make.internal.ui.editor; package org.eclipse.cdt.make.internal.ui.editor;
@ -18,6 +19,7 @@ import org.eclipse.cdt.make.internal.ui.text.makefile.MakefilePartitionScanner;
import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileReconcilingStrategy; import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileReconcilingStrategy;
import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileTextHover; import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileTextHover;
import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextHover; import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.TextAttribute; import org.eclipse.jface.text.TextAttribute;
@ -35,8 +37,9 @@ import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.text.source.SourceViewerConfiguration;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
public class MakefileSourceConfiguration extends SourceViewerConfiguration { public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
private ColorManager colorManager; private ColorManager colorManager;
MakefileCodeScanner codeScanner; MakefileCodeScanner codeScanner;
@ -54,8 +57,8 @@ public class MakefileSourceConfiguration extends SourceViewerConfiguration {
/** /**
* Constructor for MakeConfiguration * Constructor for MakeConfiguration
*/ */
public MakefileSourceConfiguration(MakefileEditor editor) { public MakefileSourceConfiguration(IPreferenceStore preferenceStore, MakefileEditor editor) {
super(); super(preferenceStore);
fEditor = editor; fEditor = editor;
colorManager = ColorManager.getDefault(); colorManager = ColorManager.getDefault();
} }