Make default code style configurable at language level (kyuridenamida#154)

chaemon · kyuridenamida · commit 302d80b45639 · 2019-08-26T22:42:00.000+09:00
* default code styleを変更

* add default_code_style

* add default code style

* code_style_config.pyのNIM importを削除

* check_autopep8を削除

* CodeStyleをdictではなくclassに
diff --git a/atcodertools/codegen/code_style_config.py b/atcodertools/codegen/code_style_config.py
@@ -26,7 +26,7 @@ def __init__(self,
                  workspace_dir: Optional[str] = None,
                  lang: str = "cpp",
                  ):
-        from atcodertools.common.language import Language, LanguageNotFoundError, ALL_LANGUAGE_NAMES, NIM
+        from atcodertools.common.language import Language, LanguageNotFoundError, ALL_LANGUAGE_NAMES
 
         code_generator_file = normalize_path(code_generator_file)
         template_file = normalize_path(template_file)
@@ -59,9 +59,10 @@ def __init__(self,
 
         if indent_width is not None:
             self.indent_width = indent_width
+        elif lang.default_code_style is not None and lang.default_code_style.indent_width is not None:
+            self.indent_width = lang.default_code_style.indent_width
         else:
-            # nim has a special default value
-            self.indent_width = 2 if lang == NIM else 4
+            self.indent_width = 4
 
         if code_generator_file is not None:
             try:
diff --git a/atcodertools/common/language.py b/atcodertools/common/language.py
@@ -10,22 +10,30 @@ class LanguageNotFoundError(Exception):
     pass
 
 
-class Language:
+class CodeStyle:
+    def __init__(self,
+                 indent_width=None
+                 ):
+        self.indent_width = indent_width
 
+
+class Language:
     def __init__(self,
                  name: str,
                  display_name: str,
                  extension: str,
                  submission_lang_pattern: Pattern[str],
                  default_code_generator: Callable[[CodeGenArgs], str],
                  default_template_path: str,
+                 default_code_style=None
                  ):
         self.name = name
         self.display_name = display_name
         self.extension = extension
         self.submission_lang_pattern = submission_lang_pattern
         self.default_code_generator = default_code_generator
         self.default_template_path = default_template_path
+        self.default_code_style = default_code_style
 
     def source_code_name(self, name_without_extension: str) -> str:
         # put extension to the name
@@ -92,6 +100,7 @@ def from_name(cls, name: str):
     submission_lang_pattern=re.compile(".*Nim \\(0.*"),
     default_code_generator=nim.main,
     default_template_path=get_default_template_path('nim'),
+    default_code_style=CodeStyle(indent_width=2)
 )
 
 ALL_LANGUAGES = [CPP, JAVA, RUST, PYTHON, NIM, DLANG]
diff --git a/tests/test_codegen.py b/tests/test_codegen.py
@@ -221,15 +221,11 @@ def _compile_and_run(self, lang, format, template_file, expected_generated_code_
         code_file = os.path.join(self.temp_dir, lang.source_code_name("main"))
         exec_file, exec_args = self._exec_file_and_args(lang)
         compile_cmd = self._compile_command(lang, code_file)
-        if lang == NIM:
-            cfg = CodeStyleConfig(indent_width=2)
-        else:
-            cfg = CodeStyleConfig()
         args = CodeGenArgs(
             template=load_text_file(template_file),
             format_=format,
             constants=ProblemConstantSet(123, "yes", "NO"),
-            config=cfg
+            config=CodeStyleConfig(lang=lang.name)
         )
         code = lang.default_code_generator(args)
         # to remove version strings from test resources
@@ -277,7 +273,6 @@ def verify(self,
         self.assertEqual(
             load_intermediate_types(py_test_name),
             str(response.types))
-
         self.assertEqual(
             load_generated_code(py_test_name, lang),
             self.lang_to_code_generator_func[lang](
