Browse Source

Move some strings into the resource database.

Boo projects import Boo.Lang by default.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@652 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
d67a715fe6
  1. 34
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 1
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs
  3. 10
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/BooResolver.cs
  4. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs
  5. 8
      src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs
  6. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

34
AddIns/ICSharpCode.SharpDevelop.addin

@ -199,19 +199,19 @@ @@ -199,19 +199,19 @@
<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/SolutionFolderNode">
<MenuItem id = "CombineAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu">
<MenuItem id = "AddNewProjectToSolution"
label = "&amp;New Project..."
label = "${res:ProjectComponent.ContextMenu.NewProject}"
icon = "Icons.16x16.NewProjectIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewProjectToSolution"/>
<MenuItem id = "AddExitingProjectToSolution"
label = "&amp;Existing Project..."
label = "${res:ProjectComponent.ContextMenu.ExistingProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExitingProjectToSolution"/>
<MenuItem id = "Separator1" type = "Separator" />
<MenuItem id = "AddItem"
label = "Add &amp;Item..."
label = "${res:ProjectComponent.ContextMenu.AddItem}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemToSolution"/>
<MenuItem id = "AddNewSolutionFolderToSolution"
icon = "ProjectBrowser.SolutionFolder.CreateNew"
label = "New Solution &amp;Folder"
label = "${res:ProjectComponent.ContextMenu.NewSolutionFolder}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewSolutionFolderToSolution"/>
</MenuItem>
@ -266,27 +266,27 @@ @@ -266,27 +266,27 @@
<Path path = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode">
<MenuItem id = "Build project"
label = "B&amp;uild"
label = "${res:ProjectComponent.ContextMenu.Build}"
icon = "Icons.16x16.BuildCurrentSelectedProject"
class = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
<MenuItem id = "Rebuild project"
label = "R&amp;ebuild"
label = "${res:ProjectComponent.ContextMenu.Rebuild}"
class = "ICSharpCode.SharpDevelop.Project.Commands.RebuildProject"/>
<MenuItem id = "Clean project"
label = "Clea&amp;n"
label = "${res:ProjectComponent.ContextMenu.Clean}"
class = "ICSharpCode.SharpDevelop.Project.Commands.CleanProject"/>
<MenuItem id = "Publish project"
label = "Publish ${CurrentProjectName}"
label = "${res:XML.MainMenu.BuildMenu.PublishProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>
<MenuItem id = "CombineBuildGroupSeparator" type = "Separator"/>
<MenuItem id = "ProjectAddMenu" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type = "Menu" >
<MenuItem id = "New Item"
label = "New Item..."
label = "${res:ProjectComponent.ContextMenu.NewItem}"
icon = "Icons.16x16.NewDocumentIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
<MenuItem id = "Existing Item"
label = "Existing Item..."
label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
<MenuItem id = "NewFolder"
label = "${res:ProjectComponent.ContextMenu.NewFolder}"
@ -302,7 +302,7 @@ @@ -302,7 +302,7 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.SetAsStartupProject"/>
<Condition name="IsProcessRunning" isprocessrunning="False" isdebugging="False" action="Disable">
<MenuItem id = "Run"
label = "Sta&amp;rt Project"
label = "${res:ProjectComponent.ContextMenu.RunProject}"
icon = "Icons.16x16.RunProgramIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.RunProject"/>
</Condition>
@ -360,11 +360,11 @@ @@ -360,11 +360,11 @@
<Condition name = "Ownerstate" ownerstate = "InProject">
<MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type="Menu">
<MenuItem id = "New Item"
label = "New Item..."
label = "${res:ProjectComponent.ContextMenu.NewItem}"
icon = "Icons.16x16.NewDocumentIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
<MenuItem id = "Existing Item"
label = "Existing Item..."
label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
<MenuItem id = "NewFolder"
label = "${res:ProjectComponent.ContextMenu.NewFolder}"
@ -427,11 +427,11 @@ @@ -427,11 +427,11 @@
</Not>
<MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type="Menu">
<MenuItem id = "New Item"
label = "New Item..."
label = "${res:ProjectComponent.ContextMenu.NewItem}"
icon = "Icons.16x16.NewDocumentIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
<MenuItem id = "Existing Item"
label = "Existing Item..."
label = "${res:ProjectComponent.ContextMenu.ExistingItem}"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
<MenuItem id = "NewFolder"
label = "${res:ProjectComponent.ContextMenu.NewFolder}"
@ -447,13 +447,13 @@ @@ -447,13 +447,13 @@
</Or>
<Condition name = "Ownerstate" ownerstate = "InProject">
<MenuItem id = "ExcludeFile"
label = "Exclude From Project"
label = "${res:ProjectComponent.ContextMenu.ExcludeFileFromProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.ExcludeFileFromProject"/>
</Condition>
<Condition name = "Ownerstate" ownerstate = "None">
<MenuItem id = "IncludeFile"
label = "Include In Project"
label = "${res:ProjectComponent.ContextMenu.IncludeFileInProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.IncludeFileInProject"/>
</Condition>

