Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
package com.microsoft.copilot.eclipse.core.completion;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.lsp4j.FormattingOptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -25,7 +26,11 @@ class FormatOptionProviderTests {
private IFile mockFile;
private IProject mockProject;

private static final String EDITOR_PREF_NODE = "org.eclipse.ui.editors";
private static final String TAB_WIDTH_KEY = "tabWidth";
private static final String SPACES_FOR_TABS_KEY = "spacesForTabs";
private static final int PREFERENCE_DEFAULT_TAB_SIZE = 4;
private static final boolean PREFERENCE_DEFAULT_USE_SPACE = true;

@BeforeEach
void setUp() {
Expand Down Expand Up @@ -56,16 +61,29 @@ void testGetEclipseDefaultJavaTabCharAndSize() {
void testGetCopilotDefaultTabCharAndSizeForUnknownLanguage() {
when(mockFile.getFileExtension()).thenReturn("js");

assertTrue(formatOptionProvider.useSpace(mockFile));
assertEquals(PREFERENCE_DEFAULT_TAB_SIZE, formatOptionProvider.getTabSize(mockFile));
FormattingOptions expectedFormattingOptions = getEclipseTextEditorFormattingOptions();
assertEquals(expectedFormattingOptions.isInsertSpaces(), formatOptionProvider.useSpace(mockFile));
assertEquals(expectedFormattingOptions.getTabSize(), formatOptionProvider.getTabSize(mockFile));
}

@Test
void testGetCopilotDefaultTabCharAndSizeForNoExtensionFile() {
when(mockFile.getFileExtension()).thenReturn(null);

assertTrue(formatOptionProvider.useSpace(mockFile));
assertEquals(PREFERENCE_DEFAULT_TAB_SIZE, formatOptionProvider.getTabSize(mockFile));
FormattingOptions expectedFormattingOptions = getEclipseTextEditorFormattingOptions();
assertEquals(expectedFormattingOptions.isInsertSpaces(), formatOptionProvider.useSpace(mockFile));
assertEquals(expectedFormattingOptions.getTabSize(), formatOptionProvider.getTabSize(mockFile));
}

private FormattingOptions getEclipseTextEditorFormattingOptions() {
try {
IPreferencesService service = Platform.getPreferencesService();
boolean useSpaces = service.getBoolean(EDITOR_PREF_NODE, SPACES_FOR_TABS_KEY, PREFERENCE_DEFAULT_USE_SPACE, null);
int tabSize = service.getInt(EDITOR_PREF_NODE, TAB_WIDTH_KEY, PREFERENCE_DEFAULT_TAB_SIZE, null);
return new FormattingOptions(tabSize, useSpaces);
} catch (Exception e) {
return new FormattingOptions(PREFERENCE_DEFAULT_TAB_SIZE, PREFERENCE_DEFAULT_USE_SPACE);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import org.apache.commons.lang3.StringUtils;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.IPreferencesService;
import org.eclipse.lsp4j.FormattingOptions;

import com.microsoft.copilot.eclipse.core.CopilotCore;
Expand All @@ -26,6 +28,9 @@ public class FormatOptionProvider {
private static final String CPP_LANGUAGE_ID = "cpp";
private static final String[] CPP_LANGUAGE_EXTENSIONS = new String[] { "cpp", "c++", "cc", "cp", "cxx", "h", "h++",
"hh", ".hpp", ".hxx", ".inc", ".inl", ".ipp", ".tcc", ".tpp" };
private static final String EDITOR_PREF_NODE = "org.eclipse.ui.editors";
private static final String TAB_WIDTH_KEY = "tabWidth";
private static final String SPACES_FOR_TABS_KEY = "spacesForTabs";
private static final boolean DEFAULT_USE_SPACE = LanguageFormatReader.PREFERENCE_DEFAULT_TAB_CHAR.equals("space");
private static final int DEFAULT_TAB_SIZE = LanguageFormatReader.PREFERENCE_DEFAULT_TAB_SIZE;

Expand Down Expand Up @@ -91,7 +96,7 @@ private FormattingOptions getLanguageFormat(IFile file) {
String fileExtension = file.getFileExtension();
if (StringUtils.isEmpty(fileExtension)) {
CopilotCore.LOGGER.info("File extension is null or empty for file: " + file.getName());
return null;
return getEclipseTextEditorFormattingOptions();
} else {
fileExtension = fileExtension.toLowerCase();
}
Expand All @@ -110,7 +115,7 @@ private FormattingOptions getLanguageFormat(IFile file) {
if (languageFormatReaderForProject == null) {
languageFormatReaderForProject = loadFormatReaderForTheProject(languageId, project);
if (languageFormatReaderForProject == null) {
return new FormattingOptions(DEFAULT_TAB_SIZE, DEFAULT_USE_SPACE);
return getEclipseTextEditorFormattingOptions();
}
projectToLanguageFormatReaderMap.put(project, languageFormatReaderForProject);
}
Expand All @@ -129,4 +134,16 @@ private LanguageFormatReader loadFormatReaderForTheProject(String languageId, IP
return null;
}
}

private FormattingOptions getEclipseTextEditorFormattingOptions() {
try {
IPreferencesService service = Platform.getPreferencesService();
boolean useSpaces = service.getBoolean(EDITOR_PREF_NODE, SPACES_FOR_TABS_KEY, DEFAULT_USE_SPACE, null);
int tabSize = service.getInt(EDITOR_PREF_NODE, TAB_WIDTH_KEY, DEFAULT_TAB_SIZE, null);
return new FormattingOptions(tabSize, useSpaces);
} catch (Exception e) {
CopilotCore.LOGGER.error(e);
return new FormattingOptions(DEFAULT_TAB_SIZE, DEFAULT_USE_SPACE);
}
}
}