Fix module index by making sure to index also src/ and modules/ folde…

…rs too (#138)

src/analyzer/psi/ModuleClause.v

@@ -50,6 +50,16 @@ pub fn module_qualified_name(file &PsiFile, indexing_root string) string {
 		root_dirs << src_dir
 	}
 
+	root_modules_dir := os.join_path(indexing_root, 'modules')
+	if os.exists(root_modules_dir) {
+		root_dirs << root_modules_dir
+	}
+
+	src_modules_dir := os.join_path(indexing_root, 'src', 'modules')
+	if os.exists(src_modules_dir) {
+		root_dirs << src_modules_dir
+	}
+
 	containing_dir := os.dir(file.path)
 
 	mut module_names := []string{}
@@ -74,6 +84,12 @@ pub fn module_qualified_name(file &PsiFile, indexing_root string) string {
 		module_names = module_names[..module_names.len - 1].clone()
 	}
 
+	if module_names.len >= 2 && module_names[module_names.len - 1] == 'src'
+		&& module_names[module_names.len - 2] == module_name
+		&& os.is_file(os.join_path(dir, module_names[0..module_names.len - 1].join(os.path_separator), 'v.mod')) {
+		module_names = module_names[..module_names.len - 2].clone()
+	}
+
 	qualifier := module_names.join('.')
 	if qualifier == '' {
 		return module_name

src/server/documentation/provider.v

@@ -113,7 +113,10 @@ fn (mut p Provider) import_spec_documentation(element psi.ImportSpec) ? {
 	p.sb.write_string('```')
 
 	dir := element.resolve_directory()
-	readme_path := os.join_path(dir, 'README.md')
+	mut readme_path := os.join_path(dir, 'README.md')
+	if !os.exists(readme_path) && os.file_name(dir) == 'src' {
+		readme_path = os.join_path(os.dir(dir), 'README.md')
+	}
 	if os.exists(readme_path) {
 		p.write_separator()
 		mut content := os.read_file(readme_path) or { return }