1
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/BooProject.cs

@ -69,6 +69,7 @@ namespace Grunwald.BooBinding @@ -69,6 +69,7 @@ namespace Grunwald.BooBinding
BooUsefulPC = ProjectContentRegistry.GetProjectContentForReference(booUsefulItem);
}
pc.DefaultImports = new DefaultUsing(pc);
pc.DefaultImports.Usings.Add("Boo.Lang");
pc.DefaultImports.Usings.Add("Boo.Lang.Builtins");
return pc;
}

10
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/BooResolver.cs

@ -266,10 +266,18 @@ namespace Grunwald.BooBinding.CodeCompletion @@ -266,10 +266,18 @@ namespace Grunwald.BooBinding.CodeCompletion
public ArrayList CtrlSpace(int caretLine, int caretColumn, string fileName, string fileContent, ExpressionContext context)
{
ArrayList result;
if (!Initialize(fileName, caretLine, caretColumn))
return null;
if (context == ExpressionContext.Importable) {
result = new ArrayList();
pc.AddNamespaceContents(result, "", pc.Language, true);
NRResolver.AddUsing(result, pc.DefaultImports, pc);
return result;
}
ArrayList result = GetImportedNamespaceContents();
result = GetImportedNamespaceContents();
if (BooProject.BooCompilerPC != null) {
if (context == ExpressionFinder.BooAttributeContext.Instance) {

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/CodeCompletion/CompletionBinding.cs

@ -54,7 +54,7 @@ namespace Grunwald.BooBinding.CodeCompletion @@ -54,7 +54,7 @@ namespace Grunwald.BooBinding.CodeCompletion
{
switch (word.ToLower(CultureInfo.InvariantCulture)) {
case "import":
editor.ShowCompletionWindow(new CodeCompletionDataProvider(new ExpressionResult("__GlobalNamespace", ExpressionContext.Importable)), ' ');
editor.ShowCompletionWindow(new CtrlSpaceCompletionDataProvider(ExpressionContext.Importable), ' ');
return true;
case "as":
case "isa":

8
src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@ -997,7 +997,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -997,7 +997,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
}
}
static void AddUsing(ArrayList result, IUsing u, IProjectContent projectContent)
public static void AddUsing(ArrayList result, IUsing u, IProjectContent projectContent)
{
if (u == null) {
return;
@ -1023,7 +1023,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -1023,7 +1023,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
}
}
if (importNamespaces) {
projectContent.AddNamespaceContents(result, name, projectContent.Language, true);
string newName = null;
if (projectContent.DefaultImports != null) {
newName = projectContent.DefaultImports.SearchNamespace(name);
}
projectContent.AddNamespaceContents(result, newName ?? name, projectContent.Language, true);
} else {
foreach (object o in projectContent.GetNamespaceContents(name)) {
if (!(o is string))

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save